Changeset 116632 in webkit

Timestamp:

May 10, 2012 5:20:04 AM (12 years ago)

Author:

kenneth@webkit.org

Message:

[Qt] Implement fit-to-width behaviour
​https://bugs.webkit.org/show_bug.cgi?id=86085

Reviewed by Simon Hausmann.

Source/WebCore:

Add a method to get the minimum scale factor that contains the content
without showing any chrome background.

• dom/ViewportArguments.cpp:

(WebCore::computeMinimumScaleFactorForContentContained):
(WebCore):

• dom/ViewportArguments.h:

(WebCore):

Source/WebKit2:

We don't restrict the minimum scale to the layout viewport anymore,
but instead update the minimum scale when the content size changes.

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewFlickablePrivate::didChangeViewportProperties):
(QQuickWebViewFlickablePrivate::didChangeContentsSize):

• UIProcess/API/qt/qwebviewportinfo.cpp:

(QWebViewportInfo::minimumScale):
(QWebViewportInfo::maximumScale):

• UIProcess/qt/QtViewportInteractionEngine.h:

(QtViewportInteractionEngine):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/ViewportArguments.cpp (modified) (1 diff)
• WebCore/dom/ViewportArguments.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/qt/qquickwebview.cpp (modified) (2 diffs)
• WebKit2/UIProcess/API/qt/qwebviewportinfo.cpp (modified) (2 diffs)
• WebKit2/UIProcess/qt/QtViewportInteractionEngine.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-10  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        [Qt] Implement fit-to-width behaviour
+        https://bugs.webkit.org/show_bug.cgi?id=86085
+
+        Reviewed by Simon Hausmann.
+
+        Add a method to get the minimum scale factor that contains the content
+        without showing any chrome background.
+
+        * dom/ViewportArguments.cpp:
+        (WebCore::computeMinimumScaleFactorForContentContained):
+        (WebCore):
+        * dom/ViewportArguments.h:
+        (WebCore):
+
 2012-05-10  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/dom/ViewportArguments.cpp

@@ -186 +186 @@
 }
 
+float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& viewportSize, const IntSize& contentsSize)
+{
+    float availableWidth = viewportSize.width();
+    float availableHeight = viewportSize.height();
+
+    if (result.devicePixelRatio != 1.0) {
+        availableWidth /= result.devicePixelRatio;
+        availableHeight /= result.devicePixelRatio;
+    }
+
+    return max<float>(result.minimumScale, max(availableWidth / contentsSize.width(), availableHeight / contentsSize.height()));
+}
+
 void restrictMinimumScaleFactorToViewportSize(ViewportAttributes& result, IntSize visibleViewport)
 {

trunk/Source/WebCore/dom/ViewportArguments.h

@@ -110 +110 @@
 void restrictMinimumScaleFactorToViewportSize(ViewportAttributes& result, IntSize visibleViewport);
 void restrictScaleFactorToInitialScaleIfNotUserScalable(ViewportAttributes& result);
+float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& viewportSize, const IntSize& contentSize);
 
 void setViewportFeature(const String& keyString, const String& valueString, Document*, void* data);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-05-10  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        [Qt] Implement fit-to-width behaviour
+        https://bugs.webkit.org/show_bug.cgi?id=86085
+
+        Reviewed by Simon Hausmann.
+
+        We don't restrict the minimum scale to the layout viewport anymore,
+        but instead update the minimum scale when the content size changes.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewFlickablePrivate::didChangeViewportProperties):
+        (QQuickWebViewFlickablePrivate::didChangeContentsSize):
+        * UIProcess/API/qt/qwebviewportinfo.cpp:
+        (QWebViewportInfo::minimumScale):
+        (QWebViewportInfo::maximumScale):
+        * UIProcess/qt/QtViewportInteractionEngine.h:
+        (QtViewportInteractionEngine):
+
 2012-05-07  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

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

@@ -858 +858 @@
     Q_Q(QQuickWebView);
 
-    QSize viewportSize = q->boundingRect().size().toSize();
-
     // FIXME: Revise these when implementing fit-to-width.
     WebCore::ViewportAttributes attr = newAttributes;
-    WebCore::restrictMinimumScaleFactorToViewportSize(attr, viewportSize);
     WebCore::restrictScaleFactorToInitialScaleIfNotUserScalable(attr);
 
@@ -950 +947 @@
 {
     Q_Q(QQuickWebView);
+    QSize viewportSize = q->boundingRect().size().toSize();
+
     pageView->setContentsSize(newSize);
     q->experimental()->viewportInfo()->didUpdateContentsSize();
+
+    float minimumScale = WebCore::computeMinimumScaleFactorForContentContained(attributes, viewportSize, newSize);
+
+    if (!qFuzzyCompare(minimumScale, attributes.minimumScale)) {
+        interactionEngine->setCSSScaleBounds(minimumScale, attributes.maximumScale);
+        q->experimental()->viewportInfo()->didUpdateViewportConstraints();
+
+        if (!interactionEngine->hadUserInteraction() && !pageIsSuspended)
+            interactionEngine->setCSSScale(minimumScale);
+    }
 }
 

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

@@ -63 +63 @@
 QVariant QWebViewportInfo::minimumScale() const
 {
+    if (QtViewportInteractionEngine* interactionEngine = m_webViewPrivate->viewportInteractionEngine())
+        return interactionEngine->m_minimumScale;
+
     return m_webViewPrivate->attributes.minimumScale;
 }
@@ -68 +71 @@
 QVariant QWebViewportInfo::maximumScale() const
 {
+    if (QtViewportInteractionEngine* interactionEngine = m_webViewPrivate->viewportInteractionEngine())
+        return interactionEngine->m_maximumScale;
+
     return m_webViewPrivate->attributes.maximumScale;
 }

trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h

@@ -35 +35 @@
 class QWheelEvent;
 QT_END_NAMESPACE
+
+class QWebViewportInfo;
 
 namespace WebKit {
@@ -115 +117 @@
 private:
     friend class ViewportUpdateDeferrer;
-    friend class QWebViewportInfo;
+    friend class ::QWebViewportInfo;
 
     QQuickWebView* const m_viewport;