Changeset 169918 in webkit

Timestamp:

Jun 12, 2014, 3:48:00 PM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r169917.

Location:

tags/Safari-538.40/Source/WebCore

Files:

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

tags/Safari-538.40/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-12  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r169917
+
+    2014-06-12  Andy Estes  <aestes@apple.com>
+
+            Fix the build after r169913.
+
+            * loader/HistoryController.cpp:
+            (WebCore::HistoryController::restoreScrollPositionAndViewState):
+
 2014-06-12  Babak Shafiei  <bshafiei@apple.com>
 

tags/Safari-538.40/Source/WebCore/loader/HistoryController.cpp

@@ -148 +148 @@
     // Don't restore scroll point on iOS as FrameLoaderClient::restoreViewState() does that.
     if (view && !view->wasScrolledByUser()) {
+        Page* page = m_frame.page();
         if (page && m_frame.isMainFrame() && m_currentItem->pageScaleFactor())
             page->setPageScaleFactor(m_currentItem->pageScaleFactor(), m_currentItem->scrollPoint());