Changeset 259445 in webkit

Timestamp:

Apr 3, 2020 12:04:45 AM (4 years ago)

Author:

Simon Fraser

Message:

Flesh out enclosingScrollableArea() implementations
​https://bugs.webkit.org/show_bug.cgi?id=209953

Reviewed by Timothy Hatcher.

enclosingScrollableArea() is a virtual function on ScrollableArea. It's currently
only called in an unused iOS WebKit1 code path, but will soon be used for scroll
latching, so flesh out implementations.

Will be tested by future scroll latching tests.

• page/FrameView.cpp:

(WebCore::FrameView::enclosingScrollableArea const):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::enclosingScrollableArea const):

• rendering/RenderListBox.cpp:

(WebCore::RenderListBox::enclosingScrollableArea const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)
• rendering/RenderListBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-03  Simon Fraser  <simon.fraser@apple.com>
+
+        Flesh out enclosingScrollableArea() implementations
+        https://bugs.webkit.org/show_bug.cgi?id=209953
+
+        Reviewed by Timothy Hatcher.
+
+        enclosingScrollableArea() is a virtual function on ScrollableArea. It's currently
+        only called in an unused iOS WebKit1 code path, but will soon be used for scroll
+        latching, so flesh out implementations.
+
+        Will be tested by future scroll latching tests.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::enclosingScrollableArea const):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::enclosingScrollableArea const):
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::enclosingScrollableArea const):
+
 2020-04-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -3801 +3801 @@
 ScrollableArea* FrameView::enclosingScrollableArea() const
 {
-    // FIXME: Walk up the frame tree and look for a scrollable parent frame or RenderLayer.
-    return nullptr;
+    if (frame().isMainFrame())
+        return nullptr;
+
+    auto* ownerElement = frame().ownerElement();
+    if (!ownerElement)
+        return nullptr;
+
+    auto* ownerRenderer = ownerElement->renderer();
+    if (!ownerRenderer)
+        return nullptr;
+
+    auto* layer = ownerRenderer->enclosingLayer();
+    if (!layer)
+        return nullptr;
+
+    return layer->enclosingScrollableLayer(IncludeSelfOrNot::IncludeSelf, CrossFrameBoundaries::No);
 }
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3599 +3599 @@
 ScrollableArea* RenderLayer::enclosingScrollableArea() const
 {
-    if (RenderLayer* scrollableLayer = enclosingScrollableLayer(IncludeSelfOrNot::ExcludeSelf, CrossFrameBoundaries::Yes))
+    if (auto* scrollableLayer = enclosingScrollableLayer(IncludeSelfOrNot::ExcludeSelf, CrossFrameBoundaries::No))
         return scrollableLayer;
 
-    // FIXME: We should return the frame view here (or possibly an ancestor frame view,
-    // if the frame view isn't scrollable.
-    return nullptr;
+    return &renderer().view().frameView();
 }
 

trunk/Source/WebCore/rendering/RenderListBox.cpp

@@ -879 +879 @@
 ScrollableArea* RenderListBox::enclosingScrollableArea() const
 {
-    // FIXME: Return a RenderLayer that's scrollable.
-    return nullptr;
+    auto* layer = enclosingLayer();
+    if (!layer)
+        return nullptr;
+
+    return layer->enclosingScrollableLayer(IncludeSelfOrNot::ExcludeSelf, CrossFrameBoundaries::No);
 }