- Revision
- 139275
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-09 19:33:51 -0800 (Wed, 09 Jan 2013)
Log Message
Remove deviceScaleFactor argument in computeMinimumScaleFactorForContentContained().
https://bugs.webkit.org/show_bug.cgi?id=106500
Patch by Huang Dongsung <luxte...@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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (139274 => 139275)
--- trunk/Source/WebCore/ChangeLog 2013-01-10 03:11:34 UTC (rev 139274)
+++ trunk/Source/WebCore/ChangeLog 2013-01-10 03:33:51 UTC (rev 139275)
@@ -1,3 +1,19 @@
+2013-01-09 Huang Dongsung <luxte...@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 <espr...@gmail.com>
Node::containingShadowRoot should be constant time
Modified: trunk/Source/WebCore/dom/ViewportArguments.cpp (139274 => 139275)
--- trunk/Source/WebCore/dom/ViewportArguments.cpp 2013-01-10 03:11:34 UTC (rev 139274)
+++ trunk/Source/WebCore/dom/ViewportArguments.cpp 2013-01-10 03:33:51 UTC (rev 139275)
@@ -271,10 +271,9 @@
return args.resolve(initialViewportSize, deviceSize, desktopWidth);
}
-float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& visibleViewport, const IntSize& contentsSize, float devicePixelRatio)
+float computeMinimumScaleFactorForContentContained(const ViewportAttributes& result, const IntSize& visibleViewport, const IntSize& contentsSize)
{
- FloatSize viewportSize = convertToUserSpace(visibleViewport, devicePixelRatio);
-
+ FloatSize viewportSize(visibleViewport);
return max<float>(result.minimumScale, max(viewportSize.width() / contentsSize.width(), viewportSize.height() / contentsSize.height()));
}
Modified: trunk/Source/WebCore/dom/ViewportArguments.h (139274 => 139275)
--- trunk/Source/WebCore/dom/ViewportArguments.h 2013-01-10 03:11:34 UTC (rev 139274)
+++ trunk/Source/WebCore/dom/ViewportArguments.h 2013-01-10 03:33:51 UTC (rev 139275)
@@ -138,7 +138,7 @@
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);
void reportViewportWarning(Document*, ViewportErrorCode, const String& replacement1, const String& replacement2);
Modified: trunk/Source/WebKit2/ChangeLog (139274 => 139275)
--- trunk/Source/WebKit2/ChangeLog 2013-01-10 03:11:34 UTC (rev 139274)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-10 03:33:51 UTC (rev 139275)
@@ -1,5 +1,17 @@
2013-01-09 Huang Dongsung <luxte...@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 <luxte...@company100.net>
+
[QT][EFL][WK2] Rename scale members in PageViewportController.
https://bugs.webkit.org/show_bug.cgi?id=106499
Modified: trunk/Source/WebKit2/UIProcess/PageViewportController.cpp (139274 => 139275)
--- trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2013-01-10 03:11:34 UTC (rev 139274)
+++ trunk/Source/WebKit2/UIProcess/PageViewportController.cpp 2013-01-10 03:33:51 UTC (rev 139275)
@@ -343,7 +343,7 @@
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)
return false;
