Changeset 90484 in webkit

Timestamp:

Jul 6, 2011, 1:15:07 PM (15 years ago)

Author:

Simon Fraser

Message:

2011-07-06 Simon Fraser <Simon Fraser>

Have RenderLayerCompositor take care of clearing backing store when entering the page cache
​https://bugs.webkit.org/show_bug.cgi?id=64018

Reviewed by Joseph Pecoraro.

Move responsibility for tearing down all RenderLayer backing stores from
RenderLayer itself to RenderLayerCompositor, since RenderLayerCompositor
manages backing store creation and destruction in general.

• page/FrameView.cpp: (WebCore::FrameView::clearBackingStores):
• rendering/RenderLayer.cpp:
• rendering/RenderLayer.h:
• rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::clearBackingForLayerIncludingDescendants): (WebCore::RenderLayerCompositor::clearBackingForAllLayers):
• rendering/RenderLayerCompositor.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Have RenderLayerCompositor take care of clearing backing store when entering the page cache
+        https://bugs.webkit.org/show_bug.cgi?id=64018
+
+        Reviewed by Joseph Pecoraro.
+
+        Move responsibility for tearing down all RenderLayer backing stores from
+        RenderLayer itself to RenderLayerCompositor, since RenderLayerCompositor 
+        manages backing store creation and destruction in general.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::clearBackingStores):
+        * rendering/RenderLayer.cpp:
+        * rendering/RenderLayer.h:
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::clearBackingForLayerIncludingDescendants):
+        (WebCore::RenderLayerCompositor::clearBackingForAllLayers):
+        * rendering/RenderLayerCompositor.h:
+
 2011-07-06  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -641 +641 @@
     ASSERT(compositor->inCompositingMode());
     compositor->enableCompositingMode(false);
-    root->layer()->clearBackingIncludingDescendants();
+    compositor->clearBackingForAllLayers();
 }
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3658 +3658 @@
 }
 
-void RenderLayer::clearBackingIncludingDescendants()
-{
-    clearBacking();
-
-    for (RenderLayer* l = firstChild(); l; l = l->nextSibling())
-        l->clearBackingIncludingDescendants();
-}
-
 bool RenderLayer::hasCompositedMask() const
 {

trunk/Source/WebCore/rendering/RenderLayer.h

@@ -443 +443 @@
     RenderLayerBacking* ensureBacking();
     void clearBacking();
-    void clearBackingIncludingDescendants();
     virtual GraphicsLayer* layerForHorizontalScrollbar() const;
     virtual GraphicsLayer* layerForVerticalScrollbar() const;

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1169 +1169 @@
 }
 
+void RenderLayerCompositor::clearBackingForLayerIncludingDescendants(RenderLayer* layer)
+{
+    if (!layer)
+        return;
+
+    if (layer->isComposited())
+        layer->clearBacking();
+    
+    for (RenderLayer* currLayer = layer->firstChild(); currLayer; currLayer = currLayer->nextSibling())
+        clearBackingForLayerIncludingDescendants(currLayer);
+}
+
+void RenderLayerCompositor::clearBackingForAllLayers()
+{
+    clearBackingForLayerIncludingDescendants(m_renderView->layer());
+}
+
 void RenderLayerCompositor::updateRootLayerPosition()
 {

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -148 +148 @@
     void didMoveOnscreen();
     void willMoveOffscreen();
+
+    void clearBackingForAllLayers();
     
     void didStartAcceleratedAnimation(CSSPropertyID);
@@ -209 +211 @@
     // Make or destroy the backing for this layer; returns true if backing changed.
     bool updateBacking(RenderLayer*, CompositingChangeRepaint shouldRepaint);
+
+    void clearBackingForLayerIncludingDescendants(RenderLayer*);
 
     // Repaint the given rect (which is layer's coords), and regions of child layers that intersect that rect.