[webkit-changes] [139274] trunk/Source/WebKit2

Wed, 09 Jan 2013 19:09:53 -0800

Title: [139274] trunk/Source/WebKit2
Revision
139274
Author
commit-qu...@webkit.org
Date
2013-01-09 19:11:34 -0800 (Wed, 09 Jan 2013)

Log Message

[QT][EFL][WK2] Rename scale members in PageViewportController.
https://bugs.webkit.org/show_bug.cgi?id=106499

Patch by Huang Dongsung <luxte...@company100.net> on 2013-01-09
Reviewed by Kenneth Rohde Christiansen.

Rename from m_contentsScale to m_pageScaleFactor and from devicePixelRatio() to
deviceScaleFactor() to match terms of WebCore.

* UIProcess/API/qt/qwebkittest.cpp:
(QWebKitTest::devicePixelRatio):
* UIProcess/PageViewportController.cpp:
(WebKit::PageViewportController::PageViewportController):
(WebKit::PageViewportController::deviceScaleFactor):
(WebKit::PageViewportController::pixelAlignedFloatPoint):
(WebKit::PageViewportController::boundContentsPosition):
(WebKit::PageViewportController::didRenderFrame):
(WebKit::PageViewportController::didChangeContentsVisibility):
(WebKit::PageViewportController::syncVisibleContents):
(WebKit::PageViewportController::visibleContentsSize):
(WebKit::PageViewportController::applyScaleAfterRenderingContents):
(WebKit::PageViewportController::updateMinimumScaleToFit):
* UIProcess/PageViewportController.h:
(PageViewportController):
(WebKit::PageViewportController::currentContentsScale):
* UIProcess/efl/PageViewportControllerClientEfl.cpp:
(WebKit::PageViewportControllerClientEfl::updateViewportSize):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (139273 => 139274)


--- trunk/Source/WebKit2/ChangeLog	2013-01-10 02:51:59 UTC (rev 139273)
+++ trunk/Source/WebKit2/ChangeLog	2013-01-10 03:11:34 UTC (rev 139274)
@@ -1,3 +1,32 @@
+2013-01-09  Huang Dongsung  <luxte...@company100.net>
+
+        [QT][EFL][WK2] Rename scale members in PageViewportController.
+        https://bugs.webkit.org/show_bug.cgi?id=106499
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Rename from m_contentsScale to m_pageScaleFactor and from devicePixelRatio() to
+        deviceScaleFactor() to match terms of WebCore.
+
+        * UIProcess/API/qt/qwebkittest.cpp:
+        (QWebKitTest::devicePixelRatio):
+        * UIProcess/PageViewportController.cpp:
+        (WebKit::PageViewportController::PageViewportController):
+        (WebKit::PageViewportController::deviceScaleFactor):
+        (WebKit::PageViewportController::pixelAlignedFloatPoint):
+        (WebKit::PageViewportController::boundContentsPosition):
+        (WebKit::PageViewportController::didRenderFrame):
+        (WebKit::PageViewportController::didChangeContentsVisibility):
+        (WebKit::PageViewportController::syncVisibleContents):
+        (WebKit::PageViewportController::visibleContentsSize):
+        (WebKit::PageViewportController::applyScaleAfterRenderingContents):
+        (WebKit::PageViewportController::updateMinimumScaleToFit):
+        * UIProcess/PageViewportController.h:
+        (PageViewportController):
+        (WebKit::PageViewportController::currentContentsScale):
+        * UIProcess/efl/PageViewportControllerClientEfl.cpp:
+        (WebKit::PageViewportControllerClientEfl::updateViewportSize):
+
 2013-01-09  KyungTae Kim  <ktf....@samsung.com>
 
         [WK2][soup] Get rid of LocalTerminationDisabler

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp (139273 => 139274)


--- trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp	2013-01-10 02:51:59 UTC (rev 139273)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp	2013-01-10 03:11:34 UTC (rev 139274)
@@ -166,7 +166,7 @@
 QVariant QWebKitTest::devicePixelRatio() const
 {
     if (const PageViewportController* const viewport = m_webViewPrivate->viewportController())
-        return viewport->devicePixelRatio();
+        return viewport->deviceScaleFactor();
     return 1.0;
 }

Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.cpp (139273 => 139274)


--- trunk/Source/WebKit2/UIProcess/PageViewportController.cpp	2013-01-10 02:51:59 UTC (rev 139273)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.cpp	2013-01-10 03:11:34 UTC (rev 139274)
@@ -47,7 +47,7 @@
     , m_initiallyFitToViewport(true)
     , m_hasSuspendedContent(false)
     , m_hadUserInteraction(false)
-    , m_contentsScale(1)
+    , m_pageScaleFactor(1)
     , m_pendingPositionChange(false)
     , m_pendingScaleChange(false)
 {
@@ -82,7 +82,7 @@
     return innerBoundedViewportScale(viewportScale);
 }
 
-float PageViewportController::devicePixelRatio() const
+float PageViewportController::deviceScaleFactor() const
 {
     return m_webPageProxy->deviceScaleFactor();
 }
@@ -95,18 +95,18 @@
 FloatPoint PageViewportController::pixelAlignedFloatPoint(const FloatPoint& framePosition)
 {
 #if PLATFORM(EFL)
-    if (!isIntegral(m_contentsScale)) {
+    if (!isIntegral(m_pageScaleFactor)) {
         // To avoid blurryness, modify the position so that it maps into a discrete device position.
         FloatPoint scaledPos(framePosition);
 
         // Scale by the effective scale factor to compute the screen-relative position.
-        scaledPos.scale(m_contentsScale, m_contentsScale);
+        scaledPos.scale(m_pageScaleFactor, m_pageScaleFactor);
 
         // Round to integer boundaries.
         FloatPoint alignedPos = roundedIntPoint(scaledPos);
 
         // Convert back to CSS coordinates.
-        alignedPos.scale(1 / m_contentsScale, 1 / m_contentsScale);
+        alignedPos.scale(1 / m_pageScaleFactor, 1 / m_pageScaleFactor);
 
         return alignedPos;
     }
@@ -133,7 +133,7 @@
 
 FloatPoint PageViewportController::boundContentsPosition(const WebCore::FloatPoint& framePosition)
 {
-    return boundContentsPositionAtScale(framePosition, m_contentsScale);
+    return boundContentsPositionAtScale(framePosition, m_pageScaleFactor);
 }
 
 void PageViewportController::didCommitLoad()
@@ -189,7 +189,7 @@
 
     if (m_pendingScaleChange) {
         m_pendingScaleChange = false;
-        m_client->setContentsScale(m_contentsScale);
+        m_client->setContentsScale(m_pageScaleFactor);
 
         // The scale changed, we have to re-pixel align.
         m_pendingPositionChange = true;
@@ -256,7 +256,7 @@
     if (!m_pendingPositionChange)
         m_contentsPosition = position;
     if (!m_pendingScaleChange)
-        m_contentsScale = scale;
+        m_pageScaleFactor = scale;
 
     syncVisibleContents(trajectoryVector);
 }
@@ -269,7 +269,7 @@
 
     FloatRect visibleContentsRect(boundContentsPosition(m_contentsPosition), visibleContentsSize());
     visibleContentsRect.intersect(FloatRect(FloatPoint::zero(), m_contentsSize));
-    drawingArea->setVisibleContentsRect(visibleContentsRect, m_contentsScale, trajectoryVector);
+    drawingArea->setVisibleContentsRect(visibleContentsRect, m_pageScaleFactor, trajectoryVector);
 
     m_client->didChangeVisibleContents();
 }
@@ -299,7 +299,7 @@
 
 FloatSize PageViewportController::visibleContentsSize() const
 {
-    return FloatSize(m_viewportSize.width() / m_contentsScale, m_viewportSize.height() / m_contentsScale);
+    return FloatSize(m_viewportSize.width() / m_pageScaleFactor, m_viewportSize.height() / m_pageScaleFactor);
 }
 
 void PageViewportController::suspendContent()
@@ -324,7 +324,7 @@
 
 void PageViewportController::applyScaleAfterRenderingContents(float scale)
 {
-    m_contentsScale = scale;
+    m_pageScaleFactor = scale;
     m_pendingScaleChange = true;
     syncVisibleContents();
 }
@@ -341,7 +341,7 @@
     if (m_viewportSize.isEmpty() || m_contentsSize.isEmpty())
         return false;
 
-    bool currentlyScaledToFit = fuzzyCompare(m_contentsScale, m_minimumScaleToFit, 0.0001);
+    bool currentlyScaledToFit = fuzzyCompare(m_pageScaleFactor, m_minimumScaleToFit, 0.0001);
 
     float minimumScale = WebCore::computeMinimumScaleFactorForContentContained(m_rawAttributes, WebCore::roundedIntSize(m_viewportSize), WebCore::roundedIntSize(m_contentsSize), 1);
 
@@ -356,8 +356,8 @@
                 applyScaleAfterRenderingContents(m_minimumScaleToFit);
             else {
                 // Ensure the effective scale stays within bounds.
-                float boundedScale = innerBoundedViewportScale(m_contentsScale);
-                if (!fuzzyCompare(boundedScale, m_contentsScale, 0.0001))
+                float boundedScale = innerBoundedViewportScale(m_pageScaleFactor);
+                if (!fuzzyCompare(boundedScale, m_pageScaleFactor, 0.0001))
                     applyScaleAfterRenderingContents(boundedScale);
             }
         }

Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.h (139273 => 139274)


--- trunk/Source/WebKit2/UIProcess/PageViewportController.h	2013-01-10 02:51:59 UTC (rev 139273)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.h	2013-01-10 03:11:34 UTC (rev 139274)
@@ -65,10 +65,10 @@
     bool allowsUserScaling() const { return m_allowsUserScaling; }
 
     WebCore::FloatSize contentsLayoutSize() const { return m_rawAttributes.layoutSize; }
-    float devicePixelRatio() const;
+    float deviceScaleFactor() const;
     float minimumContentsScale() const { return m_minimumScaleToFit; }
     float maximumContentsScale() const { return m_rawAttributes.maximumScale; }
-    float currentContentsScale() const { return m_contentsScale; }
+    float currentContentsScale() const { return m_pageScaleFactor; }
 
     void setHadUserInteraction(bool didUserInteract) { m_hadUserInteraction = didUserInteract; }
 
@@ -106,7 +106,7 @@
     WebCore::FloatSize m_contentsSize;
     WebCore::FloatSize m_viewportSize;
     WebCore::IntSize m_clientContentsSize;
-    float m_contentsScale;
+    float m_pageScaleFactor;
 
     bool m_pendingPositionChange;
     bool m_pendingScaleChange;

Modified: trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp (139273 => 139274)


--- trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp	2013-01-10 02:51:59 UTC (rev 139273)
+++ trunk/Source/WebKit2/UIProcess/efl/PageViewportControllerClientEfl.cpp	2013-01-10 03:11:34 UTC (rev 139274)
@@ -64,7 +64,7 @@
     ASSERT(m_controller);
     FloatSize size = m_viewImpl->size();
     // The viewport controller expects sizes in UI units, and not raw device units.
-    size.scale(1 / m_controller->devicePixelRatio());
+    size.scale(1 / m_controller->deviceScaleFactor());
     m_controller->didChangeViewportSize(size);
 }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to