Changeset 57225 in webkit

Timestamp:

Apr 7, 2010 1:22:43 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-07 Kenneth Rohde Christiansen <​kenneth@webkit.org>

Reviewed by Darin Adler.

Poor rendering on lala.com with frame flattening
​https://bugs.webkit.org/show_bug.cgi?id=37164

Do not flatten offscreen iframes.

Test: fast/frames/flattening/iframe-flattening-offscreen.html

• rendering/RenderPartObject.cpp: (WebCore::RenderPartObject::flattenFrame):
• rendering/RenderPartObject.h:

Location:

trunk

Files:

• LayoutTests/fast/frames/flattening/iframe-flattening-offscreen.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderPartObject.cpp (modified) (2 diffs)
• WebCore/rendering/RenderPartObject.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-07  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Poor rendering on lala.com with frame flattening
+        https://bugs.webkit.org/show_bug.cgi?id=37164
+
+        Do not flatten offscreen iframes.
+
+        Test: fast/frames/flattening/iframe-flattening-offscreen.html
+
+        * rendering/RenderPartObject.cpp:
+        (WebCore::RenderPartObject::flattenFrame):
+        * rendering/RenderPartObject.h:
+
 2010-04-07  Abhishek Arya  <inferno@chromium.org>
 

trunk/WebCore/rendering/RenderPartObject.cpp

@@ -52 +52 @@
 }
 
-bool RenderPartObject::flattenFrame() const
+bool RenderPartObject::flattenFrame()
 {
     if (!node() || !node()->hasTagName(iframeTag))
         return false;
 
-    HTMLIFrameElement* frame = static_cast<HTMLIFrameElement*>(node());
-    bool isScrollable = frame->scrollingMode() != ScrollbarAlwaysOff;
+    HTMLIFrameElement* element = static_cast<HTMLIFrameElement*>(node());
+    bool isScrollable = element->scrollingMode() != ScrollbarAlwaysOff;
 
     if (!isScrollable && style()->width().isFixed()
@@ -64 +64 @@
         return false;
 
-    return frame->document()->frame() && frame->document()->frame()->settings()->frameFlatteningEnabled();
+    Frame* frame = element->document()->frame();
+    bool enabled = frame && frame->settings()->frameFlatteningEnabled();
+
+    if (!enabled || !frame->page())
+        return false;
+
+    FrameView* view = frame->page()->mainFrame()->view();
+    if (!view)
+        return false;
+
+    // Do not flatten offscreen inner frames during frame flattening.
+    return absoluteBoundingBoxRect().intersects(IntRect(IntPoint(0, 0), view->contentsSize()));
 }
 

trunk/WebCore/rendering/RenderPartObject.h

@@ -43 +43 @@
     virtual void viewCleared();
 
-    bool flattenFrame() const;
+    bool flattenFrame();
 };