Changeset 106202 in webkit

Timestamp:

Jan 29, 2012 3:49:39 PM (12 years ago)

Author:

Csaba Osztrogonác

Message:

Unreviewed, rolling out r106022.
​http://trac.webkit.org/changeset/106022
​https://bugs.webkit.org/show_bug.cgi?id=77305

It broke Qt-WK2 API tests (Requested by Ossy_weekend on
#webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-01-29

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::setUseTraditionalDesktopBehaviour):
(QQuickWebView::geometryChanged):

• UIProcess/API/qt/qquickwebview_p.h:
• UIProcess/API/qt/qwebviewportinfo.cpp:

(QWebViewportInfo::currentScale):
(QWebViewportInfo::devicePixelRatio):
(QWebViewportInfo::initialScale):
(QWebViewportInfo::minimumScale):
(QWebViewportInfo::maximumScale):
(QWebViewportInfo::isScalable):
(QWebViewportInfo::layoutSize):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebview.cpp (modified) (2 diffs)
• UIProcess/API/qt/qquickwebview_p.h (modified) (1 diff)
• UIProcess/API/qt/qwebviewportinfo.cpp (modified) (7 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r106022.
+        http://trac.webkit.org/changeset/106022
+        https://bugs.webkit.org/show_bug.cgi?id=77305
+
+        It broke Qt-WK2 API tests (Requested by Ossy_weekend on
+        #webkit).
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::setUseTraditionalDesktopBehaviour):
+        (QQuickWebView::geometryChanged):
+        * UIProcess/API/qt/qquickwebview_p.h:
+        * UIProcess/API/qt/qwebviewportinfo.cpp:
+        (QWebViewportInfo::currentScale):
+        (QWebViewportInfo::devicePixelRatio):
+        (QWebViewportInfo::initialScale):
+        (QWebViewportInfo::minimumScale):
+        (QWebViewportInfo::maximumScale):
+        (QWebViewportInfo::isScalable):
+        (QWebViewportInfo::layoutSize):
+
 2012-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -551 +551 @@
 void QQuickWebViewPrivate::setUseTraditionalDesktopBehaviour(bool enable)
 {
+    Q_Q(QQuickWebView);
+
+    // Do not guard, testing for the same value, as we call this from the constructor.
+
     webPageProxy->setUseFixedLayout(!enable);
     pageView->setUsesTraditionalDesktopBehaviour(enable);
+    if (enable)
+        initializeDesktop(q);
+    else
+        initializeTouch(q);
 }
 
@@ -1047 +1055 @@
     Q_D(QQuickWebView);
     QQuickItem::geometryChanged(newGeometry, oldGeometry);
-
-    if (newGeometry.isEmpty() || newGeometry.size() == oldGeometry.size())
-        return;
-
-    if (d->pageView->usesTraditionalDesktopBehaviour())
-        d->updateDesktopViewportSize();
-    else
-        d->updateTouchViewportSize();
-}
-
-void QQuickWebView::componentComplete()
-{
-    Q_D(QQuickWebView);
-    QQuickItem::componentComplete();
-    if (d->pageView->usesTraditionalDesktopBehaviour())
-        d->initializeDesktop(this);
-    else
-        d->initializeTouch(this);
+    if (newGeometry.size() != oldGeometry.size()) {
+        if (d->pageView->usesTraditionalDesktopBehaviour())
+            d->updateDesktopViewportSize();
+        else
+            d->updateTouchViewportSize();
+    }
 }
 

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

@@ -136 +136 @@
 protected:
     virtual void geometryChanged(const QRectF&, const QRectF&);
-    virtual void componentComplete();
+
     virtual void keyPressEvent(QKeyEvent*);
     virtual void keyReleaseEvent(QKeyEvent*);

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

@@ -45 +45 @@
 {
     if (!m_webViewPrivate->interactionEngine)
-        return QVariant(1.0);
+        return QVariant();
 
     return m_webViewPrivate->interactionEngine->currentCSSScale();
@@ -53 +53 @@
 {
     if (!m_webViewPrivate->interactionEngine)
-        return QVariant(1.0);
+        return QVariant();
 
     return m_webViewPrivate->interactionEngine->constraints().devicePixelRatio;
@@ -61 +61 @@
 {
     if (!m_webViewPrivate->interactionEngine)
-        return QVariant(1.0);
+        return QVariant();
 
     return m_webViewPrivate->interactionEngine->constraints().initialScale;
@@ -69 +69 @@
 {
     if (!m_webViewPrivate->interactionEngine)
-        return QVariant(0.25);
+        return QVariant();
 
     return m_webViewPrivate->interactionEngine->constraints().minimumScale;
@@ -77 +77 @@
 {
     if (!m_webViewPrivate->interactionEngine)
-        return QVariant(1.8);
+        return QVariant();
 
     return m_webViewPrivate->interactionEngine->constraints().maximumScale;
@@ -85 +85 @@
 {
     if (!m_webViewPrivate->interactionEngine)
-        return QVariant(true);
+        return QVariant();
 
     return m_webViewPrivate->interactionEngine->constraints().isUserScalable;
@@ -93 +93 @@
 {
     if (!m_webViewPrivate->interactionEngine)
-        return QVariant(QSize());
+        return QVariant();
 
     return m_webViewPrivate->interactionEngine->constraints().layoutSize;