Skip to site navigation (Press enter)

[webkit-changes] [169918] tags/Safari-538.40/Source/WebCore

lforschler Thu, 12 Jun 2014 15:48:27 -0700

Title: [169918] tags/Safari-538.40/Source/WebCore

Revision: 169918
Author: [email protected]
Date: 2014-06-12 15:48:00 -0700 (Thu, 12 Jun 2014)

Log Message

Merged r169917.


Modified Paths

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

Diff

Modified: tags/Safari-538.40/Source/WebCore/ChangeLog (169917 => 169918)


--- tags/Safari-538.40/Source/WebCore/ChangeLog	2014-06-12 22:44:56 UTC (rev 169917)
+++ tags/Safari-538.40/Source/WebCore/ChangeLog	2014-06-12 22:48:00 UTC (rev 169918)
@@ -1,3 +1,14 @@
+2014-06-12  Lucas Forschler  <[email protected]>
+
+        Merge r169917
+
+    2014-06-12  Andy Estes  <[email protected]>
+
+            Fix the build after r169913.
+
+            * loader/HistoryController.cpp:
+            (WebCore::HistoryController::restoreScrollPositionAndViewState):
+
 2014-06-12  Babak Shafiei  <[email protected]>
 
         Merge r169913.

Modified: tags/Safari-538.40/Source/WebCore/loader/HistoryController.cpp (169917 => 169918)


--- tags/Safari-538.40/Source/WebCore/loader/HistoryController.cpp	2014-06-12 22:44:56 UTC (rev 169917)
+++ tags/Safari-538.40/Source/WebCore/loader/HistoryController.cpp	2014-06-12 22:48:00 UTC (rev 169918)
@@ -147,6 +147,7 @@
 #if !PLATFORM(IOS)
     // 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());
         else

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes