Title: [133941] trunk
Revision
133941
Author
commit-qu...@webkit.org
Date
2012-11-08 13:39:56 -0800 (Thu, 08 Nov 2012)

Log Message

[Chromium] DumpRenderTree fix for canvas in software compositing
https://bugs.webkit.org/show_bug.cgi?id=101509

Patch by Slavomir Kaslev <skas...@google.com> on 2012-11-08
Reviewed by Adrienne Walker.

Don't use accelerated canvas 2d when in software compositing mode.

* DumpRenderTree/chromium/TestShell.cpp:
(TestShell::runFileTest):

Modified Paths

Diff

Modified: trunk/LayoutTests/platform/chromium/TestExpectations (133940 => 133941)


--- trunk/LayoutTests/platform/chromium/TestExpectations	2012-11-08 21:37:58 UTC (rev 133940)
+++ trunk/LayoutTests/platform/chromium/TestExpectations	2012-11-08 21:39:56 UTC (rev 133941)
@@ -3948,7 +3948,7 @@
 crbug.com/150010 platform/chromium/virtual/softwarecompositing/reflections/simple-composited-reflections.html [ Pass ]
 
 # Canvas2d not yet supported by software compositor.
-crbug.com/150018 [ Debug ] platform/chromium/virtual/softwarecompositing/layer-creation/spanOverlapsCanvas.html [ Skip ]
+crbug.com/150018 platform/chromium/virtual/softwarecompositing/layer-creation/spanOverlapsCanvas.html [ Skip ]
 crbug.com/150018 platform/chromium/virtual/softwarecompositing/overflow/overflow-hidden-canvas-layer.html [ Skip ]
 crbug.com/150018 platform/chromium/virtual/softwarecompositing/overflow/overflow-compositing-descendant.html [ Skip ]
 crbug.com/150018 platform/chromium/virtual/softwarecompositing/visibility/visibility-simple-canvas2d-layer.html [ Skip ]

Modified: trunk/Tools/ChangeLog (133940 => 133941)


--- trunk/Tools/ChangeLog	2012-11-08 21:37:58 UTC (rev 133940)
+++ trunk/Tools/ChangeLog	2012-11-08 21:39:56 UTC (rev 133941)
@@ -1,3 +1,15 @@
+2012-11-08  Slavomir Kaslev  <skas...@google.com>
+
+        [Chromium] DumpRenderTree fix for canvas in software compositing
+        https://bugs.webkit.org/show_bug.cgi?id=101509
+
+        Reviewed by Adrienne Walker.
+
+        Don't use accelerated canvas 2d when in software compositing mode.
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::runFileTest):
+
 2012-11-08  Jakob Petsovits  <jpetsov...@rim.com>
 
         [BlackBerry] Rework the API to use document coordinates

Modified: trunk/Tools/DumpRenderTree/chromium/TestShell.cpp (133940 => 133941)


--- trunk/Tools/DumpRenderTree/chromium/TestShell.cpp	2012-11-08 21:37:58 UTC (rev 133940)
+++ trunk/Tools/DumpRenderTree/chromium/TestShell.cpp	2012-11-08 21:39:56 UTC (rev 133941)
@@ -255,8 +255,9 @@
         m_testRunner->setShouldDumpFrameLoadCallbacks(true);
 
     if (testUrl.find("compositing/") != string::npos || testUrl.find("compositing\\") != string::npos) {
+        if (!m_softwareCompositingEnabled)
+            m_prefs.accelerated2dCanvasEnabled = true;
         m_prefs.acceleratedCompositingForVideoEnabled = true;
-        m_prefs.accelerated2dCanvasEnabled = true;
         m_prefs.deferred2dCanvasEnabled = true;
         m_prefs.mockScrollbarsEnabled = true;
         m_prefs.applyTo(m_webView);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to