Changeset 209932 in webkit

Timestamp:

Dec 16, 2016 12:44:01 PM (7 years ago)

Author:

akling@apple.com

Message:

Subframes going into page cache don't need to resetScrollbars().
<​https://webkit.org/b/163750>
<rdar://problem/29273020>

Reviewed by Antti Koivisto.

Source/WebCore:

The main frame is the only frame that switches its FrameView when using the page cache,
subframes just suspend their DOM and wait around to be either killed or restored.

Thus there is no reason for subframes to reset their FrameView's scrollbars when going
into page cache, since nothing affects them while cached, and their layout should end up
identical when restoring.

This was causing some flakiness with subframe scrollbars jumping between different sizes
in when restoring from page cache in macOS/WK1. This change makes the behavior consistent
in both WK1 and WK2, and removes the flakiness.

• dom/Document.cpp:

(WebCore::Document::setPageCacheState):

LayoutTests:

Unskip compositing/iframes/page-cache-layer-tree.html on mac-wk1 and fix up the
result now that WK2 behaves correctly as well.

Both DRT and WTR run with scrollbars in "always on" mode, so the correct dimensions
for the 300x150 iframe layers here are 285x135.

• compositing/iframes/page-cache-layer-tree-expected.txt:
• platform/mac-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt (modified) (2 diffs)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-12-16  Andreas Kling  <akling@apple.com>
+
+        Subframes going into page cache don't need to resetScrollbars().
+        <https://webkit.org/b/163750>
+        <rdar://problem/29273020>
+
+        Reviewed by Antti Koivisto.
+
+        Unskip compositing/iframes/page-cache-layer-tree.html on mac-wk1 and fix up the
+        result now that WK2 behaves correctly as well.
+
+        Both DRT and WTR run with scrollbars in "always on" mode, so the correct dimensions
+        for the 300x150 iframe layers here are 285x135.
+
+        * compositing/iframes/page-cache-layer-tree-expected.txt:
+        * platform/mac-wk1/TestExpectations:
+
 2016-12-16  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt

@@ -24 +24 @@
                 (GraphicsLayer
                   (anchor 0.00 0.00)
-                  (bounds 285.00 150.00)
+                  (bounds 285.00 135.00)
                   (children 1
                     (GraphicsLayer
@@ -74 +74 @@
                     (GraphicsLayer
                       (anchor 0.00 0.00)
-                      (bounds 285.00 150.00)
+                      (bounds 285.00 135.00)
                       (children 1
                         (GraphicsLayer

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -286 +286 @@
 webkit.org/b/163361 imported/w3c/web-platform-tests/html/webappapis/animation-frames/callback-multicalls.html [ Pass Failure ]
 
-webkit.org/b/163750 compositing/iframes/page-cache-layer-tree.html [ Pass Failure ]
-
 webkit.org/b/164491 [ Yosemite ElCapitan ] fast/visual-viewport/rtl-zoomed-rects.html [ Failure ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-16  Andreas Kling  <akling@apple.com>
+
+        Subframes going into page cache don't need to resetScrollbars().
+        <https://webkit.org/b/163750>
+        <rdar://problem/29273020>
+
+        Reviewed by Antti Koivisto.
+
+        The main frame is the only frame that switches its FrameView when using the page cache,
+        subframes just suspend their DOM and wait around to be either killed or restored.
+
+        Thus there is no reason for subframes to reset their FrameView's scrollbars when going
+        into page cache, since nothing affects them while cached, and their layout should end up
+        identical when restoring.
+
+        This was causing some flakiness with subframe scrollbars jumping between different sizes
+        in when restoring from page cache in macOS/WK1. This change makes the behavior consistent
+        in both WK1 and WK2, and removes the flakiness.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setPageCacheState):
+
 2016-12-16  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4541 +4541 @@
                 if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
                     scrollingCoordinator->clearStateTree();
-            } else
-                v->resetScrollbars();
+            }
         }