Changeset 139380 in webkit

Timestamp:

Jan 10, 2013 3:35:54 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt][EFL] Rename from xxxContentsScale() to xxxScale() in PageViewportController.
​https://bugs.webkit.org/show_bug.cgi?id=106537

Patch by Huang Dongsung <​luxtella@company100.net> on 2013-01-10
Reviewed by Kenneth Rohde Christiansen.

Rename 3 methods to match the terms of ViewportAttributes.

• UIProcess/API/qt/qwebkittest.cpp:

(QWebKitTest::viewport):
(QWebKitTest::contentsScale):

• UIProcess/PageViewportController.h:

(WebKit::PageViewportController::minimumScale):
(WebKit::PageViewportController::maximumScale):
(WebKit::PageViewportController::currentScale):

• UIProcess/qt/PageViewportControllerClientQt.cpp:

(WebKit::PageViewportControllerClientQt::zoomToAreaGestureEnded):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qwebkittest.cpp (modified) (2 diffs)
• UIProcess/PageViewportController.h (modified) (1 diff)
• UIProcess/qt/PageViewportControllerClientQt.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-10  Huang Dongsung  <luxtella@company100.net>
+
+        [Qt][EFL] Rename from xxxContentsScale() to xxxScale() in PageViewportController.
+        https://bugs.webkit.org/show_bug.cgi?id=106537
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Rename 3 methods to match the terms of ViewportAttributes.
+
+        * UIProcess/API/qt/qwebkittest.cpp:
+        (QWebKitTest::viewport):
+        (QWebKitTest::contentsScale):
+        * UIProcess/PageViewportController.h:
+        (WebKit::PageViewportController::minimumScale):
+        (WebKit::PageViewportController::maximumScale):
+        (WebKit::PageViewportController::currentScale):
+        * UIProcess/qt/PageViewportControllerClientQt.cpp:
+        (WebKit::PageViewportControllerClientQt::zoomToAreaGestureEnded):
+
 2013-01-10  Michael Pruett  <michael@68k.org>
 

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

@@ -152 +152 @@
         viewportData.insert(QLatin1String("layoutSize"), toJsonObject(viewportHandler->contentsLayoutSize()));
         viewportData.insert(QLatin1String("isScalable"), viewportHandler->allowsUserScaling());
-        viewportData.insert(QLatin1String("minimumScale"), viewportHandler->minimumContentsScale());
-        viewportData.insert(QLatin1String("maximumScale"), viewportHandler->maximumContentsScale());
+        viewportData.insert(QLatin1String("minimumScale"), viewportHandler->minimumScale());
+        viewportData.insert(QLatin1String("maximumScale"), viewportHandler->maximumScale());
     } else {
         viewportData.insert(QLatin1String("initialScale"), 1.0);
@@ -174 +174 @@
 {
     if (const PageViewportController* const viewport = m_webViewPrivate->viewportController())
-        return viewport->currentContentsScale();
+        return viewport->currentScale();
     return 1.0;
 }

trunk/Source/WebKit2/UIProcess/PageViewportController.h

@@ -67 +67 @@
     WebCore::FloatSize contentsLayoutSize() const { return m_rawAttributes.layoutSize; }
     float deviceScaleFactor() const;
-    float minimumContentsScale() const { return m_minimumScaleToFit; }
-    float maximumContentsScale() const { return m_rawAttributes.maximumScale; }
-    float currentContentsScale() const { return m_pageScaleFactor; }
+    float minimumScale() const { return m_minimumScaleToFit; }
+    float maximumScale() const { return m_rawAttributes.maximumScale; }
+    float currentScale() const { return m_pageScaleFactor; }
 
     void setHadUserInteraction(bool didUserInteract) { m_hadUserInteraction = didUserInteract; }

trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp

@@ -269 +269 @@
     case ZoomBack: {
         if (m_scaleStack.isEmpty()) {
-            targetScale = m_controller->minimumContentsScale();
+            targetScale = m_controller->minimumScale();
             endPosition.setY(hotspot.y() - viewportHotspot.y() / targetScale);
             endPosition.setX(0);