Changeset 139275 in webkit

Timestamp:

Jan 9, 2013 7:33:51 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Remove deviceScaleFactor argument in computeMinimumScaleFactorForContentContained().
​https://bugs.webkit.org/show_bug.cgi?id=106500

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

deviceScaleFactor argument is not used after r139189.

Source/WebCore:

No new tests. Refactoring only.

• dom/ViewportArguments.cpp:

(WebCore::computeMinimumScaleFactorForContentContained):

• dom/ViewportArguments.h:

(WebCore):

Source/WebKit2:

• UIProcess/PageViewportController.cpp:

(WebKit::PageViewportController::updateMinimumScaleToFit):

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/PageViewportController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-09  Huang Dongsung  <luxtella@company100.net>
+
+        Remove deviceScaleFactor argument in computeMinimumScaleFactorForContentContained().
+        https://bugs.webkit.org/show_bug.cgi?id=106500
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        deviceScaleFactor argument is not used after r139189.
+
+        No new tests. Refactoring only.
+
+        * dom/ViewportArguments.cpp:
+        (WebCore::computeMinimumScaleFactorForContentContained):
+        * dom/ViewportArguments.h:
+        (WebCore):
+
 2013-01-09  Elliott Sprehn  <esprehn@gmail.com>
 

trunk/Source/WebCore/dom/ViewportArguments.cpp

@@ -272 +272 @@
 }
 
-float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& visibleViewport, const IntSize& contentsSize, float devicePixelRatio)
-{
-    FloatSize viewportSize = convertToUserSpace(visibleViewport, devicePixelRatio);
-
+float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& visibleViewport, const IntSize& contentsSize)
+{
+    FloatSize viewportSize(visibleViewport);
     return max<float>(result.minimumScale, max(viewportSize.width() / contentsSize.width(), viewportSize.height() / contentsSize.height()));
 }

trunk/Source/WebCore/dom/ViewportArguments.h

@@ -139 +139 @@
 void restrictMinimumScaleFactorToViewportSize(ViewportAttributes& result, IntSize visibleViewport, float devicePixelRatio);
 void restrictScaleFactorToInitialScaleIfNotUserScalable(ViewportAttributes& result);
-float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& viewportSize, const IntSize& contentSize, float devicePixelRatio);
+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 @@
+2013-01-09  Huang Dongsung  <luxtella@company100.net>
+
+        Remove deviceScaleFactor argument in computeMinimumScaleFactorForContentContained().
+        https://bugs.webkit.org/show_bug.cgi?id=106500
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        deviceScaleFactor argument is not used after r139189.
+
+        * UIProcess/PageViewportController.cpp:
+        (WebKit::PageViewportController::updateMinimumScaleToFit):
+
 2013-01-09  Huang Dongsung  <luxtella@company100.net>
 

trunk/Source/WebKit2/UIProcess/PageViewportController.cpp

@@ -344 +344 @@
     bool currentlyScaledToFit = fuzzyCompare(m_pageScaleFactor, m_minimumScaleToFit, 0.0001);
 
-    float minimumScale = WebCore::computeMinimumScaleFactorForContentContained(m_rawAttributes, WebCore::roundedIntSize(m_viewportSize), WebCore::roundedIntSize(m_contentsSize), 1);
+    float minimumScale = WebCore::computeMinimumScaleFactorForContentContained(m_rawAttributes, WebCore::roundedIntSize(m_viewportSize), WebCore::roundedIntSize(m_contentsSize));
 
     if (minimumScale <= 0)