Changeset 57919 in webkit

Timestamp:

Apr 20, 2010 2:24:10 PM (14 years ago)

Author:

Simon Fraser

Message:

2010-04-20 Simon Fraser <Simon Fraser>

Reviewed by Dan Bernstein.

Hook compositing layers together across iframes
​https://bugs.webkit.org/show_bug.cgi?id=37878

First step: if an iframe's document goes into compositing mode, also throw the parent
document into compositing mode (all the way up to the root). This is required both
to preserve layering (since parent document content can obscure iframe content),
and so that we can eventually hook the layer trees together.

Test: compositing/iframes/composited-iframe.html

• rendering/RenderIFrame.h:
• rendering/RenderIFrame.cpp: (WebCore::RenderIFrame::requiresLayer): In order to make an iframe composited, it also has to have a RenderLayer, so must return |true| from requiresLayer(). (WebCore::RenderIFrame::requiresAcceleratedCompositing): Returns true if the content document is in compositing mode. (WebCore::RenderIFrame::isRenderIFrame): Required so that RenderLayerCompositor can check if a renderer is an iframe. (WebCore::toRenderIFrame): Required so that RenderLayerCompositor can cast to a RenderIFrame.

• rendering/RenderLayerCompositor.h:
• rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::enableCompositingMode): Call out to the RenderView when the compositing mode changes, so that the parent document can update its compositing status. (WebCore::RenderLayerCompositor::requiresCompositingLayer): Call requiresCompositingForIFrame(). (WebCore::RenderLayerCompositor::requiresCompositingForIFrame): Check to see if the iframe wants to be composited.

• rendering/RenderObject.h: (WebCore::RenderObject::isRenderIFrame): Base class returns false.

• rendering/RenderView.h:
• rendering/RenderView.cpp: (WebCore::RenderView::compositingStateChanged): New method that allows an iframe to notify its parent document that a recalcStyle is required, to update compositing state.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/iframes (added)
• LayoutTests/compositing/iframes/composited-iframe-expected.txt (added)
• LayoutTests/compositing/iframes/composited-iframe.html (added)
• LayoutTests/compositing/iframes/resources (added)
• LayoutTests/compositing/iframes/resources/composited-subframe.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderIFrame.cpp (modified) (1 diff)
• WebCore/rendering/RenderIFrame.h (modified) (3 diffs)
• WebCore/rendering/RenderLayerCompositor.cpp (modified) (4 diffs)
• WebCore/rendering/RenderLayerCompositor.h (modified) (1 diff)
• WebCore/rendering/RenderObject.h (modified) (1 diff)
• WebCore/rendering/RenderView.cpp (modified) (1 diff)
• WebCore/rendering/RenderView.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ -13 +13 @@
 
         * platform/chromium/test_expectations.txt:
+
+2010-04-20  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Hook compositing layers together across iframes
+        https://bugs.webkit.org/show_bug.cgi?id=37878
+        
+        Testcase that has a composited iframe, and dumps the layer tree of the parent document
+        to ensure that it also became composited.
+
+        * compositing/iframes/composited-iframe-expected.txt: Added.
+        * compositing/iframes/composited-iframe.html: Added.
+        * compositing/iframes/resources/composited-subframe.html: Added.
 
 2010-04-20  Simon Fraser  <simon.fraser@apple.com>

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-20  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Hook compositing layers together across iframes
+        https://bugs.webkit.org/show_bug.cgi?id=37878
+        
+        First step: if an iframe's document goes into compositing mode, also throw the parent
+        document into compositing mode (all the way up to the root). This is required both
+        to preserve layering (since parent document content can obscure iframe content),
+        and so that we can eventually hook the layer trees together.
+
+        Test: compositing/iframes/composited-iframe.html
+
+        * rendering/RenderIFrame.h:
+        * rendering/RenderIFrame.cpp:
+        (WebCore::RenderIFrame::requiresLayer): In order to make an iframe composited, it also has to have
+        a RenderLayer, so must return |true| from requiresLayer().
+        (WebCore::RenderIFrame::requiresAcceleratedCompositing): Returns true if the content document
+        is in compositing mode.
+        (WebCore::RenderIFrame::isRenderIFrame): Required so that RenderLayerCompositor can check
+        if a renderer is an iframe.
+        (WebCore::toRenderIFrame): Required so that RenderLayerCompositor can cast to a RenderIFrame.
+
+        * rendering/RenderLayerCompositor.h:
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::enableCompositingMode): Call out to the RenderView when
+        the compositing mode changes, so that the parent document can update its compositing status.
+        (WebCore::RenderLayerCompositor::requiresCompositingLayer): Call requiresCompositingForIFrame().
+        (WebCore::RenderLayerCompositor::requiresCompositingForIFrame): Check to see if the iframe
+        wants to be composited.
+
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::isRenderIFrame): Base class returns false.
+
+        * rendering/RenderView.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::compositingStateChanged): New method that allows an iframe to notify
+        its parent document that a recalcStyle is required, to update compositing state.
+
 2010-04-20  Gavin Barraclough  <barraclough@apple.com>
 

trunk/WebCore/rendering/RenderIFrame.cpp

@@ -119 +119 @@
 }
 
+#if USE(ACCELERATED_COMPOSITING)
+bool RenderIFrame::requiresLayer() const
+{
+    if (RenderPart::requiresLayer())
+        return true;
+    
+    return requiresAcceleratedCompositing();
 }
+
+bool RenderIFrame::requiresAcceleratedCompositing() const
+{
+    if (!node() || !node()->hasTagName(iframeTag))
+        return false;
+
+    // If the contents of the iframe are composited, then we have to be as well.
+    HTMLIFrameElement* element = static_cast<HTMLIFrameElement*>(node());
+    if (Document* contentDocument = element->contentDocument()) {
+        if (RenderView* view = contentDocument->renderView())
+            return view->usesCompositing();
+    }
+
+    return false;
+}
+#endif
+
+}

trunk/WebCore/rendering/RenderIFrame.h

@@ -35 +35 @@
     RenderIFrame(Element*);
 
+#if USE(ACCELERATED_COMPOSITING)
+    bool requiresAcceleratedCompositing() const;
+#endif
+
 private:
     virtual void calcHeight();
@@ -40 +44 @@
 
     virtual void layout();
+
+#if USE(ACCELERATED_COMPOSITING)
+    virtual bool requiresLayer() const;
+#endif
+    virtual bool isRenderIFrame() const { return true; }
 
     virtual const char* renderName() const { return "RenderPartObject"; } // Lying for now to avoid breaking tests
@@ -47 +56 @@
 };
 
+inline RenderIFrame* toRenderIFrame(RenderObject* object)
+{
+    ASSERT(!object || object->isRenderIFrame());
+    return static_cast<RenderIFrame*>(object);
+}
+
+inline const RenderIFrame* toRenderIFrame(const RenderObject* object)
+{
+    ASSERT(!object || object->isRenderIFrame());
+    return static_cast<const RenderIFrame*>(object);
+}
+
+// This will catch anyone doing an unnecessary cast.
+void toRenderIFrame(const RenderIFrame*);
+
+
 } // namespace WebCore
 

trunk/WebCore/rendering/RenderLayerCompositor.cpp

@@ -44 +44 @@
 #include "Page.h"
 #include "RenderEmbeddedObject.h"
+#include "RenderIFrame.h"
 #include "RenderLayerBacking.h"
 #include "RenderReplica.h"
@@ -117 +118 @@
         else
             destroyRootPlatformLayer();
+
+        m_renderView->compositingStateChanged(m_compositing);
     }
 }
@@ -977 +980 @@
              || requiresCompositingForCanvas(renderer)
              || requiresCompositingForPlugin(renderer)
+             || requiresCompositingForIFrame(renderer)
              || renderer->style()->backfaceVisibility() == BackfaceVisibilityHidden
              || clipsCompositingDescendants(layer)
@@ -1084 +1088 @@
 }
 
+bool RenderLayerCompositor::requiresCompositingForIFrame(RenderObject* renderer) const
+{
+    return renderer->isRenderIFrame() && toRenderIFrame(renderer)->requiresAcceleratedCompositing();
+}
+
 bool RenderLayerCompositor::requiresCompositingForAnimation(RenderObject* renderer) const
 {

trunk/WebCore/rendering/RenderLayerCompositor.h

@@ -182 +182 @@
     bool requiresCompositingForCanvas(RenderObject*) const;
     bool requiresCompositingForPlugin(RenderObject*) const;
+    bool requiresCompositingForIFrame(RenderObject*) const;
     bool requiresCompositingWhenDescendantsAreCompositing(RenderObject*) const;
 

trunk/WebCore/rendering/RenderObject.h

@@ -283 +283 @@
     virtual bool isRenderBlock() const { return false; }
     virtual bool isRenderButton() const { return false; }
+    virtual bool isRenderIFrame() const { return false; }
     virtual bool isRenderImage() const { return false; }
     virtual bool isRenderInline() const { return false; }

trunk/WebCore/rendering/RenderView.cpp

@@ -709 +709 @@
 }
 
+void RenderView::compositingStateChanged(bool)
+{
+    Element* elt = document()->ownerElement();
+    if (!elt)
+        return;
+
+    // Trigger a recalcStyle in the parent document, to update compositing in that document.
+    elt->setNeedsStyleRecalc(SyntheticStyleChange);
+}
+
 RenderLayerCompositor* RenderView::compositor()
 {

trunk/WebCore/rendering/RenderView.h

@@ -164 +164 @@
     RenderLayerCompositor* compositor();
     bool usesCompositing() const;
+    void compositingStateChanged(bool nowComposited);
 #endif