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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 3f7faa195964955a4030d5bc05562eaeb4b77f1f
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 28 21:18:03 2010 +0000

    2010-07-28  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] Add a bool to Settings to control accelerated 2d canvas
            https://bugs.webkit.org/show_bug.cgi?id=43094
    
            * public/WebSettings.h:
            * src/WebSettingsImpl.cpp:
            (WebKit::WebSettingsImpl::setAccelerated2dCanvasEnabled):
            * src/WebSettingsImpl.h:
    2010-07-28  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] Add a bool to Settings to control accelerated 2d canvas
            https://bugs.webkit.org/show_bug.cgi?id=43094
    
            Currently this doesn't control anything, but it will soon.
    
            * page/Settings.cpp:
            (WebCore::Settings::Settings):
            (WebCore::Settings::setAccelerated2dCanvasEnabled):
            * page/Settings.h:
            (WebCore::Settings::accelerated2dCanvasEnabled):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f1cfb67..b2b8aca 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-28  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Add a bool to Settings to control accelerated 2d canvas
+        https://bugs.webkit.org/show_bug.cgi?id=43094
+
+        Currently this doesn't control anything, but it will soon.
+
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        (WebCore::Settings::setAccelerated2dCanvasEnabled):
+        * page/Settings.h:
+        (WebCore::Settings::accelerated2dCanvasEnabled):
+
 2010-07-28  Robin Dunn  <robin at alldunn.com>
 
         Reviewed by Kevin Ollivier.
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 9f560a4..881c885 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -130,6 +130,7 @@ Settings::Settings(Page* page)
     , m_showRepaintCounter(false)
     , m_experimentalNotificationsEnabled(false)
     , m_webGLEnabled(false)
+    , m_acceleratedCanvas2dEnabled(false)
     , m_loadDeferringEnabled(true)
     , m_tiledBackingStoreEnabled(false)
     , m_html5ParserEnabled(true)
@@ -603,6 +604,11 @@ void Settings::setWebGLEnabled(bool enabled)
     m_webGLEnabled = enabled;
 }
 
+void Settings::setAccelerated2dCanvasEnabled(bool enabled)
+{
+    m_acceleratedCanvas2dEnabled = enabled;
+}
+
 void Settings::setLoadDeferringEnabled(bool enabled)
 {
     m_loadDeferringEnabled = enabled;
diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h
index 1dee2d0..840ab2f 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -291,6 +291,9 @@ namespace WebCore {
         void setWebGLEnabled(bool);
         bool webGLEnabled() const { return m_webGLEnabled; }
 
+        void setAccelerated2dCanvasEnabled(bool);
+        bool accelerated2dCanvasEnabled() const { return m_acceleratedCanvas2dEnabled; }
+
         void setLoadDeferringEnabled(bool);
         bool loadDeferringEnabled() const { return m_loadDeferringEnabled; }
         
@@ -397,6 +400,7 @@ namespace WebCore {
         bool m_showRepaintCounter : 1;
         bool m_experimentalNotificationsEnabled : 1;
         bool m_webGLEnabled : 1;
+        bool m_acceleratedCanvas2dEnabled : 1;
         bool m_loadDeferringEnabled : 1;
         bool m_tiledBackingStoreEnabled : 1;
         bool m_html5ParserEnabled: 1;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index e45a4cc..435a675 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-28  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Add a bool to Settings to control accelerated 2d canvas
+        https://bugs.webkit.org/show_bug.cgi?id=43094
+
+        * public/WebSettings.h:
+        * src/WebSettingsImpl.cpp:
+        (WebKit::WebSettingsImpl::setAccelerated2dCanvasEnabled):
+        * src/WebSettingsImpl.h:
+
 2010-07-28  Brett Wilson  <brettw at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/public/WebSettings.h b/WebKit/chromium/public/WebSettings.h
index 32cefa1..90b8553 100644
--- a/WebKit/chromium/public/WebSettings.h
+++ b/WebKit/chromium/public/WebSettings.h
@@ -91,6 +91,7 @@ public:
     virtual void setShowDebugBorders(bool) = 0;
     virtual void setEditingBehavior(EditingBehavior) = 0;
     virtual void setAcceleratedCompositingEnabled(bool) = 0;
+    virtual void setAccelerated2dCanvasEnabled(bool) = 0;
     virtual void setHTML5ParserEnabled(bool) = 0;
     virtual void setMemoryInfoEnabled(bool) = 0;
 
diff --git a/WebKit/chromium/src/WebSettingsImpl.cpp b/WebKit/chromium/src/WebSettingsImpl.cpp
index 6a02ed6..6569e2e 100644
--- a/WebKit/chromium/src/WebSettingsImpl.cpp
+++ b/WebKit/chromium/src/WebSettingsImpl.cpp
@@ -279,6 +279,11 @@ void WebSettingsImpl::setAcceleratedCompositingEnabled(bool enabled)
     m_settings->setAcceleratedCompositingEnabled(enabled);
 }
 
+void WebSettingsImpl::setAccelerated2dCanvasEnabled(bool enabled)
+{
+    m_settings->setAccelerated2dCanvasEnabled(enabled);
+}
+
 void WebSettingsImpl::setHTML5ParserEnabled(bool enabled)
 {
     m_settings->setHTML5ParserEnabled(enabled);
diff --git a/WebKit/chromium/src/WebSettingsImpl.h b/WebKit/chromium/src/WebSettingsImpl.h
index fe5db51..9eedba8 100644
--- a/WebKit/chromium/src/WebSettingsImpl.h
+++ b/WebKit/chromium/src/WebSettingsImpl.h
@@ -87,6 +87,7 @@ public:
     virtual void setShowDebugBorders(bool);
     virtual void setEditingBehavior(EditingBehavior);
     virtual void setAcceleratedCompositingEnabled(bool);
+    virtual void setAccelerated2dCanvasEnabled(bool);
     virtual void setHTML5ParserEnabled(bool);
     virtual void setMemoryInfoEnabled(bool);
 

-- 
WebKit Debian packaging