Changeset 170270 in webkit

Timestamp:

Jun 22, 2014 11:35:32 AM (10 years ago)

Author:

Simon Fraser

Message:

[WK2] Frameset frames are not scrollable after loading (and should be)
​https://bugs.webkit.org/show_bug.cgi?id=134151
<rdar://problem/17403365>

Reviewed by Dan Bates.

Source/WebCore:
When loading a <frameset>, we could end up with an empty non-fast-scrollable
region for the main frame, because after the initial frameset document layout,
nothing updated the non-fast scrollable region as the subframes added their
scrollable areas to the the main frame's scrollable area set.

Fix by having addScrollableArea() and removeScrollableArea() trigger an update
of the non-fast scrollable region.

Test: platform/mac-wk2/tiled-drawing/scrolling/frames/frameset-frame-scrollability.html

• page/FrameView.cpp:

(WebCore::FrameView::addScrollableArea):
(WebCore::FrameView::removeScrollableArea):
(WebCore::FrameView::scrollableAreaSetChanged):

• page/FrameView.h:

LayoutTests:
Frameset test that dumps the scrolling tree.

• platform/mac-wk2/tiled-drawing/scrolling/frames/frameset-frame-scrollability.html: Added.
• platform/mac-wk2/tiled-drawing/scrolling/frames/resources/scrollable-page.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/frameset-frame-scrollability-expected.txt (added)
• LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/frameset-frame-scrollability.html (added)
• LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/resources/scrollable-page.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (2 diffs)
• Source/WebCore/page/FrameView.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-06-20  Simon Fraser  <simon.fraser@apple.com>
+
+        [WK2] Frameset frames are not scrollable after loading (and should be)
+        https://bugs.webkit.org/show_bug.cgi?id=134151
+        <rdar://problem/17403365>
+
+        Reviewed by Dan Bates.
+        
+        Frameset test that dumps the scrolling tree.
+
+        * platform/mac-wk2/tiled-drawing/scrolling/frames/frameset-frame-scrollability.html: Added.
+        * platform/mac-wk2/tiled-drawing/scrolling/frames/resources/scrollable-page.html: Added.
+
 2014-06-20  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-20  Simon Fraser  <simon.fraser@apple.com>
+
+        [WK2] Frameset frames are not scrollable after loading (and should be)
+        https://bugs.webkit.org/show_bug.cgi?id=134151
+        <rdar://problem/17403365>
+
+        Reviewed by Dan Bates.
+        
+        When loading a <frameset>, we could end up with an empty non-fast-scrollable
+        region for the main frame, because after the initial frameset document layout,
+        nothing updated the non-fast scrollable region as the subframes added their
+        scrollable areas to the the main frame's scrollable area set.
+        
+        Fix by having addScrollableArea() and removeScrollableArea() trigger an update
+        of the non-fast scrollable region.
+
+        Test: platform/mac-wk2/tiled-drawing/scrolling/frames/frameset-frame-scrollability.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::addScrollableArea):
+        (WebCore::FrameView::removeScrollableArea):
+        (WebCore::FrameView::scrollableAreaSetChanged):
+        * page/FrameView.h:
+
 2014-06-22  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -4046 +4046 @@
     if (!m_scrollableAreas)
         m_scrollableAreas = std::make_unique<ScrollableAreaSet>();
-    return m_scrollableAreas->add(scrollableArea).isNewEntry;
+    
+    if (m_scrollableAreas->add(scrollableArea).isNewEntry) {
+        scrollableAreaSetChanged();
+        return true;
+    }
+
+    return false;
 }
 
 bool FrameView::removeScrollableArea(ScrollableArea* scrollableArea)
 {
-    return m_scrollableAreas && m_scrollableAreas->remove(scrollableArea);
+    if (m_scrollableAreas && m_scrollableAreas->remove(scrollableArea)) {
+        scrollableAreaSetChanged();
+        return true;
+    }
+    return false;
 }
 
@@ -4057 +4067 @@
 {
     return m_scrollableAreas && m_scrollableAreas->contains(scrollableArea);
+}
+
+void FrameView::scrollableAreaSetChanged()
+{
+    if (auto* page = frame().page()) {
+        if (auto* scrollingCoordinator = page->scrollingCoordinator())
+            scrollingCoordinator->frameViewNonFastScrollableRegionChanged(this);
+    }
 }
 

trunk/Source/WebCore/page/FrameView.h

@@ -594 +594 @@
     void scrollToAnchor();
     void scrollPositionChanged(const IntPoint& oldPosition, const IntPoint& newPosition);
+    void scrollableAreaSetChanged();
 
     bool hasCustomScrollbars() const;