Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Unified Diff: Source/core/testing/Internals.cpp

Issue 19555002: Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Land patch upload resulted in python error Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/testing/Internals.cpp
diff --git a/Source/core/testing/Internals.cpp b/Source/core/testing/Internals.cpp
index aab304b8c9e174e2315fdd3ea28537337e70dc32..bd5c867700228c05a15d97926c6d40cb68a2084d 100644
--- a/Source/core/testing/Internals.cpp
+++ b/Source/core/testing/Internals.cpp
@@ -911,7 +911,7 @@ void Internals::setPagination(Document* document, const String& mode, int gap, i
page->setPagination(pagination);
}
-String Internals::configurationForViewport(Document* document, float, int deviceWidth, int deviceHeight, int availableWidth, int availableHeight, ExceptionCode& ec)
+String Internals::configurationForViewport(Document* document, float, int, int, int availableWidth, int availableHeight, ExceptionCode& ec)
{
if (!document || !document->page()) {
ec = InvalidAccessError;
@@ -925,7 +925,7 @@ String Internals::configurationForViewport(Document* document, float, int device
document->styleResolver()->viewportStyleResolver()->resolve();
ViewportArguments arguments = page->viewportArguments();
- PageScaleConstraints constraints = arguments.resolve(initialViewportSize, FloatSize(deviceWidth, deviceHeight), 980 /* defaultLayoutWidthForNonMobilePages */);
+ PageScaleConstraints constraints = arguments.resolve(initialViewportSize);
constraints.fitToContentsWidth(constraints.layoutSize.width(), availableWidth);

Powered by Google App Engine
This is Rietveld 408576698