Title: [107825] branches/chromium/963/Source/WebCore/rendering
- Revision
- 107825
- Author
- [email protected]
- Date
- 2012-02-15 11:16:34 -0800 (Wed, 15 Feb 2012)
Log Message
Merge 107024 - Properly detect top level frames when propogating compositing
https://bugs.webkit.org/show_bug.cgi?id=78033
Reviewed by James Robinson.
There's no need to enumerate all tag names when searching for a
top-level frame. If a render view's document has a frame, then that
frame is not the top-level one.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::shouldPropagateCompositingToEnclosingFrame):
* rendering/RenderLayerCompositor.h:
(RenderLayerCompositor):
[email protected]
Review URL: https://chromiumcodereview.appspot.com/9405017
Modified Paths
Diff
Modified: branches/chromium/963/Source/WebCore/rendering/RenderLayerCompositor.cpp (107824 => 107825)
--- branches/chromium/963/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-02-15 18:57:06 UTC (rev 107824)
+++ branches/chromium/963/Source/WebCore/rendering/RenderLayerCompositor.cpp 2012-02-15 19:16:34 UTC (rev 107825)
@@ -1262,7 +1262,7 @@
// Parent document content needs to be able to render on top of a composited frame, so correct behavior
// is to have the parent document become composited too. However, this can cause problems on platforms that
// use native views for frames (like Mac), so disable that behavior on those platforms for now.
- HTMLFrameOwnerElement* ownerElement = enclosingFrameElement();
+ HTMLFrameOwnerElement* ownerElement = m_renderView->document()->ownerElement();
RenderObject* renderer = ownerElement ? ownerElement->renderer() : 0;
// If we are the top-level frame, don't propagate.
@@ -1293,14 +1293,6 @@
return false;
}
-HTMLFrameOwnerElement* RenderLayerCompositor::enclosingFrameElement() const
-{
- if (HTMLFrameOwnerElement* ownerElement = m_renderView->document()->ownerElement())
- return (ownerElement->hasTagName(iframeTag) || ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(objectTag)) ? ownerElement : 0;
-
- return 0;
-}
-
bool RenderLayerCompositor::needsToBeComposited(const RenderLayer* layer) const
{
if (!canBeComposited(layer))
Modified: branches/chromium/963/Source/WebCore/rendering/RenderLayerCompositor.h (107824 => 107825)
--- branches/chromium/963/Source/WebCore/rendering/RenderLayerCompositor.h 2012-02-15 18:57:06 UTC (rev 107824)
+++ branches/chromium/963/Source/WebCore/rendering/RenderLayerCompositor.h 2012-02-15 19:16:34 UTC (rev 107825)
@@ -175,8 +175,6 @@
static bool allowsIndependentlyCompositedFrames(const FrameView*);
bool shouldPropagateCompositingToEnclosingFrame() const;
- HTMLFrameOwnerElement* enclosingFrameElement() const;
-
static RenderLayerCompositor* frameContentsCompositor(RenderPart*);
// Return true if the layers changed.
static bool parentFrameContentLayers(RenderPart*);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
