Changeset 40731 in webkit

Timestamp:

Feb 6, 2009 2:16:19 PM (15 years ago)

Author:

Simon Fraser

Message:

2009-02-06 Simon Fraser <Simon Fraser>

Reviewed by Eric Seidel

Expose an isRootLayer() method on RenderLayer that works whether the
layer is rooted or not, and use that in a few places in the
accelerated compositing code.

• rendering/RenderLayer.h: (WebCore::RenderLayer::isRootLayer):
• rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::paintingGoesToWindow):
• rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::rebuildCompositingLayerTree): (WebCore::RenderLayerCompositor::requiresCompositingLayer):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.h (modified) (1 diff)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-02-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Eric Seidel
+
+        Expose an isRootLayer() method on RenderLayer that works whether the
+        layer is rooted or not, and use that in a few places in the
+        accelerated compositing code.
+
+        * rendering/RenderLayer.h:
+        (WebCore::RenderLayer::isRootLayer):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::paintingGoesToWindow):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::rebuildCompositingLayerTree):
+        (WebCore::RenderLayerCompositor::requiresCompositingLayer):
+
 2009-02-06  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/rendering/RenderLayer.h

@@ -302 +302 @@
     void setInResizeMode(bool b) { m_inResizeMode = b; }
 
+    // Can't just check !parent() because we might be unrooted.
+    bool isRootLayer() const { return renderer()->node()->isDocumentNode(); }
+    
 #if USE(ACCELERATED_COMPOSITING)
     RenderLayerCompositor* compositor() const;

trunk/WebCore/rendering/RenderLayerBacking.cpp

@@ -618 +618 @@
 bool RenderLayerBacking::paintingGoesToWindow() const
 {
-    return m_owningLayer->isDocumentLayer();
+    return m_owningLayer->isRootLayer();
 }
 

trunk/WebCore/rendering/RenderLayerCompositor.cpp

@@ -454 +454 @@
 
     // host the document layer in the RenderView's root layer
-    if (layer->isDocumentLayer())
+    if (layer->isRootLayer())
         parentInRootLayer(layer);
 
@@ -638 +638 @@
     bool gotReason = false;
 
-    if (!gotReason && inCompositingMode() && layer->isDocumentLayer()) {
+    if (!gotReason && inCompositingMode() && layer->isRootLayer()) {
         fprintf(stderr, "RenderLayer %p requires compositing layer because: it's the document root\n", layer);
         gotReason = true;
@@ -662 +662 @@
 #endif
 
-    // the root layer always has a compositing layer (for now).
-    return (inCompositingMode() && layer->isDocumentLayer()) ||
+    // The root layer always has a compositing layer, but it may not have backing.
+    return (inCompositingMode() && layer->isRootLayer()) ||
              requiresCompositingLayerForTransform(layer->renderer()) ||
              clipsCompositingDescendants(layer) ||