Title: [165913] trunk/Source/WebCore
- Revision
- 165913
- Author
- benja...@webkit.org
- Date
- 2014-03-19 13:41:46 -0700 (Wed, 19 Mar 2014)
Log Message
Page::setPageScaleFactor should not force the scroll view position when using delegatesScrolling()
https://bugs.webkit.org/show_bug.cgi?id=130429
Patch by Benjamin Poulain <bpoul...@apple.com> on 2014-03-19
Reviewed by Simon Fraser.
When setting the same scale mutliple time (for example on load), Page was asking the top scrollview
to scroll to the origin. This is bogus since the scroll view is driving Page::setDeviceScaleFactor,
not the other way around.
Simon fixed the general case in http://trac.webkit.org/changeset/165652/trunk/Source/WebCore/page/Page.cpp
but this branch was still scrolling content.
* page/Page.cpp:
(WebCore::Page::setPageScaleFactor):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165912 => 165913)
--- trunk/Source/WebCore/ChangeLog 2014-03-19 20:36:45 UTC (rev 165912)
+++ trunk/Source/WebCore/ChangeLog 2014-03-19 20:41:46 UTC (rev 165913)
@@ -1,3 +1,20 @@
+2014-03-19 Benjamin Poulain <bpoul...@apple.com>
+
+ Page::setPageScaleFactor should not force the scroll view position when using delegatesScrolling()
+ https://bugs.webkit.org/show_bug.cgi?id=130429
+
+ Reviewed by Simon Fraser.
+
+ When setting the same scale mutliple time (for example on load), Page was asking the top scrollview
+ to scroll to the origin. This is bogus since the scroll view is driving Page::setDeviceScaleFactor,
+ not the other way around.
+
+ Simon fixed the general case in http://trac.webkit.org/changeset/165652/trunk/Source/WebCore/page/Page.cpp
+ but this branch was still scrolling content.
+
+ * page/Page.cpp:
+ (WebCore::Page::setPageScaleFactor):
+
2014-03-19 Brady Eidson <beid...@apple.com>
Filter out editable services from image menu for non-contenteditable images
Modified: trunk/Source/WebCore/page/Page.cpp (165912 => 165913)
--- trunk/Source/WebCore/page/Page.cpp 2014-03-19 20:36:45 UTC (rev 165912)
+++ trunk/Source/WebCore/page/Page.cpp 2014-03-19 20:41:46 UTC (rev 165913)
@@ -695,10 +695,12 @@
FrameView* view = document->view();
if (scale == m_pageScaleFactor) {
- if (view && (view->scrollPosition() != origin || view->delegatesScrolling())) {
+ if (view && view->scrollPosition() != origin) {
if (!m_settings->delegatesPageScaling())
document->updateLayoutIgnorePendingStylesheets();
- view->setScrollPosition(origin);
+
+ if (!view->delegatesScrolling())
+ view->setScrollPosition(origin);
}
return;
}
@@ -729,7 +731,6 @@
}
}
-
void Page::setDeviceScaleFactor(float scaleFactor)
{
if (m_deviceScaleFactor == scaleFactor)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
