Title: [165003] trunk/Source/WebKit2
- Revision
- 165003
- Author
- [email protected]
- Date
- 2014-03-03 13:32:21 -0800 (Mon, 03 Mar 2014)
Log Message
[iOS][WK2] Regression: ScrollView's scroll offset is never set after r164702
https://bugs.webkit.org/show_bug.cgi?id=129620
Patch by Benjamin Poulain <[email protected]> on 2014-03-03
Reviewed by Simon Fraser.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::updateVisibleContentRects):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (165002 => 165003)
--- trunk/Source/WebKit2/ChangeLog 2014-03-03 21:11:24 UTC (rev 165002)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-03 21:32:21 UTC (rev 165003)
@@ -1,3 +1,13 @@
+2014-03-03 Benjamin Poulain <[email protected]>
+
+ [iOS][WK2] Regression: ScrollView's scroll offset is never set after r164702
+ https://bugs.webkit.org/show_bug.cgi?id=129620
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::updateVisibleContentRects):
+
2014-03-03 Simon Fraser <[email protected]>
Crash when going into video fullscreen on iOS
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (165002 => 165003)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-03 21:11:24 UTC (rev 165002)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-03 21:32:21 UTC (rev 165003)
@@ -1674,18 +1674,20 @@
FloatRect exposedRect = visibleContentRectUpdateInfo.exposedRect();
m_drawingArea->setVisibleExtentContentRect(enclosingIntRect(exposedRect));
+ IntPoint scrollPosition = roundedIntPoint(visibleContentRectUpdateInfo.unobscuredRect().location());
+
double boundedScale = std::min(m_viewportConfiguration.maximumScale(), std::max(m_viewportConfiguration.minimumScale(), visibleContentRectUpdateInfo.scale()));
float floatBoundedScale = boundedScale;
if (floatBoundedScale != m_page->pageScaleFactor()) {
m_scaleWasSetByUIProcess = true;
- IntPoint scrollPosition = roundedIntPoint(visibleContentRectUpdateInfo.unobscuredRect().location());
m_page->setPageScaleFactor(floatBoundedScale, scrollPosition);
if (m_drawingArea->layerTreeHost())
m_drawingArea->layerTreeHost()->deviceOrPageScaleFactorChanged();
send(Messages::WebPageProxy::PageScaleFactorDidChange(floatBoundedScale));
}
+ m_page->mainFrame().view()->setScrollPosition(scrollPosition);
// FIXME: we should also update the frame view from unobscured rect. Altenatively, we can have it pull the values from ScrollView.
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
