Changeset 243687 in webkit

Timestamp:

Mar 31, 2019 11:42:31 PM (5 years ago)

Author:

Manuel Rego Casasnovas

Message:

Scroll position gets reset when overflow:scroll is inside grid
​https://bugs.webkit.org/show_bug.cgi?id=196337
<rdar://problem/49385784>

Reviewed by Simon Fraser.

Fix scroll position when there are changes inside a grid item with "overflow: scroll".

Source/WebCore:

Test: fast/css-grid-layout/grid-item-content-scroll-position.html

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::layoutBlock): Use beginUpdateScrollInfoAfterLayoutTransaction()
and endAndCommitUpdateScrollInfoAfterLayoutTransaction().

LayoutTests:

• fast/css-grid-layout/grid-item-content-scroll-position-expected.txt: Added.
• fast/css-grid-layout/grid-item-content-scroll-position.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-item-content-scroll-position-expected.txt (added)
• LayoutTests/fast/css-grid-layout/grid-item-content-scroll-position.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-03-31  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        Scroll position gets reset when overflow:scroll is inside grid
+        https://bugs.webkit.org/show_bug.cgi?id=196337
+        <rdar://problem/49385784>
+
+        Reviewed by Simon Fraser.
+
+        Fix scroll position when there are changes inside a grid item with "overflow: scroll".
+
+        * fast/css-grid-layout/grid-item-content-scroll-position-expected.txt: Added.
+        * fast/css-grid-layout/grid-item-content-scroll-position.html: Added.
+
 2019-03-31  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-31  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        Scroll position gets reset when overflow:scroll is inside grid
+        https://bugs.webkit.org/show_bug.cgi?id=196337
+        <rdar://problem/49385784>
+
+        Reviewed by Simon Fraser.
+
+        Fix scroll position when there are changes inside a grid item with "overflow: scroll".
+
+        Test: fast/css-grid-layout/grid-item-content-scroll-position.html
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::layoutBlock): Use beginUpdateScrollInfoAfterLayoutTransaction()
+        and endAndCommitUpdateScrollInfoAfterLayoutTransaction().
+
 2019-03-31  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -189 +189 @@
 
         preparePaginationBeforeBlockLayout(relayoutChildren);
+        beginUpdateScrollInfoAfterLayoutTransaction();
 
         LayoutSize previousSize = size();
@@ -279 +280 @@
         layoutGridItems();
         m_trackSizingAlgorithm.reset();
+
+        endAndCommitUpdateScrollInfoAfterLayoutTransaction();
 
         if (size() != previousSize)