Chromium Code Reviews Chromium Code Reviews
Issue 78963008:
Moved remaining legacy viewport tests to unit tests. (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| Index: Source/web/tests/LegacyViewportTest.cpp |
| diff --git a/Source/web/tests/ViewportTest.cpp b/Source/web/tests/LegacyViewportTest.cpp |
| similarity index 78% |
| rename from Source/web/tests/ViewportTest.cpp |
| rename to Source/web/tests/LegacyViewportTest.cpp |
| index af52576ced393802f1d7e57df5148d30386c40ea..89b164240866ae94ab72eb3001f72f14006bd5a3 100644 |
| --- a/Source/web/tests/ViewportTest.cpp |
| +++ b/Source/web/tests/LegacyViewportTest.cpp |
| @@ -32,7 +32,11 @@ |
| #include "FrameTestHelpers.h" |
| #include "URLTestHelpers.h" |
| +#include "WebConsoleMessage.h" |
| +#include "WebFrame.h" |
| +#include "WebScriptSource.h" |
| #include "WebSettings.h" |
| +#include "WebViewClient.h" |
| #include "core/dom/ViewportDescription.h" |
| #include "core/frame/Frame.h" |
| #include "core/frame/FrameView.h" |
| @@ -48,6 +52,8 @@ |
| #include <gmock/gmock.h> |
| #include <gtest/gtest.h> |
| +#include <vector> |
| + |
| using namespace blink; |
| using WebCore::Frame; |
| using WebCore::FrameView; |
| @@ -58,18 +64,20 @@ using WebCore::Page; |
| using WebCore::PageScaleConstraints; |
| using WebCore::ViewportDescription; |
| using blink::FrameTestHelpers::runPendingTasks; |
| +using blink::FrameTestHelpers::UseMockScrollbarSettings; |
| +using blink::FrameTestHelpers::setViewportSettings; |
| namespace { |
| -class ViewportTest : public testing::Test { |
| +class LegacyViewportTest : public testing::Test { |
| protected: |
| - ViewportTest() |
| + LegacyViewportTest() |
| : m_baseURL("http://www.test.com/") |
| , m_chromeURL("chrome://") |
| { |
| } |
| - virtual ~ViewportTest() |
| + virtual ~LegacyViewportTest() |
| { |
| Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); |
| } |
| @@ -84,32 +92,18 @@ protected: |
| URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_chromeURL.c_str()), WebString::fromUTF8(fileName.c_str())); |
| } |
| - std::string m_baseURL; |
| - std::string m_chromeURL; |
| -}; |
| - |
| -class UseMockScrollbarSettings { |
| -public: |
| - UseMockScrollbarSettings() |
| + void executeScript(WebFrame* frame, const WebString& code) |
| { |
| - WebCore::Settings::setMockScrollbarsEnabled(true); |
| - WebCore::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true); |
| - EXPECT_TRUE(WebCore::ScrollbarTheme::theme()->usesOverlayScrollbars()); |
| + frame->executeScript(WebScriptSource(code)); |
| + runPendingTasks(); |
| } |
| - ~UseMockScrollbarSettings() |
| - { |
| - WebCore::Settings::setMockScrollbarsEnabled(false); |
| - WebCore::RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false); |
| - } |
| + UseMockScrollbarSettings m_mockScrollbarSettings; |
| + std::string m_baseURL; |
| + std::string m_chromeURL; |
| }; |
| -static void setViewportSettings(WebSettings* settings) |
| -{ |
| - settings->setViewportEnabled(true); |
| -} |
| - |
| -static PageScaleConstraints runViewportTest(Page* page, int initialWidth, int initialHeight) |
| +static PageScaleConstraints runTest(Page* page, int initialWidth, int initialHeight) |
| { |
| IntSize initialViewportSize(initialWidth, initialHeight); |
| page->mainFrame()->view()->setFrameRect(IntRect(IntPoint::zero(), initialViewportSize)); |
| @@ -121,16 +115,15 @@ static PageScaleConstraints runViewportTest(Page* page, int initialWidth, int in |
| return constraints; |
| } |
| -TEST_F(ViewportTest, viewport1) |
| +TEST_F(LegacyViewportTest, viewport1) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-1.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-1.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -140,16 +133,15 @@ TEST_F(ViewportTest, viewport1) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport2) |
| +TEST_F(LegacyViewportTest, viewport2) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-2.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-2.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -159,16 +151,15 @@ TEST_F(ViewportTest, viewport2) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport3) |
| +TEST_F(LegacyViewportTest, viewport3) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-3.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-3.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -178,16 +169,15 @@ TEST_F(ViewportTest, viewport3) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport4) |
| +TEST_F(LegacyViewportTest, viewport4) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-4.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-4.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(160, constraints.layoutSize.width()); |
| EXPECT_EQ(176, constraints.layoutSize.height()); |
| @@ -197,16 +187,15 @@ TEST_F(ViewportTest, viewport4) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport5) |
| +TEST_F(LegacyViewportTest, viewport5) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-5.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-5.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(640, constraints.layoutSize.width()); |
| EXPECT_EQ(704, constraints.layoutSize.height()); |
| @@ -216,16 +205,15 @@ TEST_F(ViewportTest, viewport5) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport6) |
| +TEST_F(LegacyViewportTest, viewport6) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-6.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-6.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(200, constraints.layoutSize.width()); |
| EXPECT_EQ(220, constraints.layoutSize.height()); |
| @@ -235,16 +223,15 @@ TEST_F(ViewportTest, viewport6) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport7) |
| +TEST_F(LegacyViewportTest, viewport7) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-7.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-7.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(1280, constraints.layoutSize.width()); |
| EXPECT_EQ(1408, constraints.layoutSize.height()); |
| @@ -254,16 +241,15 @@ TEST_F(ViewportTest, viewport7) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport8) |
| +TEST_F(LegacyViewportTest, viewport8) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-8.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-8.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(1280, constraints.layoutSize.width()); |
| EXPECT_EQ(1408, constraints.layoutSize.height()); |
| @@ -273,16 +259,15 @@ TEST_F(ViewportTest, viewport8) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport9) |
| +TEST_F(LegacyViewportTest, viewport9) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-9.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-9.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(1280, constraints.layoutSize.width()); |
| EXPECT_EQ(1408, constraints.layoutSize.height()); |
| @@ -292,16 +277,15 @@ TEST_F(ViewportTest, viewport9) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport10) |
| +TEST_F(LegacyViewportTest, viewport10) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-10.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-10.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(1280, constraints.layoutSize.width()); |
| EXPECT_EQ(1408, constraints.layoutSize.height()); |
| @@ -311,16 +295,15 @@ TEST_F(ViewportTest, viewport10) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport11) |
| +TEST_F(LegacyViewportTest, viewport11) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-11.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-11.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -330,16 +313,15 @@ TEST_F(ViewportTest, viewport11) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport12) |
| +TEST_F(LegacyViewportTest, viewport12) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-12.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-12.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(640, constraints.layoutSize.width()); |
| EXPECT_EQ(704, constraints.layoutSize.height()); |
| @@ -349,16 +331,15 @@ TEST_F(ViewportTest, viewport12) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport13) |
| +TEST_F(LegacyViewportTest, viewport13) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-13.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-13.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(1280, constraints.layoutSize.width()); |
| EXPECT_EQ(1408, constraints.layoutSize.height()); |
| @@ -368,16 +349,15 @@ TEST_F(ViewportTest, viewport13) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport14) |
| +TEST_F(LegacyViewportTest, viewport14) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-14.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-14.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -387,16 +367,15 @@ TEST_F(ViewportTest, viewport14) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport15) |
| +TEST_F(LegacyViewportTest, viewport15) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-15.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-15.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -406,16 +385,15 @@ TEST_F(ViewportTest, viewport15) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport16) |
| +TEST_F(LegacyViewportTest, viewport16) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-16.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-16.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -425,16 +403,15 @@ TEST_F(ViewportTest, viewport16) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport17) |
| +TEST_F(LegacyViewportTest, viewport17) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-17.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-17.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -444,16 +421,15 @@ TEST_F(ViewportTest, viewport17) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport18) |
| +TEST_F(LegacyViewportTest, viewport18) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-18.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-18.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -463,16 +439,15 @@ TEST_F(ViewportTest, viewport18) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport19) |
| +TEST_F(LegacyViewportTest, viewport19) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-19.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-19.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(160, constraints.layoutSize.width()); |
| EXPECT_EQ(176, constraints.layoutSize.height()); |
| @@ -482,16 +457,15 @@ TEST_F(ViewportTest, viewport19) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport20) |
| +TEST_F(LegacyViewportTest, viewport20) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-20.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-20.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -501,16 +475,15 @@ TEST_F(ViewportTest, viewport20) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport21) |
| +TEST_F(LegacyViewportTest, viewport21) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-21.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-21.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -520,16 +493,15 @@ TEST_F(ViewportTest, viewport21) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport22) |
| +TEST_F(LegacyViewportTest, viewport22) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-22.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-22.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -539,16 +511,15 @@ TEST_F(ViewportTest, viewport22) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport23) |
| +TEST_F(LegacyViewportTest, viewport23) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-23.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-23.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -558,16 +529,15 @@ TEST_F(ViewportTest, viewport23) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport24) |
| +TEST_F(LegacyViewportTest, viewport24) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-24.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-24.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -577,16 +547,15 @@ TEST_F(ViewportTest, viewport24) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport25) |
| +TEST_F(LegacyViewportTest, viewport25) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-25.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-25.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -596,16 +565,15 @@ TEST_F(ViewportTest, viewport25) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport26) |
| +TEST_F(LegacyViewportTest, viewport26) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-26.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-26.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -615,16 +583,15 @@ TEST_F(ViewportTest, viewport26) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport27) |
| +TEST_F(LegacyViewportTest, viewport27) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-27.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-27.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -634,16 +601,15 @@ TEST_F(ViewportTest, viewport27) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport28) |
| +TEST_F(LegacyViewportTest, viewport28) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-28.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-28.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(352, constraints.layoutSize.width()); |
| EXPECT_NEAR(387.2, constraints.layoutSize.height(), 0.01); |
| @@ -653,16 +619,15 @@ TEST_F(ViewportTest, viewport28) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport29) |
| +TEST_F(LegacyViewportTest, viewport29) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-29.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-29.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(700, constraints.layoutSize.width()); |
| EXPECT_EQ(770, constraints.layoutSize.height()); |
| @@ -672,16 +637,15 @@ TEST_F(ViewportTest, viewport29) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport30) |
| +TEST_F(LegacyViewportTest, viewport30) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-30.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-30.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(200, constraints.layoutSize.width()); |
| EXPECT_EQ(220, constraints.layoutSize.height()); |
| @@ -691,16 +655,15 @@ TEST_F(ViewportTest, viewport30) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport31) |
| +TEST_F(LegacyViewportTest, viewport31) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-31.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-31.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(700, constraints.layoutSize.height()); |
| @@ -710,16 +673,15 @@ TEST_F(ViewportTest, viewport31) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport32) |
| +TEST_F(LegacyViewportTest, viewport32) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-32.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-32.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(200, constraints.layoutSize.height()); |
| @@ -729,16 +691,15 @@ TEST_F(ViewportTest, viewport32) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport33) |
| +TEST_F(LegacyViewportTest, viewport33) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-33.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-33.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -748,16 +709,15 @@ TEST_F(ViewportTest, viewport33) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport34) |
| +TEST_F(LegacyViewportTest, viewport34) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-34.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-34.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(640, constraints.layoutSize.width()); |
| EXPECT_EQ(704, constraints.layoutSize.height()); |
| @@ -767,16 +727,15 @@ TEST_F(ViewportTest, viewport34) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport35) |
| +TEST_F(LegacyViewportTest, viewport35) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-35.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-35.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(1280, constraints.layoutSize.width()); |
| EXPECT_EQ(1408, constraints.layoutSize.height()); |
| @@ -786,16 +745,15 @@ TEST_F(ViewportTest, viewport35) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport36) |
| +TEST_F(LegacyViewportTest, viewport36) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-36.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-36.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_NEAR(636.36, constraints.layoutSize.width(), 0.01f); |
| EXPECT_EQ(700, constraints.layoutSize.height()); |
| @@ -805,16 +763,15 @@ TEST_F(ViewportTest, viewport36) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport37) |
| +TEST_F(LegacyViewportTest, viewport37) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-37.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-37.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -824,16 +781,15 @@ TEST_F(ViewportTest, viewport37) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport38) |
| +TEST_F(LegacyViewportTest, viewport38) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-38.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-38.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(640, constraints.layoutSize.width()); |
| EXPECT_EQ(704, constraints.layoutSize.height()); |
| @@ -843,16 +799,15 @@ TEST_F(ViewportTest, viewport38) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport39) |
| +TEST_F(LegacyViewportTest, viewport39) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-39.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-39.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(200, constraints.layoutSize.width()); |
| EXPECT_EQ(700, constraints.layoutSize.height()); |
| @@ -862,16 +817,15 @@ TEST_F(ViewportTest, viewport39) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport40) |
| +TEST_F(LegacyViewportTest, viewport40) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-40.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-40.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(700, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -881,16 +835,15 @@ TEST_F(ViewportTest, viewport40) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport41) |
| +TEST_F(LegacyViewportTest, viewport41) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-41.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-41.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(1000, constraints.layoutSize.width()); |
| EXPECT_EQ(704, constraints.layoutSize.height()); |
| @@ -900,16 +853,15 @@ TEST_F(ViewportTest, viewport41) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport42) |
| +TEST_F(LegacyViewportTest, viewport42) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-42.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-42.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(1000, constraints.layoutSize.height()); |
| @@ -919,16 +871,15 @@ TEST_F(ViewportTest, viewport42) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport43) |
| +TEST_F(LegacyViewportTest, viewport43) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-43.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-43.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -938,16 +889,15 @@ TEST_F(ViewportTest, viewport43) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport44) |
| +TEST_F(LegacyViewportTest, viewport44) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-44.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-44.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(10000, constraints.layoutSize.width()); |
| EXPECT_EQ(10000, constraints.layoutSize.height()); |
| @@ -957,16 +907,15 @@ TEST_F(ViewportTest, viewport44) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport45) |
| +TEST_F(LegacyViewportTest, viewport45) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-45.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-45.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(3200, constraints.layoutSize.width()); |
| EXPECT_EQ(3520, constraints.layoutSize.height()); |
| @@ -976,16 +925,15 @@ TEST_F(ViewportTest, viewport45) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport46) |
| +TEST_F(LegacyViewportTest, viewport46) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-46.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-46.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(32, constraints.layoutSize.width()); |
| EXPECT_NEAR(35.2, constraints.layoutSize.height(), 0.01f); |
| @@ -995,16 +943,15 @@ TEST_F(ViewportTest, viewport46) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport47) |
| +TEST_F(LegacyViewportTest, viewport47) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-47.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-47.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(3000, constraints.layoutSize.height()); |
| @@ -1014,16 +961,15 @@ TEST_F(ViewportTest, viewport47) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport48) |
| +TEST_F(LegacyViewportTest, viewport48) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-48.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-48.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(3000, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1033,16 +979,15 @@ TEST_F(ViewportTest, viewport48) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport49) |
| +TEST_F(LegacyViewportTest, viewport49) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-49.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-49.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1052,16 +997,15 @@ TEST_F(ViewportTest, viewport49) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport50) |
| +TEST_F(LegacyViewportTest, viewport50) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-50.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-50.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -1071,16 +1015,15 @@ TEST_F(ViewportTest, viewport50) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport51) |
| +TEST_F(LegacyViewportTest, viewport51) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-51.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-51.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -1090,16 +1033,15 @@ TEST_F(ViewportTest, viewport51) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport52) |
| +TEST_F(LegacyViewportTest, viewport52) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-52.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-52.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -1109,16 +1051,15 @@ TEST_F(ViewportTest, viewport52) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport53) |
| +TEST_F(LegacyViewportTest, viewport53) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-53.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-53.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -1128,16 +1069,15 @@ TEST_F(ViewportTest, viewport53) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport54) |
| +TEST_F(LegacyViewportTest, viewport54) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-54.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-54.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -1147,16 +1087,15 @@ TEST_F(ViewportTest, viewport54) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport55) |
| +TEST_F(LegacyViewportTest, viewport55) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-55.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-55.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -1166,16 +1105,15 @@ TEST_F(ViewportTest, viewport55) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport56) |
| +TEST_F(LegacyViewportTest, viewport56) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-56.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-56.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -1185,16 +1123,15 @@ TEST_F(ViewportTest, viewport56) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport57) |
| +TEST_F(LegacyViewportTest, viewport57) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-57.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-57.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1204,16 +1141,15 @@ TEST_F(ViewportTest, viewport57) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport58) |
| +TEST_F(LegacyViewportTest, viewport58) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-58.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-58.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(3200, constraints.layoutSize.width()); |
| EXPECT_EQ(3520, constraints.layoutSize.height()); |
| @@ -1223,16 +1159,15 @@ TEST_F(ViewportTest, viewport58) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport59) |
| +TEST_F(LegacyViewportTest, viewport59) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-59.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-59.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1242,16 +1177,15 @@ TEST_F(ViewportTest, viewport59) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport60) |
| +TEST_F(LegacyViewportTest, viewport60) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-60.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-60.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(32, constraints.layoutSize.width()); |
| EXPECT_NEAR(35.2, constraints.layoutSize.height(), 0.01f); |
| @@ -1261,16 +1195,15 @@ TEST_F(ViewportTest, viewport60) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport61) |
| +TEST_F(LegacyViewportTest, viewport61) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-61.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-61.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1280,16 +1213,15 @@ TEST_F(ViewportTest, viewport61) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport62) |
| +TEST_F(LegacyViewportTest, viewport62) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-62.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-62.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1299,16 +1231,15 @@ TEST_F(ViewportTest, viewport62) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport63) |
| +TEST_F(LegacyViewportTest, viewport63) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-63.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-63.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1318,16 +1249,15 @@ TEST_F(ViewportTest, viewport63) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport64) |
| +TEST_F(LegacyViewportTest, viewport64) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-64.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-64.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1337,16 +1267,15 @@ TEST_F(ViewportTest, viewport64) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport65) |
| +TEST_F(LegacyViewportTest, viewport65) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-65.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-65.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(100, constraints.layoutSize.width()); |
| EXPECT_EQ(110, constraints.layoutSize.height()); |
| @@ -1356,16 +1285,15 @@ TEST_F(ViewportTest, viewport65) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport66) |
| +TEST_F(LegacyViewportTest, viewport66) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-66.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-66.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(100, constraints.layoutSize.width()); |
| EXPECT_EQ(110, constraints.layoutSize.height()); |
| @@ -1375,16 +1303,15 @@ TEST_F(ViewportTest, viewport66) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport67) |
| +TEST_F(LegacyViewportTest, viewport67) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-67.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-67.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1394,16 +1321,15 @@ TEST_F(ViewportTest, viewport67) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport68) |
| +TEST_F(LegacyViewportTest, viewport68) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-68.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-68.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1413,16 +1339,15 @@ TEST_F(ViewportTest, viewport68) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport69) |
| +TEST_F(LegacyViewportTest, viewport69) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-69.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-69.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(100, constraints.layoutSize.width()); |
| EXPECT_EQ(110, constraints.layoutSize.height()); |
| @@ -1432,16 +1357,15 @@ TEST_F(ViewportTest, viewport69) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport70) |
| +TEST_F(LegacyViewportTest, viewport70) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-70.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-70.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(100, constraints.layoutSize.width()); |
| EXPECT_EQ(110, constraints.layoutSize.height()); |
| @@ -1451,16 +1375,15 @@ TEST_F(ViewportTest, viewport70) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport71) |
| +TEST_F(LegacyViewportTest, viewport71) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-71.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-71.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1470,16 +1393,15 @@ TEST_F(ViewportTest, viewport71) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport72) |
| +TEST_F(LegacyViewportTest, viewport72) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-72.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-72.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(100, constraints.layoutSize.width()); |
| EXPECT_EQ(110, constraints.layoutSize.height()); |
| @@ -1489,16 +1411,15 @@ TEST_F(ViewportTest, viewport72) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport73) |
| +TEST_F(LegacyViewportTest, viewport73) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-73.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-73.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(100, constraints.layoutSize.width()); |
| EXPECT_EQ(110, constraints.layoutSize.height()); |
| @@ -1508,16 +1429,15 @@ TEST_F(ViewportTest, viewport73) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport74) |
| +TEST_F(LegacyViewportTest, viewport74) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-74.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-74.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(100, constraints.layoutSize.width()); |
| EXPECT_EQ(110, constraints.layoutSize.height()); |
| @@ -1527,16 +1447,15 @@ TEST_F(ViewportTest, viewport74) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport75) |
| +TEST_F(LegacyViewportTest, viewport75) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-75.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-75.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -1546,16 +1465,15 @@ TEST_F(ViewportTest, viewport75) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport76) |
| +TEST_F(LegacyViewportTest, viewport76) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-76.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-76.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(32, constraints.layoutSize.width()); |
| EXPECT_NEAR(35.2, constraints.layoutSize.height(), 0.01); |
| @@ -1565,16 +1483,15 @@ TEST_F(ViewportTest, viewport76) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport77) |
| +TEST_F(LegacyViewportTest, viewport77) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-77.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-77.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(1280, constraints.layoutSize.width()); |
| EXPECT_EQ(1408, constraints.layoutSize.height()); |
| @@ -1584,16 +1501,15 @@ TEST_F(ViewportTest, viewport77) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport78) |
| +TEST_F(LegacyViewportTest, viewport78) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-78.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-78.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(100, constraints.layoutSize.width()); |
| EXPECT_EQ(110, constraints.layoutSize.height()); |
| @@ -1603,16 +1519,15 @@ TEST_F(ViewportTest, viewport78) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport79) |
| +TEST_F(LegacyViewportTest, viewport79) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-79.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-79.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1622,16 +1537,15 @@ TEST_F(ViewportTest, viewport79) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport80) |
| +TEST_F(LegacyViewportTest, viewport80) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-80.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-80.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -1641,16 +1555,15 @@ TEST_F(ViewportTest, viewport80) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport81) |
| +TEST_F(LegacyViewportTest, viewport81) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-81.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-81.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(3000, constraints.layoutSize.width()); |
| EXPECT_EQ(3300, constraints.layoutSize.height()); |
| @@ -1660,16 +1573,15 @@ TEST_F(ViewportTest, viewport81) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport82) |
| +TEST_F(LegacyViewportTest, viewport82) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-82.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-82.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(400, constraints.layoutSize.width()); |
| EXPECT_EQ(440, constraints.layoutSize.height()); |
| @@ -1679,16 +1591,15 @@ TEST_F(ViewportTest, viewport82) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport83) |
| +TEST_F(LegacyViewportTest, viewport83) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-83.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-83.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -1698,16 +1609,15 @@ TEST_F(ViewportTest, viewport83) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport84) |
| +TEST_F(LegacyViewportTest, viewport84) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-84.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-84.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_EQ(480, constraints.layoutSize.height()); |
| @@ -1717,16 +1627,15 @@ TEST_F(ViewportTest, viewport84) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport85) |
| +TEST_F(LegacyViewportTest, viewport85) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-85.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-85.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(540, constraints.layoutSize.width()); |
| EXPECT_EQ(594, constraints.layoutSize.height()); |
| @@ -1736,16 +1645,15 @@ TEST_F(ViewportTest, viewport85) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport86) |
| +TEST_F(LegacyViewportTest, viewport86) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-86.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-86.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_NEAR(457.14, constraints.layoutSize.width(), 0.01f); |
| EXPECT_NEAR(502.86, constraints.layoutSize.height(), 0.01f); |
| @@ -1755,16 +1663,15 @@ TEST_F(ViewportTest, viewport86) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport87) |
| +TEST_F(LegacyViewportTest, viewport87) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-87.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-87.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -1774,16 +1681,15 @@ TEST_F(ViewportTest, viewport87) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport88) |
| +TEST_F(LegacyViewportTest, viewport88) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-88.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-88.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -1793,16 +1699,15 @@ TEST_F(ViewportTest, viewport88) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport90) |
| +TEST_F(LegacyViewportTest, viewport90) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-90.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-90.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(700, constraints.layoutSize.width()); |
| EXPECT_EQ(770, constraints.layoutSize.height()); |
| @@ -1812,16 +1717,15 @@ TEST_F(ViewportTest, viewport90) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport100) |
| +TEST_F(LegacyViewportTest, viewport100) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-100.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-100.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(400, constraints.layoutSize.width()); |
| EXPECT_EQ(440, constraints.layoutSize.height()); |
| @@ -1831,16 +1735,15 @@ TEST_F(ViewportTest, viewport100) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport101) |
| +TEST_F(LegacyViewportTest, viewport101) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-101.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-101.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(400, constraints.layoutSize.width()); |
| EXPECT_EQ(440, constraints.layoutSize.height()); |
| @@ -1850,16 +1753,15 @@ TEST_F(ViewportTest, viewport101) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport102) |
| +TEST_F(LegacyViewportTest, viewport102) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-102.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-102.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(400, constraints.layoutSize.width()); |
| EXPECT_EQ(440, constraints.layoutSize.height()); |
| @@ -1869,16 +1771,15 @@ TEST_F(ViewportTest, viewport102) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport103) |
| +TEST_F(LegacyViewportTest, viewport103) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-103.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-103.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(400, constraints.layoutSize.width()); |
| EXPECT_EQ(440, constraints.layoutSize.height()); |
| @@ -1888,16 +1789,15 @@ TEST_F(ViewportTest, viewport103) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport104) |
| +TEST_F(LegacyViewportTest, viewport104) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-104.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-104.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -1907,16 +1807,15 @@ TEST_F(ViewportTest, viewport104) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport105) |
| +TEST_F(LegacyViewportTest, viewport105) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-105.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-105.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -1926,16 +1825,15 @@ TEST_F(ViewportTest, viewport105) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport106) |
| +TEST_F(LegacyViewportTest, viewport106) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-106.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-106.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -1945,16 +1843,15 @@ TEST_F(ViewportTest, viewport106) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport107) |
| +TEST_F(LegacyViewportTest, viewport107) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-107.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-107.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -1964,16 +1861,15 @@ TEST_F(ViewportTest, viewport107) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport108) |
| +TEST_F(LegacyViewportTest, viewport108) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-108.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-108.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -1983,16 +1879,15 @@ TEST_F(ViewportTest, viewport108) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport109) |
| +TEST_F(LegacyViewportTest, viewport109) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-109.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-109.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -2002,16 +1897,15 @@ TEST_F(ViewportTest, viewport109) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport110) |
| +TEST_F(LegacyViewportTest, viewport110) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-110.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-110.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -2021,16 +1915,15 @@ TEST_F(ViewportTest, viewport110) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport111) |
| +TEST_F(LegacyViewportTest, viewport111) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-111.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-111.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -2040,16 +1933,15 @@ TEST_F(ViewportTest, viewport111) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport112) |
| +TEST_F(LegacyViewportTest, viewport112) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-112.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-112.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(400, constraints.layoutSize.width()); |
| EXPECT_EQ(440, constraints.layoutSize.height()); |
| @@ -2059,16 +1951,15 @@ TEST_F(ViewportTest, viewport112) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport113) |
| +TEST_F(LegacyViewportTest, viewport113) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-113.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-113.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -2078,16 +1969,15 @@ TEST_F(ViewportTest, viewport113) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport114) |
| +TEST_F(LegacyViewportTest, viewport114) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-114.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-114.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -2097,16 +1987,15 @@ TEST_F(ViewportTest, viewport114) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport115) |
| +TEST_F(LegacyViewportTest, viewport115) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-115.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-115.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(400, constraints.layoutSize.width()); |
| EXPECT_EQ(440, constraints.layoutSize.height()); |
| @@ -2116,16 +2005,15 @@ TEST_F(ViewportTest, viewport115) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport116) |
| +TEST_F(LegacyViewportTest, viewport116) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-116.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-116.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(400, constraints.layoutSize.width()); |
| EXPECT_EQ(440, constraints.layoutSize.height()); |
| @@ -2135,16 +2023,15 @@ TEST_F(ViewportTest, viewport116) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport117) |
| +TEST_F(LegacyViewportTest, viewport117) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-117.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-117.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(400, constraints.layoutSize.height()); |
| @@ -2154,16 +2041,15 @@ TEST_F(ViewportTest, viewport117) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport118) |
| +TEST_F(LegacyViewportTest, viewport118) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-118.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-118.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2173,16 +2059,15 @@ TEST_F(ViewportTest, viewport118) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport119) |
| +TEST_F(LegacyViewportTest, viewport119) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-119.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-119.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2192,16 +2077,15 @@ TEST_F(ViewportTest, viewport119) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport120) |
| +TEST_F(LegacyViewportTest, viewport120) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-120.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-120.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2211,16 +2095,15 @@ TEST_F(ViewportTest, viewport120) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport121) |
| +TEST_F(LegacyViewportTest, viewport121) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-121.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-121.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -2230,16 +2113,15 @@ TEST_F(ViewportTest, viewport121) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport122) |
| +TEST_F(LegacyViewportTest, viewport122) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-122.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-122.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -2249,16 +2131,15 @@ TEST_F(ViewportTest, viewport122) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport123) |
| +TEST_F(LegacyViewportTest, viewport123) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-123.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-123.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2268,16 +2149,15 @@ TEST_F(ViewportTest, viewport123) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport124) |
| +TEST_F(LegacyViewportTest, viewport124) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-124.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-124.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2287,16 +2167,15 @@ TEST_F(ViewportTest, viewport124) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport125) |
| +TEST_F(LegacyViewportTest, viewport125) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-125.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-125.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -2306,16 +2185,15 @@ TEST_F(ViewportTest, viewport125) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport126) |
| +TEST_F(LegacyViewportTest, viewport126) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-126.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-126.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -2325,16 +2203,15 @@ TEST_F(ViewportTest, viewport126) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport127) |
| +TEST_F(LegacyViewportTest, viewport127) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-127.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-127.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(64, constraints.layoutSize.width()); |
| EXPECT_NEAR(70.4, constraints.layoutSize.height(), 0.01f); |
| @@ -2344,16 +2221,15 @@ TEST_F(ViewportTest, viewport127) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport129) |
| +TEST_F(LegacyViewportTest, viewport129) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-129.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-129.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(123, constraints.layoutSize.width()); |
| EXPECT_NEAR(135.3, constraints.layoutSize.height(), 0.01f); |
| @@ -2363,16 +2239,15 @@ TEST_F(ViewportTest, viewport129) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport130) |
| +TEST_F(LegacyViewportTest, viewport130) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-130.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-130.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2382,16 +2257,15 @@ TEST_F(ViewportTest, viewport130) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport131) |
| +TEST_F(LegacyViewportTest, viewport131) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-131.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-131.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2401,16 +2275,15 @@ TEST_F(ViewportTest, viewport131) |
| EXPECT_FALSE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport132) |
| +TEST_F(LegacyViewportTest, viewport132) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-132.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-132.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2420,16 +2293,15 @@ TEST_F(ViewportTest, viewport132) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport133) |
| +TEST_F(LegacyViewportTest, viewport133) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-133.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-133.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -2439,16 +2311,15 @@ TEST_F(ViewportTest, viewport133) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport134) |
| +TEST_F(LegacyViewportTest, viewport134) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-134.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-134.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(160, constraints.layoutSize.width()); |
| EXPECT_EQ(176, constraints.layoutSize.height()); |
| @@ -2458,16 +2329,15 @@ TEST_F(ViewportTest, viewport134) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport135) |
| +TEST_F(LegacyViewportTest, viewport135) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-135.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-135.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -2477,16 +2347,15 @@ TEST_F(ViewportTest, viewport135) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport136) |
| +TEST_F(LegacyViewportTest, viewport136) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-136.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-136.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2496,16 +2365,15 @@ TEST_F(ViewportTest, viewport136) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewport137) |
| +TEST_F(LegacyViewportTest, viewport137) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-137.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-137.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(980, constraints.layoutSize.width()); |
| EXPECT_EQ(1078, constraints.layoutSize.height()); |
| @@ -2515,16 +2383,15 @@ TEST_F(ViewportTest, viewport137) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyHandheldFriendly) |
| +TEST_F(LegacyViewportTest, viewportLegacyHandheldFriendly) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-handheldfriendly.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-handheldfriendly.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2542,16 +2409,15 @@ static void setQuirkViewportSettings(WebSettings* settings) |
| settings->setViewportMetaMergeContentQuirk(true); |
| } |
| -TEST_F(ViewportTest, viewportLegacyMergeQuirk1) |
| +TEST_F(LegacyViewportTest, viewportLegacyMergeQuirk1) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-merge-quirk-1.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-merge-quirk-1.html", true, 0, 0, setQuirkViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(640, constraints.layoutSize.width()); |
| EXPECT_EQ(704, constraints.layoutSize.height()); |
| @@ -2561,9 +2427,8 @@ TEST_F(ViewportTest, viewportLegacyMergeQuirk1) |
| EXPECT_FALSE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyMergeQuirk2) |
| +TEST_F(LegacyViewportTest, viewportLegacyMergeQuirk2) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-merge-quirk-2.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2573,7 +2438,7 @@ TEST_F(ViewportTest, viewportLegacyMergeQuirk2) |
| // This quirk allows content attributes of meta viewport tags to be merged. |
| page->settings().setViewportMetaMergeContentQuirk(true); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(500, constraints.layoutSize.width()); |
| EXPECT_EQ(550, constraints.layoutSize.height()); |
| @@ -2583,9 +2448,8 @@ TEST_F(ViewportTest, viewportLegacyMergeQuirk2) |
| EXPECT_FALSE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWithoutContent) |
| +TEST_F(LegacyViewportTest, viewportLegacyMobileOptimizedMetaWithoutContent) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-mobileoptimized.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2593,7 +2457,7 @@ TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWithoutContent) |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2603,9 +2467,8 @@ TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWithoutContent) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWith0) |
| +TEST_F(LegacyViewportTest, viewportLegacyMobileOptimizedMetaWith0) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-mobileoptimized-2.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2613,7 +2476,7 @@ TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWith0) |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2623,9 +2486,8 @@ TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWith0) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWith400) |
| +TEST_F(LegacyViewportTest, viewportLegacyMobileOptimizedMetaWith400) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-mobileoptimized-2.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2633,7 +2495,7 @@ TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWith400) |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2643,9 +2505,8 @@ TEST_F(ViewportTest, viewportLegacyMobileOptimizedMetaWith400) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyOrdering2) |
| +TEST_F(LegacyViewportTest, viewportLegacyOrdering2) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-2.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2653,7 +2514,7 @@ TEST_F(ViewportTest, viewportLegacyOrdering2) |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(300, constraints.layoutSize.width()); |
| EXPECT_EQ(330, constraints.layoutSize.height()); |
| @@ -2663,9 +2524,8 @@ TEST_F(ViewportTest, viewportLegacyOrdering2) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyOrdering3) |
| +TEST_F(LegacyViewportTest, viewportLegacyOrdering3) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-3.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2673,7 +2533,7 @@ TEST_F(ViewportTest, viewportLegacyOrdering3) |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(300, constraints.layoutSize.width()); |
| EXPECT_EQ(330, constraints.layoutSize.height()); |
| @@ -2683,9 +2543,8 @@ TEST_F(ViewportTest, viewportLegacyOrdering3) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyOrdering4) |
| +TEST_F(LegacyViewportTest, viewportLegacyOrdering4) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-4.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2693,7 +2552,7 @@ TEST_F(ViewportTest, viewportLegacyOrdering4) |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(300, constraints.layoutSize.width()); |
| EXPECT_EQ(330, constraints.layoutSize.height()); |
| @@ -2703,9 +2562,8 @@ TEST_F(ViewportTest, viewportLegacyOrdering4) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyOrdering5) |
| +TEST_F(LegacyViewportTest, viewportLegacyOrdering5) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-5.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2713,7 +2571,7 @@ TEST_F(ViewportTest, viewportLegacyOrdering5) |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2723,9 +2581,8 @@ TEST_F(ViewportTest, viewportLegacyOrdering5) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyOrdering6) |
| +TEST_F(LegacyViewportTest, viewportLegacyOrdering6) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-6.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2733,7 +2590,7 @@ TEST_F(ViewportTest, viewportLegacyOrdering6) |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2743,9 +2600,8 @@ TEST_F(ViewportTest, viewportLegacyOrdering6) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyOrdering7) |
| +TEST_F(LegacyViewportTest, viewportLegacyOrdering7) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-7.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2753,7 +2609,7 @@ TEST_F(ViewportTest, viewportLegacyOrdering7) |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(300, constraints.layoutSize.width()); |
| EXPECT_EQ(330, constraints.layoutSize.height()); |
| @@ -2763,9 +2619,8 @@ TEST_F(ViewportTest, viewportLegacyOrdering7) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyOrdering8) |
| +TEST_F(LegacyViewportTest, viewportLegacyOrdering8) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-8.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2773,7 +2628,7 @@ TEST_F(ViewportTest, viewportLegacyOrdering8) |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(300, constraints.layoutSize.width()); |
| EXPECT_EQ(330, constraints.layoutSize.height()); |
| @@ -2783,30 +2638,28 @@ TEST_F(ViewportTest, viewportLegacyOrdering8) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyEmptyAtViewportDoesntOverrideViewportMeta) |
| +TEST_F(LegacyViewportTest, viewportLegacyEmptyAtViewportDoesntOverrideViewportMeta) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-ordering-10.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-ordering-10.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 800, 600); |
| + PageScaleConstraints constraints = runTest(page, 800, 600); |
| EXPECT_EQ(5000, constraints.layoutSize.width()); |
| } |
| -TEST_F(ViewportTest, viewportLegacyDefaultValueChangedByXHTMLMP) |
| +TEST_F(LegacyViewportTest, viewportLegacyDefaultValueChangedByXHTMLMP) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlmp.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(320, constraints.layoutSize.width()); |
| EXPECT_EQ(352, constraints.layoutSize.height()); |
| @@ -2816,16 +2669,15 @@ TEST_F(ViewportTest, viewportLegacyDefaultValueChangedByXHTMLMP) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyDefaultValueChangedByXHTMLMPAndOverriddenByMeta) |
| +TEST_F(LegacyViewportTest, viewportLegacyDefaultValueChangedByXHTMLMPAndOverriddenByMeta) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp-misplaced-doctype.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlmp-misplaced-doctype.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(640, constraints.layoutSize.width()); |
| EXPECT_EQ(704, constraints.layoutSize.height()); |
| @@ -2835,16 +2687,15 @@ TEST_F(ViewportTest, viewportLegacyDefaultValueChangedByXHTMLMPAndOverriddenByMe |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLegacyXHTMLMPOrdering) |
| +TEST_F(LegacyViewportTest, viewportLegacyXHTMLMPOrdering) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp-ordering.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlmp-ordering.html", true, 0, 0, setViewportSettings); |
| Page* page = webViewHelper.webViewImpl()->page(); |
| - PageScaleConstraints constraints = runViewportTest(page, 320, 352); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| EXPECT_EQ(640, constraints.layoutSize.width()); |
| EXPECT_EQ(704, constraints.layoutSize.height()); |
| @@ -2854,9 +2705,53 @@ TEST_F(ViewportTest, viewportLegacyXHTMLMPOrdering) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLimitsAdjustedForNoUserScale) |
| +TEST_F(LegacyViewportTest, viewportLegacyXHTMLMPRemoveAndAdd) |
| +{ |
| + registerMockedHttpURLLoad("viewport/viewport-legacy-xhtmlmp-remove-and-add.html"); |
| + |
| + FrameTestHelpers::WebViewHelper webViewHelper; |
| + webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-legacy-xhtmlmp-remove-and-add.html", true, 0, 0, setViewportSettings); |
| + |
| + Page* page = webViewHelper.webViewImpl()->page(); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| + |
| + EXPECT_EQ(320, constraints.layoutSize.width()); |
|
kenneth.r.christiansen
2013/11/21 20:30:36
I would love tests like these to have a comment ab
bokan
2013/11/21 20:37:59
I agree, and I think going forward we should work
|
| + EXPECT_EQ(352, constraints.layoutSize.height()); |
| + EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); |
| + EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); |
| + EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); |
| + EXPECT_TRUE(page->viewportDescription().userZoom); |
| + |
| + executeScript(webViewHelper.webViewImpl()->mainFrame(), |
| + "originalDoctype = document.doctype;" |
| + "document.removeChild(originalDoctype);"); |
| + |
| + |
| + constraints = runTest(page, 320, 352); |
| + |
| + EXPECT_EQ(320, constraints.layoutSize.width()); |
| + EXPECT_EQ(352, constraints.layoutSize.height()); |
| + EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); |
| + EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); |
| + EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); |
| + EXPECT_TRUE(page->viewportDescription().userZoom); |
| + |
| + executeScript(webViewHelper.webViewImpl()->mainFrame(), |
| + "document.insertBefore(originalDoctype, document.firstChild);"); |
| + |
| + constraints = runTest(page, 320, 352); |
| + |
| + EXPECT_EQ(320, constraints.layoutSize.width()); |
| + EXPECT_EQ(352, constraints.layoutSize.height()); |
| + EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); |
| + EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); |
| + EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); |
| + EXPECT_TRUE(page->viewportDescription().userZoom); |
| +} |
| + |
| + |
| +TEST_F(LegacyViewportTest, viewportLimitsAdjustedForNoUserScale) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-limits-adjusted-for-no-user-scale.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2867,9 +2762,8 @@ TEST_F(ViewportTest, viewportLimitsAdjustedForNoUserScale) |
| EXPECT_FALSE(page->viewportDescription().userZoom); |
| } |
| -TEST_F(ViewportTest, viewportLimitsAdjustedForNoUserScaleControl) |
| +TEST_F(LegacyViewportTest, viewportLimitsAdjustedForNoUserScaleControl) |
| { |
| - UseMockScrollbarSettings mockScrollbarSettings; |
| registerMockedHttpURLLoad("viewport/viewport-limits-adjusted-for-no-user-scale-control.html"); |
| FrameTestHelpers::WebViewHelper webViewHelper; |
| @@ -2880,4 +2774,177 @@ TEST_F(ViewportTest, viewportLimitsAdjustedForNoUserScaleControl) |
| EXPECT_TRUE(page->viewportDescription().userZoom); |
| } |
| +class ConsoleMessageWebViewClient : public WebViewClient { |
| +public: |
| + virtual void didAddMessageToConsole(const WebConsoleMessage& msg, const WebString& sourceName, unsigned sourceLine, const WebString& stackTrace) |
| + { |
| + messages.push_back(msg); |
| + } |
| + |
| + std::vector<WebConsoleMessage> messages; |
| +}; |
| + |
| +TEST_F(LegacyViewportTest, viewportWarnings1) |
| +{ |
| + ConsoleMessageWebViewClient webViewClient; |
| + |
| + registerMockedHttpURLLoad("viewport/viewport-warnings-1.html"); |
| + |
| + FrameTestHelpers::WebViewHelper webViewHelper; |
| + webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-1.html", true, 0, &webViewClient, setViewportSettings); |
| + |
| + Page* page = webViewHelper.webViewImpl()->page(); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| + |
| + EXPECT_TRUE(webViewClient.messages.empty()); |
| + |
| + EXPECT_EQ(320, constraints.layoutSize.width()); |
| + EXPECT_EQ(352, constraints.layoutSize.height()); |
| + EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); |
| + EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); |
| + EXPECT_NEAR(2.0f, constraints.maximumScale, 0.01f); |
| + EXPECT_TRUE(page->viewportDescription().userZoom); |
| +} |
| + |
| +TEST_F(LegacyViewportTest, viewportWarnings2) |
| +{ |
| + ConsoleMessageWebViewClient webViewClient; |
| + |
| + registerMockedHttpURLLoad("viewport/viewport-warnings-2.html"); |
| + |
| + FrameTestHelpers::WebViewHelper webViewHelper; |
| + webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-2.html", true, 0, &webViewClient, setViewportSettings); |
| + |
| + Page* page = webViewHelper.webViewImpl()->page(); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| + |
| + EXPECT_EQ(1U, webViewClient.messages.size()); |
| + EXPECT_EQ(WebConsoleMessage::LevelError, webViewClient.messages[0].level); |
| + EXPECT_STREQ("The key \"wwidth\" is not recognized and ignored.", webViewClient.messages[0].text.utf8().c_str()); |
| + |
| + EXPECT_EQ(980, constraints.layoutSize.width()); |
| + EXPECT_EQ(1078, constraints.layoutSize.height()); |
| + EXPECT_NEAR(0.33f, constraints.initialScale, 0.01f); |
| + EXPECT_NEAR(0.33f, constraints.minimumScale, 0.01f); |
| + EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); |
| + EXPECT_TRUE(page->viewportDescription().userZoom); |
| +} |
| + |
| +TEST_F(LegacyViewportTest, viewportWarnings3) |
| +{ |
| + ConsoleMessageWebViewClient webViewClient; |
| + |
| + registerMockedHttpURLLoad("viewport/viewport-warnings-3.html"); |
| + |
| + FrameTestHelpers::WebViewHelper webViewHelper; |
| + webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-3.html", true, 0, &webViewClient, setViewportSettings); |
| + |
| + Page* page = webViewHelper.webViewImpl()->page(); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| + |
| + EXPECT_EQ(1U, webViewClient.messages.size()); |
| + EXPECT_EQ(WebConsoleMessage::LevelError, webViewClient.messages[0].level); |
| + EXPECT_STREQ("The value \"unrecognized-width\" for key \"width\" is invalid, and has been ignored.", |
| + webViewClient.messages[0].text.utf8().c_str()); |
| + |
| + EXPECT_NEAR(64.0f, constraints.layoutSize.width(), 0.01); |
| + EXPECT_NEAR(70.4f, constraints.layoutSize.height(), 0.01); |
| + EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); |
| + EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); |
| + EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); |
| + EXPECT_TRUE(page->viewportDescription().userZoom); |
| +} |
| + |
| +TEST_F(LegacyViewportTest, viewportWarnings4) |
| +{ |
| + ConsoleMessageWebViewClient webViewClient; |
| + |
| + registerMockedHttpURLLoad("viewport/viewport-warnings-4.html"); |
| + |
| + FrameTestHelpers::WebViewHelper webViewHelper; |
| + webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-4.html", true, 0, &webViewClient, setViewportSettings); |
| + |
| + Page* page = webViewHelper.webViewImpl()->page(); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| + |
| + EXPECT_EQ(1U, webViewClient.messages.size()); |
| + EXPECT_EQ(WebConsoleMessage::LevelWarning, webViewClient.messages[0].level); |
| + EXPECT_STREQ("The value \"123x456\" for key \"width\" was truncated to its numeric prefix.", |
| + webViewClient.messages[0].text.utf8().c_str()); |
| + |
| + 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(LegacyViewportTest, viewportWarnings5) |
| +{ |
| + ConsoleMessageWebViewClient webViewClient; |
| + |
| + registerMockedHttpURLLoad("viewport/viewport-warnings-5.html"); |
| + |
| + FrameTestHelpers::WebViewHelper webViewHelper; |
| + webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-5.html", true, 0, &webViewClient, setViewportSettings); |
| + |
| + Page* page = webViewHelper.webViewImpl()->page(); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| + |
| + EXPECT_EQ(5U, webViewClient.messages.size()); |
| + |
| + EXPECT_EQ(WebConsoleMessage::LevelError, webViewClient.messages[0].level); |
| + EXPECT_STREQ("The value \"device-width;\" for key \"width\" is invalid, and has been ignored.", |
| + webViewClient.messages[0].text.utf8().c_str()); |
| + |
| + EXPECT_EQ(WebConsoleMessage::LevelWarning, webViewClient.messages[1].level); |
| + EXPECT_STREQ("The value \"1.0;\" for key \"initial-scale\" was truncated to its numeric prefix.", |
| + webViewClient.messages[1].text.utf8().c_str()); |
| + |
| + EXPECT_EQ(WebConsoleMessage::LevelWarning, webViewClient.messages[2].level); |
| + EXPECT_STREQ("The value \"1.0;\" for key \"maximum-scale\" was truncated to its numeric prefix.", |
| + webViewClient.messages[2].text.utf8().c_str()); |
| + |
| + EXPECT_EQ(WebConsoleMessage::LevelWarning, webViewClient.messages[3].level); |
| + EXPECT_STREQ("The value \"0;\" for key \"user-scalable\" was truncated to its numeric prefix.", |
| + webViewClient.messages[3].text.utf8().c_str()); |
| + |
| + EXPECT_EQ(WebConsoleMessage::LevelWarning, webViewClient.messages[4].level); |
| + EXPECT_STREQ("Error parsing a meta element's content: ';' is not a valid key-value pair separator. Please use ',' instead.", |
| + webViewClient.messages[4].text.utf8().c_str()); |
| + |
| + EXPECT_NEAR(320.0f, constraints.layoutSize.width(), 0.01); |
| + EXPECT_NEAR(352.0f, constraints.layoutSize.height(), 0.01); |
| + EXPECT_NEAR(1.0f, constraints.initialScale, 0.01f); |
| + EXPECT_NEAR(1.0f, constraints.minimumScale, 0.01f); |
| + EXPECT_NEAR(1.0f, constraints.maximumScale, 0.01f); |
| + EXPECT_FALSE(page->viewportDescription().userZoom); |
| +} |
| + |
| +TEST_F(LegacyViewportTest, viewportWarnings6) |
| +{ |
| + ConsoleMessageWebViewClient webViewClient; |
| + |
| + registerMockedHttpURLLoad("viewport/viewport-warnings-6.html"); |
| + |
| + FrameTestHelpers::WebViewHelper webViewHelper; |
| + webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-6.html", true, 0, &webViewClient, setViewportSettings); |
| + |
| + Page* page = webViewHelper.webViewImpl()->page(); |
| + PageScaleConstraints constraints = runTest(page, 320, 352); |
| + |
| + EXPECT_EQ(1U, webViewClient.messages.size()); |
| + EXPECT_EQ(WebConsoleMessage::LevelError, webViewClient.messages[0].level); |
| + EXPECT_STREQ("The value \"\" for key \"width\" is invalid, and has been ignored.", |
| + webViewClient.messages[0].text.utf8().c_str()); |
| + |
| + EXPECT_NEAR(64.0f, constraints.layoutSize.width(), 0.01); |
| + EXPECT_NEAR(70.4f, constraints.layoutSize.height(), 0.01); |
| + EXPECT_NEAR(5.0f, constraints.initialScale, 0.01f); |
| + EXPECT_NEAR(5.0f, constraints.minimumScale, 0.01f); |
| + EXPECT_NEAR(5.0f, constraints.maximumScale, 0.01f); |
| + EXPECT_TRUE(page->viewportDescription().userZoom); |
| +} |
| + |
| } // namespace |
