Title: [137362] trunk/Source/WebCore
Revision
137362
Author
[email protected]
Date
2012-12-11 14:36:45 -0800 (Tue, 11 Dec 2012)

Log Message

[GTK] REGRESSION(r135620): Accelerated Compositing does not draw some pages.
https://bugs.webkit.org/show_bug.cgi?id=104640

Patch by Huang Dongsung <[email protected]> on 2012-12-11
Reviewed by Noam Rosenthal.

After r135620, Accelerated Compositing does not draw some pages, because
r135620 changes the tree-traversal behavior.  Before r135620, we
returned early if TextureMapperLayer can not get TextureMapper from the
root layer. However, after r135620, we run the tree-traversal even if
TextureMapperLayer can not get TextureMapper.  This patch makes
TextureMapperLayer return early like code before r135620.

Covered by existing tests.

* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::flushCompositingState):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (137361 => 137362)


--- trunk/Source/WebCore/ChangeLog	2012-12-11 22:29:47 UTC (rev 137361)
+++ trunk/Source/WebCore/ChangeLog	2012-12-11 22:36:45 UTC (rev 137362)
@@ -1,3 +1,22 @@
+2012-12-11  Huang Dongsung  <[email protected]>
+
+        [GTK] REGRESSION(r135620): Accelerated Compositing does not draw some pages.
+        https://bugs.webkit.org/show_bug.cgi?id=104640
+
+        Reviewed by Noam Rosenthal.
+
+        After r135620, Accelerated Compositing does not draw some pages, because
+        r135620 changes the tree-traversal behavior.  Before r135620, we
+        returned early if TextureMapperLayer can not get TextureMapper from the
+        root layer. However, after r135620, we run the tree-traversal even if
+        TextureMapperLayer can not get TextureMapper.  This patch makes
+        TextureMapperLayer return early like code before r135620.
+
+        Covered by existing tests.
+
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        (WebCore::GraphicsLayerTextureMapper::flushCompositingState):
+
 2012-12-11  Dan Bernstein  <[email protected]>
 
         <rdar://problem/12771885> Support ruby-position: {before, after}

Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (137361 => 137362)


--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp	2012-12-11 22:29:47 UTC (rev 137361)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp	2012-12-11 22:36:45 UTC (rev 137362)
@@ -413,6 +413,9 @@
 */
 void GraphicsLayerTextureMapper::flushCompositingState(const FloatRect&)
 {
+    if (!m_layer->textureMapper())
+        return;
+
     m_layer->flushCompositingState(this, TextureMapperLayer::TraverseDescendants);
     didFlushCompositingStateRecursive();
 }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to