Changeset 167198 in webkit

Timestamp:

Apr 13, 2014 9:41:29 AM (10 years ago)

Author:

Simon Fraser

Message:

[iOS WK2] Hook up scrolling tree nodes when coming out of the page cache
​https://bugs.webkit.org/show_bug.cgi?id=131577

Reviewed by Tim Horton.

The call to scrollingCoordinator->frameViewRootLayerDidChange() was inside
a #if !PLATFORM(IOS) block, but now that we use the ScrollingCoordinator
for WK2 we want to call this.

• loader/HistoryController.cpp:

(WebCore::HistoryController::restoreScrollPositionAndViewState):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/HistoryController.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-13  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] Hook up scrolling tree nodes when coming out of the page cache
+        https://bugs.webkit.org/show_bug.cgi?id=131577
+
+        Reviewed by Tim Horton.
+
+        The call to scrollingCoordinator->frameViewRootLayerDidChange() was inside
+        a #if !PLATFORM(IOS) block, but now that we use the ScrollingCoordinator
+        for WK2 we want to call this.
+
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::restoreScrollPositionAndViewState):
+
 2014-04-13  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/loader/HistoryController.cpp

@@ -127 +127 @@
     m_frame.loader().client().restoreViewState();
 
-    // Don't restore scroll point on iOS as FrameLoaderClient::restoreViewState() does that.
-#if !PLATFORM(IOS)
     // FIXME: There is some scrolling related work that needs to happen whenever a page goes into the
     // page cache and similar work that needs to occur when it comes out. This is where we do the work
@@ -141 +139 @@
         }
 
+#if !PLATFORM(IOS)
+        // Don't restore scroll point on iOS as FrameLoaderClient::restoreViewState() does that.
         if (!view->wasScrolledByUser()) {
             if (page && m_frame.isMainFrame() && m_currentItem->pageScaleFactor())
@@ -147 +147 @@
                 view->setScrollPosition(m_currentItem->scrollPoint());
         }
-    }
 #endif
+    }
 }