Title: [169917] trunk/Source/WebCore
- Revision
- 169917
- Author
- [email protected]
- Date
- 2014-06-12 15:44:56 -0700 (Thu, 12 Jun 2014)
Log Message
Fix the build after r169913.
* loader/HistoryController.cpp:
(WebCore::HistoryController::restoreScrollPositionAndViewState):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169916 => 169917)
--- trunk/Source/WebCore/ChangeLog 2014-06-12 22:41:43 UTC (rev 169916)
+++ trunk/Source/WebCore/ChangeLog 2014-06-12 22:44:56 UTC (rev 169917)
@@ -1,3 +1,10 @@
+2014-06-12 Andy Estes <[email protected]>
+
+ Fix the build after r169913.
+
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::restoreScrollPositionAndViewState):
+
2014-06-12 Alex Christensen <[email protected]>
Collect correct web timing data from CFNetwork.
Modified: trunk/Source/WebCore/loader/HistoryController.cpp (169916 => 169917)
--- trunk/Source/WebCore/loader/HistoryController.cpp 2014-06-12 22:41:43 UTC (rev 169916)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2014-06-12 22:44:56 UTC (rev 169917)
@@ -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
