[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 14ae2e88d56e1125d572382809e99eacadeefce7
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 17 13:09:59 2010 +0000

    2010-11-17  John Mellor  <johnme at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] Expose frame flattening setting in WebSettings.
            https://bugs.webkit.org/show_bug.cgi?id=49621
    
            * public/WebSettings.h:
            * src/WebSettingsImpl.cpp:
            (WebKit::WebSettingsImpl::setFrameFlatteningEnabled):
            * src/WebSettingsImpl.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72196 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 948ea3d..fbbb449 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-17  John Mellor  <johnme at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Expose frame flattening setting in WebSettings.
+        https://bugs.webkit.org/show_bug.cgi?id=49621
+
+        * public/WebSettings.h:
+        * src/WebSettingsImpl.cpp:
+        (WebKit::WebSettingsImpl::setFrameFlatteningEnabled):
+        * src/WebSettingsImpl.h:
+
 2010-11-17  Jonathan Backer  <backer at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebKit/chromium/public/WebSettings.h b/WebKit/chromium/public/WebSettings.h
index 469db05..fa21551 100644
--- a/WebKit/chromium/public/WebSettings.h
+++ b/WebKit/chromium/public/WebSettings.h
@@ -82,6 +82,7 @@ public:
     virtual void setXSSAuditorEnabled(bool) = 0;
     virtual void setLocalStorageEnabled(bool) = 0;
     virtual void setEditableLinkBehaviorNeverLive() = 0;
+    virtual void setFrameFlatteningEnabled(bool) = 0;
     virtual void setFontRenderingModeNormal() = 0;
     virtual void setShouldPaintCustomScrollbars(bool) = 0;
     virtual void setAllowUniversalAccessFromFileURLs(bool) = 0;
diff --git a/WebKit/chromium/src/WebSettingsImpl.cpp b/WebKit/chromium/src/WebSettingsImpl.cpp
index 9953b5c..1bea259 100644
--- a/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -223,6 +223,11 @@ void WebSettingsImpl::setEditableLinkBehaviorNeverLive()
     m_settings->setEditableLinkBehavior(WebCore::EditableLinkNeverLive);
 }
 
+void WebSettingsImpl::setFrameFlatteningEnabled(bool enabled)
+{
+    m_settings->setFrameFlatteningEnabled(enabled);
+}
+
 void WebSettingsImpl::setFontRenderingModeNormal()
 {
     // FIXME: If you ever need more behaviors than this, then we should probably
diff --git a/WebKit/chromium/src/WebSettingsImpl.h b/WebKit/chromium/src/WebSettingsImpl.h
index 6d40b4f..081188f 100644
--- a/WebKit/chromium/src/WebSettingsImpl.h
+++ b/WebKit/chromium/src/WebSettingsImpl.h
@@ -77,6 +77,7 @@ public:
     virtual void setXSSAuditorEnabled(bool);
     virtual void setLocalStorageEnabled(bool);
     virtual void setEditableLinkBehaviorNeverLive();
+    virtual void setFrameFlatteningEnabled(bool);
     virtual void setFontRenderingModeNormal();
     virtual void setShouldPaintCustomScrollbars(bool);
     virtual void setAllowUniversalAccessFromFileURLs(bool);

-- 
WebKit Debian packaging