Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(335)

Unified Diff: Source/WebCore/rendering/RenderIFrame.cpp

Issue 13877010: Remove frame flattening from rendering code. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Less overzealousness. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/rendering/RenderIFrame.cpp
diff --git a/Source/WebCore/rendering/RenderIFrame.cpp b/Source/WebCore/rendering/RenderIFrame.cpp
index ae116ac5254ab0d3c5081792642561d06cd78bf8..2a41921df0aeaeecb205d4d00a21069e51673bdc 100644
--- a/Source/WebCore/rendering/RenderIFrame.cpp
+++ b/Source/WebCore/rendering/RenderIFrame.cpp
@@ -96,35 +96,6 @@ RenderView* RenderIFrame::contentRootRenderer() const
return childFrameView ? childFrameView->frame()->contentRenderer() : 0;
}
-bool RenderIFrame::flattenFrame() const
-{
- if (!node() || !node()->hasTagName(iframeTag))
- return false;
-
- HTMLIFrameElement* element = static_cast<HTMLIFrameElement*>(node());
- Frame* frame = element->document()->frame();
-
- if (isSeamless())
- return false; // Seamless iframes are already "flat", don't try to flatten them.
-
- bool enabled = frame && frame->settings() && frame->settings()->frameFlatteningEnabled();
-
- if (!enabled || !frame->page())
- return false;
-
- if (style()->width().isFixed() && style()->height().isFixed()) {
- // Do not flatten iframes with scrolling="no".
- if (element->scrollingMode() == ScrollbarAlwaysOff)
- return false;
- if (style()->width().value() <= 0 || style()->height().value() <= 0)
- return false;
- }
-
- // Do not flatten offscreen inner frames during frame flattening, as flattening might make them visible.
- IntRect boundingRect = absoluteBoundingBoxRectIgnoringTransforms();
- return boundingRect.maxX() > 0 && boundingRect.maxY() > 0;
-}
-
void RenderIFrame::layoutSeamlessly()
{
updateLogicalWidth();
@@ -162,9 +133,6 @@ void RenderIFrame::layout()
updateLogicalWidth();
// No kids to layout as a replaced element.
updateLogicalHeight();
-
- if (flattenFrame())
- layoutWithFlattening(style()->width().isFixed(), style()->height().isFixed());
}
m_overflow.clear();

Powered by Google App Engine
This is Rietveld 408576698