Attachment 138001 Details for Bug 84400 – Patch

[patch] Patch

bug-84400-20120419162936.patch (text/plain), 2.42 KB, created by Alexandre Elias on 2012-04-19 16:29:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandre Elias

Created: 2012-04-19 16:29:43 PDT

Size: 2.42 KB

patch

obsolete

>Subversion Revision: 114665
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 85162592e1b1c51a7da0bab9874c5178a9a56b33..edf5bdc6698536eeaabe15f8ee4a1c70c38468da 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2012-04-19  Alexandre Elias  <aelias@google.com>
>+
>+        setPageScaleFactor should setScrollPosition if scale is unchanged
>+        https://bugs.webkit.org/show_bug.cgi?id=84400
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Currently, setPageScaleFactor forgets about its "origin" argument if
>+        the page scale factor is unchanged.  This has proven undesirable in
>+        practice because, for example, a single pinch gesture may zoom in and
>+        back out to the original page scale factor, but at a different scroll
>+        offset.
>+
>+        No new tests.
>+
>+        * page/Page.cpp:
>+        (WebCore::Page::setPageScaleFactor):
>+
> 2012-04-19  vsevik@chromium.org  <vsevik@chromium.org>
> 
>         Web Inspector: No response body available for cached resource requests with error status codes.
>diff --git a/Source/WebCore/page/Page.cpp b/Source/WebCore/page/Page.cpp
>index d15b16fd5bee31388afb92ab5dd9b3bc06f8e039..3c307041af322e2cc2b57e15ec5188c318da1b3f 100644
>--- a/Source/WebCore/page/Page.cpp
>+++ b/Source/WebCore/page/Page.cpp
>@@ -611,10 +611,14 @@ void Page::setMediaVolume(float volume)
> 
> void Page::setPageScaleFactor(float scale, const IntPoint& origin)
> {
>-    if (scale == m_pageScaleFactor)
>-        return;
>-
>     Document* document = mainFrame()->document();
>+    FrameView* view = document->view();
>+
>+    if (scale == m_pageScaleFactor) {
>+        if (view && view->scrollPosition() != origin)
>+            view->setScrollPosition(origin);
>+        return;
>+    }
> 
>     m_pageScaleFactor = scale;
> 
>@@ -627,12 +631,10 @@ void Page::setPageScaleFactor(float scale, const IntPoint& origin)
>     mainFrame()->deviceOrPageScaleFactorChanged();
> #endif
> 
>-    if (FrameView* view = document->view()) {
>-        if (view->scrollPosition() != origin) {
>-          if (document->renderer() && document->renderer()->needsLayout() && view->didFirstLayout())
>-              view->layout();
>-          view->setScrollPosition(origin);
>-        }
>+    if (view && view->scrollPosition() != origin) {
>+        if (document->renderer() && document->renderer()->needsLayout() && view->didFirstLayout())
>+            view->layout();
>+        view->setScrollPosition(origin);
>     }
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 84400: 138001 | 138198 | 138213 | 138218