Changeset 247327 in webkit

Timestamp:

Jul 10, 2019 2:12:47 PM (5 years ago)

Author:

rniwa@webkit.org

Message:

[iOS] REGRESSION(r244851): Revealing caret sometimes fails when content inset is used
​https://bugs.webkit.org/show_bug.cgi?id=199662

Reviewed by Simon Fraser.

Source/WebCore:

The bug was caused by ScrollableArea::maximumScrollPosition using ScrollableArea::visibleSize, which does not
take the content insets into account correctly, rather than FrameView::visualViewportRectExpandedByContentInsets,
which does, and is used for "viewRect" in RenderLayer::scrollRectToVisible.

Override the maximum scroll position using visualViewportRectExpandedByContentInsets in iOS to fix the issue.

Test: editing/selection/ios/autoscroll-with-top-content-inset-2.html

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::scrollRectToVisible): Fixed the bug.

LayoutTests:

Added a regression test.

• editing/selection/ios/autoscroll-with-top-content-inset-2-expected.txt: Added.
• editing/selection/ios/autoscroll-with-top-content-inset-2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/ios/autoscroll-with-top-content-inset-2-expected.txt (added)
• LayoutTests/editing/selection/ios/autoscroll-with-top-content-inset-2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-07-10  Ryosuke Niwa  <rniwa@webkit.org>
+
+        [iOS] REGRESSION(r244851): Revealing caret sometimes fails when content inset is used
+        https://bugs.webkit.org/show_bug.cgi?id=199662
+
+        Reviewed by Simon Fraser.
+
+        Added a regression test.
+
+        * editing/selection/ios/autoscroll-with-top-content-inset-2-expected.txt: Added.
+        * editing/selection/ios/autoscroll-with-top-content-inset-2.html: Added.
+
 2019-07-10  Saam Barati  <sbarati@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-10  Ryosuke Niwa  <rniwa@webkit.org>
+
+        [iOS] REGRESSION(r244851): Revealing caret sometimes fails when content inset is used
+        https://bugs.webkit.org/show_bug.cgi?id=199662
+
+        Reviewed by Simon Fraser.
+
+        The bug was caused by ScrollableArea::maximumScrollPosition using ScrollableArea::visibleSize, which does not
+        take the content insets into account correctly, rather than FrameView::visualViewportRectExpandedByContentInsets,
+        which does, and is used for "viewRect" in RenderLayer::scrollRectToVisible.
+
+        Override the maximum scroll position using visualViewportRectExpandedByContentInsets in iOS to fix the issue.
+
+        Test: editing/selection/ios/autoscroll-with-top-content-inset-2.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::scrollRectToVisible): Fixed the bug.
+
 2019-07-10  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2679 +2679 @@
             LayoutRect viewRect = frameView.visibleContentRect();
 #else
-            // FIXME: ContentInsets should be taken care of in UI process side.
+            // FIXME: ContentInsets should be taken care of in UI process side. webkit.org/b/199682
             // To do that, getRectToExpose needs to return the additional scrolling to do beyond content rect.
             LayoutRect viewRect = frameView.visualViewportRectExpandedByContentInsets();
+
+            // FIXME: webkit.org/b/199683 FrameView::visibleContentRect is wrong when content insets are present
+            maxScrollPosition = frameView.scrollPositionFromOffset(ScrollPosition(frameView.totalContentsSize() - flooredIntSize(viewRect.size())));
 
             auto contentInsets = page().contentInsets();