Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / tests / ViewportTest.cpp

diff --git a/src/third_party/WebKit/Source/web/tests/ViewportTest.cpp b/src/third_party/WebKit/Source/web/tests/ViewportTest.cpp
index 1851db5..3e53454 100644 (file)
--- a/src/third_party/WebKit/Source/web/tests/ViewportTest.cpp
+++ b/src/third_party/WebKit/Source/web/tests/ViewportTest.cpp
@@ -56,14 +56,14 @@
 #include <vector>
 
 using namespace blink;
-using WebCore::LocalFrame;
-using WebCore::FrameView;
-using WebCore::IntPoint;
-using WebCore::IntRect;
-using WebCore::IntSize;
-using WebCore::Page;
-using WebCore::PageScaleConstraints;
-using WebCore::ViewportDescription;
+using blink::LocalFrame;
+using blink::FrameView;
+using blink::IntPoint;
+using blink::IntRect;
+using blink::IntSize;
+using blink::Page;
+using blink::PageScaleConstraints;
+using blink::ViewportDescription;
 using blink::FrameTestHelpers::runPendingTasks;
 
 namespace {
@@ -105,15 +105,15 @@ class UseMockScrollbarSettings {
 public:
     UseMockScrollbarSettings()
     {
-        WebCore::Settings::setMockScrollbarsEnabled(true);
-        WebCore::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
-        EXPECT_TRUE(WebCore::ScrollbarTheme::theme()->usesOverlayScrollbars());
+        blink::Settings::setMockScrollbarsEnabled(true);
+        blink::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
+        EXPECT_TRUE(blink::ScrollbarTheme::theme()->usesOverlayScrollbars());
     }
 
     ~UseMockScrollbarSettings()
     {
-        WebCore::Settings::setMockScrollbarsEnabled(false);
-        WebCore::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
+        blink::Settings::setMockScrollbarsEnabled(false);
+        blink::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
     }
 };
 
@@ -129,7 +129,7 @@ static PageScaleConstraints runViewportTest(Page* page, int initialWidth, int in
     IntSize initialViewportSize(initialWidth, initialHeight);
     toLocalFrame(page->mainFrame())->view()->setFrameRect(IntRect(IntPoint::zero(), initialViewportSize));
     ViewportDescription description = page->viewportDescription();
-    PageScaleConstraints constraints = description.resolve(initialViewportSize, WebCore::Length(980, WebCore::Fixed));
+    PageScaleConstraints constraints = description.resolve(initialViewportSize, blink::Length(980, blink::Fixed));
 
     constraints.fitToContentsWidth(constraints.layoutSize.width(), initialWidth);
     return constraints;
@@ -2529,6 +2529,24 @@ TEST_F(ViewportTest, viewport137)
     EXPECT_TRUE(page->viewportDescription().userZoom);
 }
 
+TEST_F(ViewportTest, viewport138)
+{
+    registerMockedHttpURLLoad("viewport/viewport-138.html");
+
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-138.html", true, 0, 0, setViewportSettings);
+
+    Page* page = webViewHelper.webViewImpl()->page();
+    PageScaleConstraints constraints = runViewportTest(page, 320, 352);
+
+    EXPECT_NEAR(123.0f, constraints.layoutSize.width(), 0.01);
+    EXPECT_NEAR(135.3f, constraints.layoutSize.height(), 0.01);
+    EXPECT_NEAR(2.60f, constraints.initialScale, 0.01f);
+    EXPECT_NEAR(2.60f, constraints.minimumScale, 0.01f);
+    EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f);
+    EXPECT_TRUE(page->viewportDescription().userZoom);
+}
+
 TEST_F(ViewportTest, viewportLegacyHandheldFriendly)
 {
     UseMockScrollbarSettings mockScrollbarSettings;