[TexMap] Don't call GraphicsLayer::setNeedsDisplay() from TextureMapperLayer.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Jan 2013 08:34:16 +0000 (08:34 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Jan 2013 08:34:16 +0000 (08:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=107629

Patch by Huang Dongsung <luxtella@company100.net> on 2013-01-23
Reviewed by Noam Rosenthal.

We are removing the dependency on GraphicsLayer from TextureMapperLayer.

This is in preparation for refactoring TextureMapper to work in an actor
model (http://webkit.org/b/103854).

No new tests, refactoring only.

* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::setDrawsContent):
* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::TextureMapperLayer::flushCompositingStateForThisLayerOnly):

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

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

index 4168b623deb28848978ed0bb66c75855cb306da0..ee2ee380e2cde82eeb64b40d11aefc40845e6ad2 100644 (file)
@@ -1,3 +1,22 @@
+2013-01-23  Huang Dongsung  <luxtella@company100.net>
+
+        [TexMap] Don't call GraphicsLayer::setNeedsDisplay() from TextureMapperLayer.
+        https://bugs.webkit.org/show_bug.cgi?id=107629
+
+        Reviewed by Noam Rosenthal.
+
+        We are removing the dependency on GraphicsLayer from TextureMapperLayer.
+
+        This is in preparation for refactoring TextureMapper to work in an actor
+        model (http://webkit.org/b/103854).
+
+        No new tests, refactoring only.
+
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+        (WebCore::GraphicsLayerTextureMapper::setDrawsContent):
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::flushCompositingStateForThisLayerOnly):
+
 2013-01-23  No'am Rosenthal  <noam@webkit.org>
 
         [Texmap] Rename TextureMapperShaderManager.* TextureMapperShaderProgram.*
index e96296ba51e4aa7115dba226aa57ffef0ec01222..1ef78cc8748896466326619360fd0c64c27b8310 100644 (file)
@@ -280,6 +280,9 @@ void GraphicsLayerTextureMapper::setDrawsContent(bool value)
         return;
     notifyChange(TextureMapperLayer::DrawsContentChange);
     GraphicsLayer::setDrawsContent(value);
+
+    if (value && m_hasOwnBackingStore)
+        setNeedsDisplay();
 }
 
 /* \reimp (GraphicsLayer.h)
index 44da7a6a02e50671d42f35988a664f2e9c5ea098..5dfa1838ed4b4c21847504346eef036439b51a9b 100644 (file)
@@ -388,9 +388,6 @@ void TextureMapperLayer::flushCompositingStateForThisLayerOnly(GraphicsLayerText
     if (changeMask & ChildrenChange)
         setChildren(graphicsLayer->children());
 
-    if ((changeMask & DrawsContentChange) && graphicsLayer->drawsContent())
-        graphicsLayer->setNeedsDisplay();
-
     if (changeMask & MaskLayerChange) {
        if (TextureMapperLayer* layer = toTextureMapperLayer(graphicsLayer->maskLayer()))
            layer->m_effectTarget = this;