Canvas blending tests fail on Mac WK2

https://bugs.webkit.org/show_bug.cgi?id=105943

Patch by Rik Cabanier <cabanier@adobe.com> on 2013-01-03
Reviewed by Simon Fraser.

Source/WebCore:

Tests that now pass:
    LayoutTests/fast/canvas/canvas-blend-solid.html
    LayoutTests/fast/canvas/canvas-blend-image.html

* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
* testing/InternalSettings.h:
(Backup):

Source/WebKit2:

CanvasUsesAcceleratedDrawing preference was not passed to the WebProcess.

* WebProcess/InjectedBundle/InjectedBundle.cpp: Adds support for CanvasUsesAcceleratedDrawing to WK2
(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):

LayoutTests:

* platform/mac-wk2/TestExpectations: updated expectations as the test now passes

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@138726 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5ce3f18..6f906bb 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2013-01-03  Rik Cabanier  <cabanier@adobe.com>
+
+        Canvas blending tests fail on Mac WK2
+        https://bugs.webkit.org/show_bug.cgi?id=105943
+
+        Reviewed by Simon Fraser.
+
+        * platform/mac-wk2/TestExpectations: updated expectations as the test now passes
+
 2013-01-03  Adam Klein  <adamk@chromium.org>
 
         Clear failed image loads when an <img> is adopted into a different document

diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
index bfa0624..c81b87b 100644 (file)
--- a/LayoutTests/platform/mac-wk2/TestExpectations
+++ b/LayoutTests/platform/mac-wk2/TestExpectations
@@ -272,10 +272,6 @@ webkit.org/b/98960 fast/parser/document-open-in-unload.html [ Skip ]
 webkit.org/b/76359 editing/shadow [ Skip ]
 webkit.org/b/76359 fast/dom/shadow [ Skip ]
 
-# Canvas blending tests fail on Mac WK2
-webkit.org/b/105943 fast/canvas/canvas-blend-image.html [ Failure ]
-webkit.org/b/105943 fast/canvas/canvas-blend-solid.html [ Failure ]
-
 # fast/events/controlclick-no-onclick.html fails on Mac WK2
 webkit.org/b/105948 fast/events/controlclick-no-onclick.html [ Failure ]
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b44c55c..70664e3 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2013-01-03  Rik Cabanier  <cabanier@adobe.com>
+
+        Canvas blending tests fail on Mac WK2
+        https://bugs.webkit.org/show_bug.cgi?id=105943
+
+        Reviewed by Simon Fraser.
+
+        Tests that now pass: 
+            LayoutTests/fast/canvas/canvas-blend-solid.html 
+            LayoutTests/fast/canvas/canvas-blend-image.html
+
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::Backup::Backup):
+        (WebCore::InternalSettings::Backup::restoreTo):
+        * testing/InternalSettings.h:
+        (Backup):
+
 2013-01-03   Arko Saha  <arko@motorola.com>
 
         Microdata: Fix build failure after r137003

diff --git a/Source/WebCore/testing/InternalSettings.cpp b/Source/WebCore/testing/InternalSettings.cpp
index c461c29..2fc6dd2 100644 (file)
--- a/Source/WebCore/testing/InternalSettings.cpp
+++ b/Source/WebCore/testing/InternalSettings.cpp
@@ -95,6 +95,7 @@ InternalSettings::Backup::Backup(Settings* settings)
     , m_originalCompositingForFixedPositionEnabled(settings->acceleratedCompositingForFixedPositionEnabled())
     , m_originalCompositingForScrollableFramesEnabled(settings->acceleratedCompositingForScrollableFramesEnabled())
     , m_originalAcceleratedDrawingEnabled(settings->acceleratedDrawingEnabled())
+    , m_originalCanvasUsesAcceleratedDrawing(settings->canvasUsesAcceleratedDrawing())
     , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled())
     , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttributeAwareFormControlUIEnabled())
     , m_imagesEnabled(settings->areImagesEnabled())
@@ -141,6 +142,7 @@ void InternalSettings::Backup::restoreTo(Settings* settings)
     settings->setAcceleratedCompositingForFixedPositionEnabled(m_originalCompositingForFixedPositionEnabled);
     settings->setAcceleratedCompositingForScrollableFramesEnabled(m_originalCompositingForScrollableFramesEnabled);
     settings->setAcceleratedDrawingEnabled(m_originalAcceleratedDrawingEnabled);
+    settings->setCanvasUsesAcceleratedDrawing(m_originalCanvasUsesAcceleratedDrawing);
     settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
     RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttributeAwareFormControlUIEnabled);
     settings->setImagesEnabled(m_imagesEnabled);

diff --git a/Source/WebCore/testing/InternalSettings.h b/Source/WebCore/testing/InternalSettings.h
index 31a1e56..3f55fd2 100644 (file)
--- a/Source/WebCore/testing/InternalSettings.h
+++ b/Source/WebCore/testing/InternalSettings.h
@@ -82,6 +82,7 @@ public:
         bool m_originalCompositingForFixedPositionEnabled;
         bool m_originalCompositingForScrollableFramesEnabled;
         bool m_originalAcceleratedDrawingEnabled;
+        bool m_originalCanvasUsesAcceleratedDrawing;
         bool m_originalMockScrollbarsEnabled;
         bool m_originalUsesOverlayScrollbars;
         bool m_langAttributeAwareFormControlUIEnabled;

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index b221184..1c6c42f 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2013-01-03  Rik Cabanier  <cabanier@adobe.com>
+
+        Canvas blending tests fail on Mac WK2
+        https://bugs.webkit.org/show_bug.cgi?id=105943
+
+        Reviewed by Simon Fraser.
+
+        CanvasUsesAcceleratedDrawing preference was not passed to the WebProcess.
+
+        * WebProcess/InjectedBundle/InjectedBundle.cpp: Adds support for CanvasUsesAcceleratedDrawing to WK2
+        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+
 2013-01-02  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 
         [Qt] Use WebPageProxy::postMessageToInjectedBundle when passing messages to a specific page in the builtin bundle

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
index f252433..58284bc 100644 (file)
--- a/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
@@ -201,6 +201,7 @@ void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* page
     // Map the names used in LayoutTests with the names used in WebCore::Settings and WebPreferencesStore.
 #define FOR_EACH_OVERRIDE_BOOL_PREFERENCE(macro) \
     macro(WebKitAcceleratedCompositingEnabled, AcceleratedCompositingEnabled, acceleratedCompositingEnabled) \
+    macro(WebKitCanvasUsesAcceleratedDrawing, CanvasUsesAcceleratedDrawing, canvasUsesAcceleratedDrawing) \
     macro(WebKitCSSCustomFilterEnabled, CSSCustomFilterEnabled, cssCustomFilterEnabled) \
     macro(WebKitCSSGridLayoutEnabled, CSSGridLayoutEnabled, cssGridLayoutEnabled) \
     macro(WebKitJavaEnabled, JavaEnabled, javaEnabled) \