| Index: Source/web/tests/ViewportTest.cpp
|
| diff --git a/Source/web/tests/ViewportTest.cpp b/Source/web/tests/ViewportTest.cpp
|
| index 3ad4aeeeba81dc6bc67b945f7936fbf83d68ebad..36c0e045eff378281bee90de565c880bc1236321 100644
|
| --- a/Source/web/tests/ViewportTest.cpp
|
| +++ b/Source/web/tests/ViewportTest.cpp
|
| @@ -37,12 +37,13 @@
|
| #include "WebScriptSource.h"
|
| #include "WebSettings.h"
|
| #include "WebViewClient.h"
|
| -#include "core/dom/ViewportDescription.h"
|
| #include "core/frame/FrameView.h"
|
| #include "core/frame/LocalFrame.h"
|
| +#include "core/page/InjectedStyleSheets.h"
|
| #include "core/page/Page.h"
|
| #include "core/page/PageScaleConstraints.h"
|
| #include "core/frame/Settings.h"
|
| +#include "platform/Length.h"
|
| #include "platform/geometry/IntPoint.h"
|
| #include "platform/geometry/IntRect.h"
|
| #include "platform/geometry/IntSize.h"
|
| @@ -127,9 +128,8 @@ static PageScaleConstraints runViewportTest(Page* page, int initialWidth, int in
|
| {
|
| IntSize initialViewportSize(initialWidth, initialHeight);
|
| page->mainFrame()->view()->setFrameRect(IntRect(IntPoint::zero(), initialViewportSize));
|
| -
|
| ViewportDescription description = page->viewportDescription();
|
| - PageScaleConstraints constraints = description.resolve(initialViewportSize);
|
| + PageScaleConstraints constraints = description.resolve(initialViewportSize, WebCore::Length(980, WebCore::Fixed));
|
|
|
| constraints.fitToContentsWidth(constraints.layoutSize.width(), initialWidth);
|
| return constraints;
|
|
|