Changeset 146213 in webkit

Timestamp:

Mar 19, 2013 9:49:01 AM (11 years ago)

Author:

mvujovic@adobe.com

Message:

Refactor conditions for setCompositingLayersNeedRebuild in RenderLayer::styleChanged
​https://bugs.webkit.org/show_bug.cgi?id=112606

Reviewed by Simon Fraser.

To fix bug 109098 [1], we will need to add more conditions for calling
RenderLayerCompositor::setCompositingLayersNeedRebuild in RenderLayer::styleChanged.
Adding more non-trivial conditions will make this block of code even harder to follow.
This patch refactors the current conditions into functions:

needsCompositingLayersRebuiltForClip
needsCompositingLayersRebuiltForOverflow

In bug 109098 [1], I'm planning to add:

needsCompositingLayersRebuiltForFilters

[1]: ​https://bugs.webkit.org/show_bug.cgi?id=109098

No new tests. Just refactoring.

• rendering/RenderLayer.cpp:

(WebCore):
(WebCore::RenderLayer::needsCompositingLayersRebuiltForClip):
(WebCore::RenderLayer::needsCompositingLayersRebuiltForOverflow):

This is a method and not a file static function because it needs to look at the
RenderLayer's stackingContainer(), which is a private method.

(WebCore::RenderLayer::styleChanged):

• rendering/RenderLayer.h:

(RenderLayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (2 diffs)
• rendering/RenderLayer.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-19  Max Vujovic  <mvujovic@adobe.com>
+
+        Refactor conditions for setCompositingLayersNeedRebuild in RenderLayer::styleChanged
+        https://bugs.webkit.org/show_bug.cgi?id=112606
+
+        Reviewed by Simon Fraser.
+
+        To fix bug 109098 [1], we will need to add more conditions for calling
+        RenderLayerCompositor::setCompositingLayersNeedRebuild in RenderLayer::styleChanged.
+        Adding more non-trivial conditions will make this block of code even harder to follow.
+        This patch refactors the current conditions into functions:
+            needsCompositingLayersRebuiltForClip
+            needsCompositingLayersRebuiltForOverflow
+
+        In bug 109098 [1], I'm planning to add:
+            needsCompositingLayersRebuiltForFilters
+
+        [1]: https://bugs.webkit.org/show_bug.cgi?id=109098
+
+        No new tests. Just refactoring.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore):
+        (WebCore::RenderLayer::needsCompositingLayersRebuiltForClip):
+        (WebCore::RenderLayer::needsCompositingLayersRebuiltForOverflow):
+            This is a method and not a file static function because it needs to look at the
+            RenderLayer's stackingContainer(), which is a private method.
+        (WebCore::RenderLayer::styleChanged):
+        * rendering/RenderLayer.h:
+        (RenderLayer):
+
 2013-03-19  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -5985 +5985 @@
 }
 
+#if USE(ACCELERATED_COMPOSITING)
+inline bool RenderLayer::needsCompositingLayersRebuiltForClip(const RenderStyle* oldStyle, const RenderStyle* newStyle) const
+{
+    ASSERT(newStyle);
+    return oldStyle && (oldStyle->clip() != newStyle->clip() || oldStyle->hasClip() != newStyle->hasClip());
+}
+
+inline bool RenderLayer::needsCompositingLayersRebuiltForOverflow(const RenderStyle* oldStyle, const RenderStyle* newStyle) const
+{
+    ASSERT(newStyle);
+    return !isComposited() && oldStyle && (oldStyle->overflowX() != newStyle->overflowX()) && stackingContainer()->hasCompositingDescendant();
+}
+#endif // USE(ACCELERATED_COMPOSITING)
+
 void RenderLayer::styleChanged(StyleDifference, const RenderStyle* oldStyle)
 {
@@ -6042 +6056 @@
 #if USE(ACCELERATED_COMPOSITING)
     updateNeedsCompositedScrolling();
-    if (compositor()->updateLayerCompositingState(this))
+
+    const RenderStyle* newStyle = renderer()->style();
+    if (compositor()->updateLayerCompositingState(this)
+        || needsCompositingLayersRebuiltForClip(oldStyle, newStyle)
+        || needsCompositingLayersRebuiltForOverflow(oldStyle, newStyle))
         compositor()->setCompositingLayersNeedRebuild();
-    else if (oldStyle && (oldStyle->clip() != renderer()->style()->clip() || oldStyle->hasClip() != renderer()->style()->hasClip()))
-        compositor()->setCompositingLayersNeedRebuild();
-    else if (m_backing)
-        m_backing->updateGraphicsLayerGeometry();
-    else if (oldStyle && oldStyle->overflowX() != renderer()->style()->overflowX()) {
-        if (stackingContainer()->hasCompositingDescendant())
-            compositor()->setCompositingLayersNeedRebuild();
-    }
+    else if (isComposited())
+        backing()->updateGraphicsLayerGeometry();
 #endif
 

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -771 +771 @@
     virtual bool usesCompositedScrolling() const OVERRIDE;
     bool needsCompositedScrolling() const;
+    bool needsCompositingLayersRebuiltForClip(const RenderStyle* oldStyle, const RenderStyle* newStyle) const;
+    bool needsCompositingLayersRebuiltForOverflow(const RenderStyle* oldStyle, const RenderStyle* newStyle) const;
 #else
     bool isComposited() const { return false; }