[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e61ff62a6f725b41b3fa0c18eb1887d508f423b2
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 10 19:44:08 2010 +0000

    2010-02-10  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Support frameset flattening
            https://bugs.webkit.org/show_bug.cgi?id=32717
    
            Add support for enabling/disabling FrameSet Flattening on the Mac port.
    
            * WebCore.base.exp:
    2010-02-10  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Support frameset flattening
            https://bugs.webkit.org/show_bug.cgi?id=32717
    
            Add support for enabling/disabling FrameSet Flattening on the Mac port.
    
            * WebView/WebPreferenceKeysPrivate.h:
            * WebView/WebPreferences.mm:
            (+[WebPreferences initialize]):
            (-[WebPreferences isFrameSetFlatteningEnabled]):
            (-[WebPreferences setFrameSetFlatteningEnabled:]):
            * WebView/WebPreferencesPrivate.h:
            * WebView/WebView.mm:
            (-[WebView _preferencesChangedNotification:]):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54613 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 75f3c25..3c49e38 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-10  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Support frameset flattening
+        https://bugs.webkit.org/show_bug.cgi?id=32717
+
+        Add support for enabling/disabling FrameSet Flattening on the Mac port.
+
+        * WebCore.base.exp:
+
 2010-02-10  Jeremy Orlow  <jorlow at chromium.org>
 
         Revert 54599 because it breaks a lot of tests on Windows Chrome
diff --git a/WebCore/WebCore.base.exp b/WebCore/WebCore.base.exp
index 8741c84..a0a5262 100644
--- a/WebCore/WebCore.base.exp
+++ b/WebCore/WebCore.base.exp
@@ -653,6 +653,7 @@ __ZN7WebCore8Settings23setEditableLinkBehaviorENS_20EditableLinkBehaviorE
 __ZN7WebCore8Settings23setLoadDeferringEnabledEb
 __ZN7WebCore8Settings23setNeedsTigerMailQuirksEb
 __ZN7WebCore8Settings23setPluginAllowedRunTimeEj
+__ZN7WebCore8Settings28setFrameSetFlatteningEnabledEb
 __ZN7WebCore8Settings23setUsesEncodingDetectorEb
 __ZN7WebCore8Settings24setApplicationChromeModeEb
 __ZN7WebCore8Settings24setTextAreasAreResizableEb
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index f7dcf2a..e9fe585 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,21 @@
+2010-02-10  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Support frameset flattening
+        https://bugs.webkit.org/show_bug.cgi?id=32717
+
+        Add support for enabling/disabling FrameSet Flattening on the Mac port.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences isFrameSetFlatteningEnabled]):
+        (-[WebPreferences setFrameSetFlatteningEnabled:]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChangedNotification:]):
+
 2010-02-09  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit/mac/WebView/WebPreferenceKeysPrivate.h b/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
index 7085cec..b8e912e 100644
--- a/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
+++ b/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
@@ -90,6 +90,7 @@
 #define WebKitWebGLEnabledPreferenceKey @"WebKitWebGLEnabled"
 #define WebKitUsesProxiedOpenPanelPreferenceKey @"WebKitUsesProxiedOpenPanel"
 #define WebKitPluginAllowedRunTimePreferenceKey @"WebKitPluginAllowedRunTime"
+#define WebKitFrameSetFlatteningEnabledPreferenceKey @"WebKitFrameSetFlatteningEnabled"
 
 // These are private both because callers should be using the cover methods and because the
 // cover methods themselves are private.
diff --git a/WebKit/mac/WebView/WebPreferences.mm b/WebKit/mac/WebView/WebPreferences.mm
index d06cc13..a1176a9 100644
--- a/WebKit/mac/WebView/WebPreferences.mm
+++ b/WebKit/mac/WebView/WebPreferences.mm
@@ -356,6 +356,7 @@ static WebCacheModel cacheModelForMainBundle(void)
         [NSNumber numberWithBool:NO],   WebKitWebGLEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitUsesProxiedOpenPanelPreferenceKey,
         [NSNumber numberWithUnsignedInt:4], WebKitPluginAllowedRunTimePreferenceKey,
+        [NSNumber numberWithBool:NO],   WebKitFrameSetFlatteningEnabledPreferenceKey,
         nil];
 
     // This value shouldn't ever change, which is assumed in the initialization of WebKitPDFDisplayModePreferenceKey above
@@ -1204,6 +1205,16 @@ static NSString *classIBCreatorID = nil;
     return [self _setIntegerValue:allowedRunTime forKey:WebKitPluginAllowedRunTimePreferenceKey];
 }
 
+- (BOOL)isFrameSetFlatteningEnabled
+{
+    return [self _boolValueForKey:WebKitFrameSetFlatteningEnabledPreferenceKey];
+}
+
+- (void)setFrameSetFlatteningEnabled:(BOOL)flag
+{
+    [self _setBoolValue:flag forKey:WebKitFrameSetFlatteningEnabledPreferenceKey];
+}
+
 - (void)didRemoveFromWebView
 {
     ASSERT(_private->numWebViews);
diff --git a/WebKit/mac/WebView/WebPreferencesPrivate.h b/WebKit/mac/WebView/WebPreferencesPrivate.h
index 20c98b2..7c84d8d 100644
--- a/WebKit/mac/WebView/WebPreferencesPrivate.h
+++ b/WebKit/mac/WebView/WebPreferencesPrivate.h
@@ -113,6 +113,9 @@ extern NSString *WebPreferencesRemovedNotification;
 - (unsigned)pluginAllowedRunTime;
 - (void)setPluginAllowedRunTime:(unsigned)allowedRunTime;
 
+- (BOOL)isFrameSetFlatteningEnabled;
+- (void)setFrameSetFlatteningEnabled:(BOOL)flag;
+
 // zero means do AutoScale
 - (float)PDFScaleFactor;
 - (void)setPDFScaleFactor:(float)scale;
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index e583bb5..4b449de 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -1334,6 +1334,7 @@ static bool fastDocumentTeardownEnabled()
     settings->setPluginAllowedRunTime([preferences pluginAllowedRunTime]);
     settings->setWebGLEnabled([preferences webGLEnabled]);
     settings->setLoadDeferringEnabled(shouldEnableLoadDeferring());
+    settings->setFrameSetFlatteningEnabled([preferences isFrameSetFlatteningEnabled]);
 }
 
 static inline IMP getMethod(id o, SEL s)

-- 
WebKit Debian packaging