Changeset 102593 in webkit

Timestamp:

Dec 12, 2011 9:40:42 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[qt][wk2] Postpone scroll effects when page transition is ongoing.
​https://bugs.webkit.org/show_bug.cgi?id=74177

Patch by Michael Bruning <​michael.bruning@nokia.com> on 2011-12-12
Reviewed by Kenneth Rohde Christiansen.

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::scrollPositionRequested):

• UIProcess/API/qt/qquickwebview_p_p.h:

(QQuickWebViewPrivate::PostTransitionState::apply):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebview.cpp (modified) (1 diff)
• UIProcess/API/qt/qquickwebview_p_p.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-12  Michael Bruning  <michael.bruning@nokia.com>
+
+        [qt][wk2] Postpone scroll effects when page transition is ongoing.
+        https://bugs.webkit.org/show_bug.cgi?id=74177
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::scrollPositionRequested):
+        * UIProcess/API/qt/qquickwebview_p_p.h:
+        (QQuickWebViewPrivate::PostTransitionState::apply):
+
 2011-12-12  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -201 +201 @@
 void QQuickWebViewPrivate::scrollPositionRequested(const QPoint& pos)
 {
-    if (!useTraditionalDesktopBehaviour)
-        interactionEngine->pagePositionRequest(pos);
+    if (useTraditionalDesktopBehaviour)
+        return;
+
+    if (isTransitioningToNewPage) {
+        postTransitionState->position = pos;
+        return;
+    }
+
+    interactionEngine->pagePositionRequest(pos);
 }
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h

@@ -101 +101 @@
             p->interactionEngine->reset();
             p->interactionEngine->applyConstraints(p->computeViewportConstraints());
+            p->interactionEngine->pagePositionRequest(position);
 
             if (contentsSize.isValid()) {
@@ -107 +108 @@
             }
 
+            position = QPoint();
             contentsSize = QSize();
         }
@@ -112 +114 @@
         QQuickWebViewPrivate* p;
         QSize contentsSize;
+        QPoint position;
     };