Changeset 116832 in webkit

Timestamp:

May 11, 2012 7:01:51 PM (12 years ago)

Author:

jpfau@apple.com

Message:

REGRESSION (r114170): Scroll areas in nested frames improperly placed when tiled drawing is enabled
​https://bugs.webkit.org/show_bug.cgi?id=86239

Reviewed by Anders Carlsson.

.:

• ManualTests/resources/frame-textarea.html: Added.
• ManualTests/scrollable-positioned-frame.html: Added.
• ManualTests/scrollable-positioned-nested-frame.html: Added.

Source/WebCore:

Fixes a regression introduced in r114170 by recursively adding positions of parent frames to placement of nested frame scroll areas.

Manual tests: ManualTests/scrollable-positioned-frame.html

ManualTests/scrollable-positioned-nested-frame.html

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::computeNonFastScrollableRegion):
(WebCore::ScrollingCoordinator::frameViewLayoutUpdated):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• ManualTests/resources/frame-textarea.html (added)
• ManualTests/scrollable-positioned-frame.html (added)
• ManualTests/scrollable-positioned-nested-frame.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-05-11  Jeffrey Pfau  <jpfau@apple.com>
+
+        REGRESSION (r114170): Scroll areas in nested frames improperly placed when tiled drawing is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=86239
+
+        Reviewed by Anders Carlsson.
+
+        * ManualTests/resources/frame-textarea.html: Added.
+        * ManualTests/scrollable-positioned-frame.html: Added.
+        * ManualTests/scrollable-positioned-nested-frame.html: Added.
+
 2012-05-11  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-11  Jeffrey Pfau  <jpfau@apple.com>
+
+        REGRESSION (r114170): Scroll areas in nested frames improperly placed when tiled drawing is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=86239
+
+        Reviewed by Anders Carlsson.
+
+        Fixes a regression introduced in r114170 by recursively adding positions of parent frames to placement of nested frame scroll areas.
+
+        Manual tests: ManualTests/scrollable-positioned-frame.html
+                      ManualTests/scrollable-positioned-nested-frame.html
+
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::computeNonFastScrollableRegion):
+        (WebCore::ScrollingCoordinator::frameViewLayoutUpdated):
+
 2012-05-11  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

@@ -106 +106 @@
 }
 
-static Region computeNonFastScrollableRegion(Frame* mainFrame)
+static Region computeNonFastScrollableRegion(Frame* frame, const IntPoint& frameLocation)
 {
     Region nonFastScrollableRegion;
-
-    for (Frame* frame = mainFrame; frame; frame = frame->tree()->traverseNext()) {
-        FrameView* frameView = frame->view();
-        if (!frameView)
-            continue;
-
-        if (const FrameView::ScrollableAreaSet* scrollableAreas = frameView->scrollableAreas()) {
-            for (FrameView::ScrollableAreaSet::const_iterator it = scrollableAreas->begin(), end = scrollableAreas->end(); it != end; ++it) {
-                ScrollableArea* scrollableArea = *it;
-                nonFastScrollableRegion.unite(scrollableArea->scrollableAreaBoundingBox());
-            }
-        }
-
-        if (const HashSet<RefPtr<Widget> >* children = frameView->children()) {
-            for (HashSet<RefPtr<Widget> >::const_iterator it = children->begin(), end = children->end(); it != end; ++it) {
-                if (!(*it)->isPluginViewBase())
-                    continue;
-                
-                PluginViewBase* pluginViewBase = static_cast<PluginViewBase*>((*it).get());
-                if (pluginViewBase->wantsWheelEvents())
-                    nonFastScrollableRegion.unite(pluginViewBase->frameRect());
-            }
+    FrameView* frameView = frame->view();
+    if (!frameView)
+        return nonFastScrollableRegion;
+
+    IntPoint offset = frameLocation;
+    offset.moveBy(frameView->frameRect().location());
+
+    if (const FrameView::ScrollableAreaSet* scrollableAreas = frameView->scrollableAreas()) {
+        for (FrameView::ScrollableAreaSet::const_iterator it = scrollableAreas->begin(), end = scrollableAreas->end(); it != end; ++it) {
+            ScrollableArea* scrollableArea = *it;
+            IntRect box = scrollableArea->scrollableAreaBoundingBox();
+            box.moveBy(offset);
+            nonFastScrollableRegion.unite(box);
         }
     }
+
+    if (const HashSet<RefPtr<Widget> >* children = frameView->children()) {
+        for (HashSet<RefPtr<Widget> >::const_iterator it = children->begin(), end = children->end(); it != end; ++it) {
+            if (!(*it)->isPluginViewBase())
+                continue;
+
+            PluginViewBase* pluginViewBase = static_cast<PluginViewBase*>((*it).get());
+            if (pluginViewBase->wantsWheelEvents())
+                nonFastScrollableRegion.unite(pluginViewBase->frameRect());
+        }
+    }
+
+    FrameTree* tree = frame->tree();
+    for (Frame* subFrame = tree->firstChild(); subFrame; subFrame = subFrame->tree()->nextSibling())
+        nonFastScrollableRegion.unite(computeNonFastScrollableRegion(subFrame, offset));
 
     return nonFastScrollableRegion;
@@ -145 +151 @@
     // all scrollable areas, such as subframes, overflow divs and list boxes. We need to do this even if the
     // frame view whose layout was updated is not the main frame.
-    Region nonFastScrollableRegion = computeNonFastScrollableRegion(m_page->mainFrame());
+    Region nonFastScrollableRegion = computeNonFastScrollableRegion(m_page->mainFrame(), IntPoint());
     setNonFastScrollableRegion(nonFastScrollableRegion);