| Index: Source/core/testing/Internals.cpp
|
| diff --git a/Source/core/testing/Internals.cpp b/Source/core/testing/Internals.cpp
|
| index e87247ee31b9f77cd1f71cf26e90b68b558f03d0..9c24337ff5b537dea4f83698fda8c219dfe93848 100644
|
| --- a/Source/core/testing/Internals.cpp
|
| +++ b/Source/core/testing/Internals.cpp
|
| @@ -902,12 +902,14 @@ String Internals::configurationForViewport(Document* document, float devicePixel
|
|
|
| const int defaultLayoutWidthForNonMobilePages = 980;
|
|
|
| + // FIXME(aelias): Remove this argument from all the fast/viewport tests.
|
| + ASSERT(devicePixelRatio == 1);
|
| +
|
| ViewportArguments arguments = page->viewportArguments();
|
| - ViewportAttributes attributes = computeViewportAttributes(arguments, defaultLayoutWidthForNonMobilePages, deviceWidth, deviceHeight, devicePixelRatio, IntSize(availableWidth, availableHeight));
|
| - restrictMinimumScaleFactorToViewportSize(attributes, IntSize(availableWidth, availableHeight), devicePixelRatio);
|
| - restrictScaleFactorToInitialScaleIfNotUserScalable(attributes);
|
| + PageScaleConstraints constraints = arguments.resolve(IntSize(availableWidth, availableHeight), FloatSize(deviceWidth, deviceHeight), defaultLayoutWidthForNonMobilePages);
|
| + constraints.fitToContentsWidth(constraints.layoutSize.width(), availableWidth);
|
|
|
| - return "viewport size " + String::number(attributes.layoutSize.width()) + "x" + String::number(attributes.layoutSize.height()) + " scale " + String::number(attributes.initialScale) + " with limits [" + String::number(attributes.minimumScale) + ", " + String::number(attributes.maximumScale) + "] and userScalable " + (attributes.userScalable ? "true" : "false");
|
| + return "viewport size " + String::number(constraints.layoutSize.width()) + "x" + String::number(constraints.layoutSize.height()) + " scale " + String::number(constraints.initialScale) + " with limits [" + String::number(constraints.minimumScale) + ", " + String::number(constraints.maximumScale) + "] and userScalable " + (arguments.userZoom ? "true" : "false");
|
| }
|
|
|
| bool Internals::wasLastChangeUserEdit(Element* textField, ExceptionCode& ec)
|
|
|