| Index: Source/web/tests/WebFrameTest.cpp
|
| diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
|
| index cd3698a5fc367790912bc54333c14df949e6d390..1928353dd109ffb233d65266fc6d46ae91a999ad 100644
|
| --- a/Source/web/tests/WebFrameTest.cpp
|
| +++ b/Source/web/tests/WebFrameTest.cpp
|
| @@ -138,18 +138,18 @@ public:
|
| : m_baseURL("http://www.test.com/")
|
| , m_chromeURL("chrome://")
|
| , m_webView(0)
|
| + , m_mainFrame(0)
|
| {
|
| }
|
|
|
| virtual ~WebFrameTest()
|
| {
|
| + Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
|
| +
|
| if (m_webView)
|
| m_webView->close();
|
| - }
|
| -
|
| - virtual void TearDown()
|
| - {
|
| - Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
|
| + if (m_mainFrame)
|
| + m_mainFrame->close();
|
| }
|
|
|
| void registerMockedHttpURLLoad(const std::string& fileName)
|
| @@ -165,6 +165,7 @@ public:
|
| void createCompositingWebView()
|
| {
|
| m_fakeCompositingWebViewClient = adoptPtr(new FakeCompositingWebViewClient());
|
| + m_mainFrame = WebFrame::create(&m_fakeCompositingWebViewClient->m_fakeWebFrameClient);
|
| m_webView = WebView::create(m_fakeCompositingWebViewClient.get());
|
| m_webView->settings()->setJavaScriptEnabled(true);
|
| m_webView->settings()->setForceCompositingMode(true);
|
| @@ -174,7 +175,24 @@ public:
|
| m_webView->settings()->setAcceleratedCompositingForScrollableFramesEnabled(true);
|
| m_webView->settings()->setCompositedScrollingForFramesEnabled(true);
|
| m_webView->settings()->setFixedPositionCreatesStackingContext(true);
|
| - m_webView->initializeMainFrame(&m_fakeCompositingWebViewClient->m_fakeWebFrameClient);
|
| + m_webView->initializeMainFrame(m_mainFrame);
|
| + }
|
| +
|
| + // Wrapper around FrameTestHelpers::createWebViewAndLoad() that allows the test fixture to handle the main frame's lifetime.
|
| + void initializeWebViewAndLoad(const std::string& url, bool enableJavascript = false, WebFrameClient* webFrameClient = 0, WebViewClient* webViewClient = 0)
|
| + {
|
| + ASSERT(!m_webView);
|
| + ASSERT(!m_mainFrame);
|
| + m_mainFrame = WebFrame::create(webFrameClient);
|
| + initializeWebViewAndLoad(m_mainFrame, url, enableJavascript, webViewClient);
|
| + }
|
| +
|
| + void initializeWebView(bool enableJavascript, WebFrameClient* webFrameClient, WebViewClient* webViewClient = 0)
|
| + {
|
| + ASSERT(!m_webView);
|
| + ASSERT(!m_mainFrame);
|
| + m_mainFrame = WebFrame::create(webFrameClient);
|
| + initializeWebView(m_mainFrame, enableJavascript, webViewClient);
|
| }
|
|
|
| protected:
|
| @@ -185,6 +203,7 @@ protected:
|
| OwnPtr<FakeCompositingWebViewClient> m_fakeCompositingWebViewClient;
|
|
|
| WebView* m_webView;
|
| + WebFrame* m_mainFrame;
|
| };
|
|
|
| TEST_F(WebFrameTest, ContentText)
|
| @@ -194,7 +213,7 @@ TEST_F(WebFrameTest, ContentText)
|
| registerMockedHttpURLLoad("invisible_iframe.html");
|
| registerMockedHttpURLLoad("zero_sized_iframe.html");
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "iframes_test.html");
|
| + initializeWebViewAndLoad(m_baseURL + "iframes_test.html");
|
|
|
| // Now retrieve the frames text and test it only includes visible elements.
|
| std::string content = std::string(m_webView->mainFrame()->contentAsText(1024).utf8().data());
|
| @@ -212,7 +231,7 @@ TEST_F(WebFrameTest, FrameForEnteredContext)
|
| registerMockedHttpURLLoad("invisible_iframe.html");
|
| registerMockedHttpURLLoad("zero_sized_iframe.html");
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "iframes_test.html", true);
|
| + initializeWebViewAndLoad(m_baseURL + "iframes_test.html", true);
|
|
|
| v8::HandleScope scope(v8::Isolate::GetCurrent());
|
| EXPECT_EQ(m_webView->mainFrame(),
|
| @@ -227,7 +246,7 @@ TEST_F(WebFrameTest, FormWithNullFrame)
|
| {
|
| registerMockedHttpURLLoad("form.html");
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "form.html");
|
| + initializeWebViewAndLoad(m_baseURL + "form.html");
|
|
|
| WebVector<WebFormElement> forms;
|
| m_webView->mainFrame()->document().forms(forms);
|
| @@ -245,7 +264,7 @@ TEST_F(WebFrameTest, ChromePageJavascript)
|
| registerMockedChromeURLLoad("history.html");
|
|
|
| // Pass true to enable JavaScript.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_chromeURL + "history.html", true);
|
| + initializeWebViewAndLoad(m_chromeURL + "history.html", true);
|
|
|
| // Try to run JS against the chrome-style URL.
|
| FrameTestHelpers::loadFrame(m_webView->mainFrame(), "javascript:document.body.appendChild(document.createTextNode('Clobbered'))");
|
| @@ -263,7 +282,7 @@ TEST_F(WebFrameTest, ChromePageNoJavascript)
|
| registerMockedChromeURLLoad("history.html");
|
|
|
| /// Pass true to enable JavaScript.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_chromeURL + "history.html", true);
|
| + initializeWebViewAndLoad(m_chromeURL + "history.html", true);
|
|
|
| // Try to run JS against the chrome-style URL after prohibiting it.
|
| WebSecurityPolicy::registerURLSchemeAsNotAllowingJavascriptURLs("chrome");
|
| @@ -282,7 +301,7 @@ TEST_F(WebFrameTest, DispatchMessageEventWithOriginCheck)
|
| registerMockedHttpURLLoad("postmessage_test.html");
|
|
|
| // Pass true to enable JavaScript.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "postmessage_test.html", true);
|
| + initializeWebViewAndLoad(m_baseURL + "postmessage_test.html", true);
|
|
|
| // Send a message with the correct origin.
|
| WebSecurityOrigin correctOrigin(WebSecurityOrigin::create(toKURL(m_baseURL)));
|
| @@ -322,7 +341,7 @@ TEST_F(WebFrameTest, FrameViewNeedsLayoutOnFixedLayoutResize)
|
|
|
| // Make sure we initialize to minimum scale, even if the window size
|
| // only becomes available after the load begins.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -348,7 +367,7 @@ TEST_F(WebFrameTest, ChangeInFixedLayoutTriggersTextAutosizingRecalculate)
|
|
|
| // Make sure we initialize to minimum scale, even if the window size
|
| // only becomes available after the load begins.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
|
|
| @@ -398,7 +417,7 @@ TEST_F(WebFrameTest, DeviceScaleFactorUsesDefaultWithoutViewportTag)
|
| FixedLayoutTestWebViewClient client;
|
| client.m_screenInfo.deviceScaleFactor = 2;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client);
|
|
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->enableFixedLayoutMode(true);
|
| @@ -431,7 +450,7 @@ TEST_F(WebFrameTest, FixedLayoutInitializeAtMinimumScale)
|
|
|
| // Make sure we initialize to minimum scale, even if the window size
|
| // only becomes available after the load begins.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -471,7 +490,7 @@ TEST_F(WebFrameTest, WideDocumentInitializeAtMinimumScale)
|
|
|
| // Make sure we initialize to minimum scale, even if the window size
|
| // only becomes available after the load begins.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "wide_document.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "wide_document.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -506,7 +525,7 @@ TEST_F(WebFrameTest, setLoadWithOverviewModeToFalse)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->settings()->setLoadWithOverviewMode(false);
|
| @@ -526,7 +545,7 @@ TEST_F(WebFrameTest, SetLoadWithOverviewModeToFalseAndNoWideViewport)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "large-div.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "large-div.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->settings()->setLoadWithOverviewMode(false);
|
| @@ -547,7 +566,7 @@ TEST_F(WebFrameTest, NoWideViewportIgnoresPageViewportWidth)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->settings()->setUseWideViewport(false);
|
| @@ -568,7 +587,7 @@ TEST_F(WebFrameTest, NoWideViewportIgnoresPageViewportWidthButAccountsScale)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->settings()->setUseWideViewport(false);
|
| @@ -590,7 +609,7 @@ TEST_F(WebFrameTest, WideViewportSetsTo980WithoutViewportTag)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client);
|
| m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setUseWideViewport(true);
|
| @@ -610,7 +629,7 @@ TEST_F(WebFrameTest, NoWideViewportAndHeightInMeta)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-height-1000.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "viewport-height-1000.html", true, 0, &client);
|
| m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setUseWideViewport(false);
|
| @@ -629,7 +648,7 @@ TEST_F(WebFrameTest, WideViewportSetsTo980WithAutoWidth)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-2x-initial-scale.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "viewport-2x-initial-scale.html", true, 0, &client);
|
| m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setUseWideViewport(true);
|
| @@ -649,7 +668,7 @@ TEST_F(WebFrameTest, PageViewportInitialScaleOverridesLoadWithOverviewMode)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| @@ -671,7 +690,7 @@ TEST_F(WebFrameTest, setInitialPageScaleFactorPermanently)
|
| client.m_screenInfo.deviceScaleFactor = 1;
|
| float enforcedPageScaleFactor = 2.0f;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
|
| m_webView->settings()->setLoadWithOverviewMode(false);
|
| m_webView->setInitialPageScaleOverride(enforcedPageScaleFactor);
|
| @@ -703,7 +722,7 @@ TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesLoadWithOverviewMod
|
| int viewportHeight = 480;
|
| float enforcedPageScalePactor = 0.5f;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| @@ -724,7 +743,7 @@ TEST_F(WebFrameTest, PermanentInitialPageScaleFactorOverridesPageViewportInitial
|
| int viewportHeight = 480;
|
| float enforcedPageScalePactor = 0.5f;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->setInitialPageScaleOverride(enforcedPageScalePactor);
|
| @@ -742,7 +761,7 @@ TEST_F(WebFrameTest, WideViewportInitialScaleDoesNotExpandFixedLayoutWidth)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-device-0.5x-initial-scale.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "viewport-device-0.5x-initial-scale.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->settings()->setUseWideViewport(true);
|
| @@ -763,7 +782,7 @@ TEST_F(WebFrameTest, ZeroValuesQuirk)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebView(true, 0, &client);
|
| + initializeWebView(true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
|
| @@ -791,7 +810,7 @@ TEST_F(WebFrameTest, ScaleFactorShouldNotOscillate)
|
| int viewportWidth = 800;
|
| int viewportHeight = 1057;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "scale_oscillate.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "scale_oscillate.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -808,7 +827,7 @@ TEST_F(WebFrameTest, setPageScaleFactorDoesNotLayout)
|
| int viewportWidth = 64;
|
| int viewportHeight = 48;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -833,7 +852,7 @@ TEST_F(WebFrameTest, setPageScaleFactorWithOverlayScrollbarsDoesNotLayout)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -853,7 +872,7 @@ TEST_F(WebFrameTest, setPageScaleFactorBeforeFrameHasView)
|
| registerMockedHttpURLLoad("fixed_layout.html");
|
|
|
| float pageScaleFactor = 3;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad("about:html", true, 0, 0);
|
| + initializeWebViewAndLoad("about:html", true, 0, 0);
|
| m_webView->setPageScaleFactor(pageScaleFactor, WebPoint());
|
|
|
| FrameTestHelpers::loadFrame(m_webView->mainFrame(), m_baseURL + "fixed_layout.html");
|
| @@ -871,7 +890,7 @@ TEST_F(WebFrameTest, pageScaleFactorWrittenToHistoryItem)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -894,7 +913,7 @@ TEST_F(WebFrameTest, pageScaleFactorShrinksViewport)
|
| int viewportWidth = 64;
|
| int viewportHeight = 48;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -928,7 +947,7 @@ TEST_F(WebFrameTest, pageScaleFactorDoesNotApplyCssTransform)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -958,7 +977,7 @@ TEST_F(WebFrameTest, targetDensityDpiHigh)
|
| float deviceDpi = deviceScaleFactor * 160.0f;
|
| client.m_screenInfo.deviceScaleFactor = deviceScaleFactor;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-target-densitydpi-high.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "viewport-target-densitydpi-high.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
|
| @@ -991,7 +1010,7 @@ TEST_F(WebFrameTest, targetDensityDpiDevice)
|
| for (size_t i = 0; i < ARRAY_SIZE(deviceScaleFactors); ++i) {
|
| client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i];
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "viewport-target-densitydpi-device.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "viewport-target-densitydpi-device.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->settings()->setSupportDeprecatedTargetDensityDPI(true);
|
| @@ -1025,7 +1044,7 @@ protected:
|
|
|
| const float aspectRatio = static_cast<float>(viewportSize.width) / viewportSize.height;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + url, true);
|
| + initializeWebViewAndLoad(m_baseURL + url, true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->enableFixedLayoutMode(true);
|
|
|
| @@ -1132,7 +1151,7 @@ TEST_F(WebFrameTest, pageScaleFactorScalesPaintClip)
|
| int viewportWidth = 50;
|
| int viewportHeight = 50;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -1172,7 +1191,7 @@ TEST_F(WebFrameTest, pageScaleFactorUpdatesScrollbars)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -1200,7 +1219,7 @@ TEST_F(WebFrameTest, CanOverrideScaleLimits)
|
| int viewportWidth = 640;
|
| int viewportHeight = 480;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_scale_for_you.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "no_scale_for_you.html", true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| @@ -1262,7 +1281,7 @@ TEST_F(WebFrameTest, DivAutoZoomParamsTest)
|
| int viewportWidth = 640 / deviceScaleFactor;
|
| int viewportHeight = 1280 / deviceScaleFactor;
|
| float doubleTapZoomAlreadyLegibleRatio = 1.2f;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_for_auto_zoom_into_div_test.html"); //
|
| + initializeWebViewAndLoad(m_baseURL + "get_scale_for_auto_zoom_into_div_test.html");
|
| m_webView->setDeviceScaleFactor(deviceScaleFactor);
|
| m_webView->setPageScaleFactorLimits(0.01f, 4);
|
| m_webView->setPageScaleFactor(0.5f, WebPoint(0, 0));
|
| @@ -1342,7 +1361,7 @@ TEST_F(WebFrameTest, DivAutoZoomWideDivTest)
|
| int viewportWidth = 640 / deviceScaleFactor;
|
| int viewportHeight = 1280 / deviceScaleFactor;
|
| float doubleTapZoomAlreadyLegibleRatio = 1.2f;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_wide_div_for_auto_zoom_test.html");
|
| + initializeWebViewAndLoad(m_baseURL + "get_wide_div_for_auto_zoom_test.html");
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| m_webView->setPageScaleFactorLimits(1.0f, 4);
|
| @@ -1373,7 +1392,7 @@ TEST_F(WebFrameTest, DivAutoZoomMultipleDivsTest)
|
| int viewportWidth = 640 / deviceScaleFactor;
|
| int viewportHeight = 1280 / deviceScaleFactor;
|
| float doubleTapZoomAlreadyLegibleRatio = 1.2f;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html");
|
| + initializeWebViewAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html");
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| m_webView->setPageScaleFactorLimits(0.5f, 4);
|
| @@ -1421,7 +1440,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleBoundsTest)
|
| int viewportWidth = 320;
|
| int viewportHeight = 480;
|
| float doubleTapZoomAlreadyLegibleRatio = 1.2f;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html");
|
| + initializeWebViewAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html");
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| m_webView->setDeviceScaleFactor(1.5f);
|
| @@ -1483,7 +1502,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleFontScaleFactorTest)
|
| int viewportHeight = 480;
|
| float doubleTapZoomAlreadyLegibleRatio = 1.2f;
|
| float textAutosizingFontScaleFactor = 1.13f;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html");
|
| + initializeWebViewAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html");
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| m_webView->layout();
|
| @@ -1561,7 +1580,7 @@ TEST_F(WebFrameTest, DivMultipleTargetZoomMultipleDivsTest)
|
| int viewportWidth = 640 / deviceScaleFactor;
|
| int viewportHeight = 1280 / deviceScaleFactor;
|
| float doubleTapZoomAlreadyLegibleRatio = 1.2f;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html");
|
| + initializeWebViewAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html");
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| m_webView->setPageScaleFactorLimits(0.5f, 4);
|
| @@ -1597,7 +1616,7 @@ TEST_F(WebFrameTest, DivScrollIntoEditableTest)
|
| float leftBoxRatio = 0.3f;
|
| int caretPadding = 10;
|
| float minReadableCaretHeight = 18.0f;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_for_zoom_into_editable_test.html");
|
| + initializeWebViewAndLoad(m_baseURL + "get_scale_for_zoom_into_editable_test.html");
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| m_webView->setPageScaleFactorLimits(1, 4);
|
| @@ -1684,7 +1703,7 @@ TEST_F(WebFrameTest, ReloadDoesntSetRedirect)
|
| registerMockedHttpURLLoad("form.html");
|
|
|
| TestReloadDoesntRedirectWebFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "form.html", false, &webFrameClient);
|
| + initializeWebViewAndLoad(m_baseURL + "form.html", false, &webFrameClient);
|
|
|
| m_webView->mainFrame()->reload(true);
|
| // start reload before request is delivered.
|
| @@ -1708,7 +1727,7 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState)
|
| registerMockedHttpURLLoad(secondURL);
|
| registerMockedHttpURLLoad(thirdURL);
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + firstURL, true);
|
| + initializeWebViewAndLoad(m_baseURL + firstURL, true);
|
| webViewImpl()->resize(WebSize(pageWidth, pageHeight));
|
| webViewImpl()->mainFrame()->setScrollOffset(WebSize(pageWidth / 4, pageHeight / 4));
|
| webViewImpl()->setPageScaleFactorPreservingScrollOffset(pageScaleFactor);
|
| @@ -1739,7 +1758,7 @@ TEST_F(WebFrameTest, ReloadWhileProvisional)
|
| registerMockedHttpURLLoad("fixed_layout.html");
|
|
|
| TestReloadWhileProvisionalFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebView(false, &webFrameClient);
|
| + initializeWebView(false, &webFrameClient);
|
| FrameTestHelpers::loadFrame(m_webView->mainFrame(), m_baseURL + "fixed_layout.html");
|
| // start reload before first request is delivered.
|
| m_webView->mainFrame()->reload(true);
|
| @@ -1756,7 +1775,7 @@ TEST_F(WebFrameTest, IframeRedirect)
|
| registerMockedHttpURLLoad("iframe_redirect.html");
|
| registerMockedHttpURLLoad("visible_iframe.html");
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "iframe_redirect.html", true);
|
| + initializeWebViewAndLoad(m_baseURL + "iframe_redirect.html", true);
|
| Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests(); // Load the iframe.
|
|
|
| WebFrame* iframe = m_webView->findFrameByName(WebString::fromUTF8("ifr"));
|
| @@ -1775,7 +1794,7 @@ TEST_F(WebFrameTest, ClearFocusedNodeTest)
|
| registerMockedHttpURLLoad("iframe_clear_focused_node_test.html");
|
| registerMockedHttpURLLoad("autofocus_input_field_iframe.html");
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "iframe_clear_focused_node_test.html", true);
|
| + initializeWebViewAndLoad(m_baseURL + "iframe_clear_focused_node_test.html", true);
|
|
|
| // Clear the focused node.
|
| m_webView->clearFocusedNode();
|
| @@ -1854,7 +1873,7 @@ TEST_F(WebFrameTest, FLAKY_ContextNotificationsLoadUnload)
|
|
|
| // Load a frame with an iframe, make sure we get the right create notifications.
|
| ContextLifetimeTestWebFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
|
| + initializeWebViewAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
|
|
|
| WebFrame* mainFrame = m_webView->mainFrame();
|
| WebFrame* childFrame = mainFrame->firstChild();
|
| @@ -1893,7 +1912,7 @@ TEST_F(WebFrameTest, ContextNotificationsReload)
|
| registerMockedHttpURLLoad("context_notifications_test_frame.html");
|
|
|
| ContextLifetimeTestWebFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
|
| + initializeWebViewAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
|
|
|
| // Refresh, we should get two release notifications and two more create notifications.
|
| m_webView->mainFrame()->reload(false);
|
| @@ -1934,7 +1953,7 @@ TEST_F(WebFrameTest, ContextNotificationsIsolatedWorlds)
|
| registerMockedHttpURLLoad("context_notifications_test_frame.html");
|
|
|
| ContextLifetimeTestWebFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
|
| + initializeWebViewAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
|
|
|
| // Add an isolated world.
|
| webFrameClient.reset();
|
| @@ -1972,7 +1991,7 @@ TEST_F(WebFrameTest, ContextNotificationsIsolatedWorlds)
|
| TEST_F(WebFrameTest, FindInPage)
|
| {
|
| registerMockedHttpURLLoad("find.html");
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "find.html");
|
| + initializeWebViewAndLoad(m_baseURL + "find.html");
|
| WebFrame* frame = m_webView->mainFrame();
|
| const int findIdentifier = 12345;
|
| WebFindOptions options;
|
| @@ -2027,7 +2046,7 @@ TEST_F(WebFrameTest, FindInPage)
|
|
|
| TEST_F(WebFrameTest, GetContentAsPlainText)
|
| {
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad("about:blank", true);
|
| + initializeWebViewAndLoad("about:blank", true);
|
| // We set the size because it impacts line wrapping, which changes the
|
| // resulting text value.
|
| m_webView->resize(WebSize(640, 480));
|
| @@ -2071,7 +2090,7 @@ TEST_F(WebFrameTest, GetContentAsPlainText)
|
|
|
| TEST_F(WebFrameTest, GetFullHtmlOfPage)
|
| {
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad("about:blank", true);
|
| + initializeWebViewAndLoad("about:blank", true);
|
| WebFrame* frame = m_webView->mainFrame();
|
|
|
| // Generate a simple test case.
|
| @@ -2117,7 +2136,7 @@ TEST_F(WebFrameTest, ExecuteScriptDuringDidCreateScriptContext)
|
| registerMockedHttpURLLoad("hello_world.html");
|
|
|
| TestExecuteScriptDuringDidCreateScriptContext webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "hello_world.html", true, &webFrameClient);
|
| + initializeWebViewAndLoad(m_baseURL + "hello_world.html", true, &webFrameClient);
|
|
|
| m_webView->mainFrame()->reload();
|
| Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
|
| @@ -2132,11 +2151,14 @@ public:
|
| {
|
| }
|
|
|
| - virtual void didCreateFrame(WebFrame* parent, WebFrame* child)
|
| + virtual WebFrame* didCreateFrame(WebString name)
|
| {
|
| m_frameCount++;
|
| + /*
|
| if (!m_parent)
|
| m_parent = parent;
|
| + */
|
| + return 0;
|
| }
|
|
|
| int m_frameCount;
|
| @@ -2151,7 +2173,7 @@ TEST_F(WebFrameTest, DidCreateFrame)
|
| registerMockedHttpURLLoad("zero_sized_iframe.html");
|
|
|
| TestDidCreateFrameWebFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "iframes_test.html", false, &webFrameClient);
|
| + initializeWebViewAndLoad(m_baseURL + "iframes_test.html", false, &webFrameClient);
|
|
|
| EXPECT_EQ(webFrameClient.m_frameCount, 3);
|
| EXPECT_EQ(webFrameClient.m_parent, m_webView->mainFrame());
|
| @@ -2194,7 +2216,7 @@ TEST_F(WebFrameTest, FindInPageMatchRects)
|
| registerMockedHttpURLLoad("find_in_page_frame.html");
|
|
|
| FindUpdateWebFrameClient client;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "find_in_page.html", true, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "find_in_page.html", true, &client);
|
| m_webView->resize(WebSize(640, 480));
|
| m_webView->layout();
|
| runPendingTasks();
|
| @@ -2314,7 +2336,7 @@ TEST_F(WebFrameTest, FindInPageSkipsHiddenFrames)
|
| registerMockedHttpURLLoad("find_in_hidden_frame.html");
|
|
|
| FindUpdateWebFrameClient client;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "find_in_hidden_frame.html", true, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "find_in_hidden_frame.html", true, &client);
|
| m_webView->resize(WebSize(640, 480));
|
| m_webView->layout();
|
| runPendingTasks();
|
| @@ -2347,7 +2369,7 @@ TEST_F(WebFrameTest, FindOnDetachedFrame)
|
| registerMockedHttpURLLoad("find_in_page_frame.html");
|
|
|
| FindUpdateWebFrameClient client;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "find_in_page.html", true, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "find_in_page.html", true, &client);
|
| m_webView->resize(WebSize(640, 480));
|
| m_webView->layout();
|
| runPendingTasks();
|
| @@ -2390,7 +2412,7 @@ TEST_F(WebFrameTest, FindDetachFrameBeforeScopeStrings)
|
| registerMockedHttpURLLoad("find_in_page_frame.html");
|
|
|
| FindUpdateWebFrameClient client;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "find_in_page.html", true, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "find_in_page.html", true, &client);
|
| m_webView->resize(WebSize(640, 480));
|
| m_webView->layout();
|
| runPendingTasks();
|
| @@ -2433,7 +2455,7 @@ TEST_F(WebFrameTest, FindDetachFrameWhileScopingStrings)
|
| registerMockedHttpURLLoad("find_in_page_frame.html");
|
|
|
| FindUpdateWebFrameClient client;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "find_in_page.html", true, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "find_in_page.html", true, &client);
|
| m_webView->resize(WebSize(640, 480));
|
| m_webView->layout();
|
| runPendingTasks();
|
| @@ -2472,7 +2494,7 @@ TEST_F(WebFrameTest, FindDetachFrameWhileScopingStrings)
|
|
|
| static WebView* createWebViewForTextSelection(const std::string& url)
|
| {
|
| - WebView* webView = FrameTestHelpers::createWebViewAndLoad(url, true);
|
| + WebView* webView = createWebViewAndLoad(url, true);
|
| webView->settings()->setDefaultFontSize(12);
|
| webView->enableFixedLayoutMode(false);
|
| webView->resize(WebSize(640, 480));
|
| @@ -2512,7 +2534,7 @@ TEST_F(WebFrameTest, SelectRange)
|
| registerMockedHttpURLLoad("select_range_basic.html");
|
| registerMockedHttpURLLoad("select_range_scroll.html");
|
|
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "select_range_basic.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "select_range_basic.html");
|
| frame = m_webView->mainFrame();
|
| EXPECT_EQ("Some test text for testing.", selectionAsString(frame));
|
| m_webView->selectionBounds(startWebRect, endWebRect);
|
| @@ -2523,7 +2545,7 @@ TEST_F(WebFrameTest, SelectRange)
|
| m_webView->close();
|
| m_webView = 0;
|
|
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "select_range_scroll.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "select_range_scroll.html");
|
| frame = m_webView->mainFrame();
|
| EXPECT_EQ("Some offscreen test text for testing.", selectionAsString(frame));
|
| m_webView->selectionBounds(startWebRect, endWebRect);
|
| @@ -2544,7 +2566,7 @@ TEST_F(WebFrameTest, SelectRangeInIframe)
|
| registerMockedHttpURLLoad("select_range_iframe.html");
|
| registerMockedHttpURLLoad("select_range_basic.html");
|
|
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "select_range_iframe.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "select_range_iframe.html");
|
| frame = m_webView->mainFrame();
|
| WebFrame* subframe = frame->findChildByExpression(WebString::fromUTF8("/html/body/iframe"));
|
| EXPECT_EQ("Some test text for testing.", selectionAsString(subframe));
|
| @@ -2567,7 +2589,7 @@ TEST_F(WebFrameTest, SelectRangeDivContentEditable)
|
|
|
| // Select the middle of an editable element, then try to extend the selection to the top of the document.
|
| // The selection range should be clipped to the bounds of the editable element.
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "select_range_div_editable.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "select_range_div_editable.html");
|
| frame = m_webView->mainFrame();
|
| EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
|
| m_webView->selectionBounds(startWebRect, endWebRect);
|
| @@ -2578,7 +2600,7 @@ TEST_F(WebFrameTest, SelectRangeDivContentEditable)
|
| m_webView = 0;
|
|
|
| // As above, but extending the selection to the bottom of the document.
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "select_range_div_editable.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "select_range_div_editable.html");
|
| frame = m_webView->mainFrame();
|
|
|
| m_webView->selectionBounds(startWebRect, endWebRect);
|
| @@ -2605,7 +2627,7 @@ TEST_F(WebFrameTest, DISABLED_SelectRangeSpanContentEditable)
|
|
|
| // Select the middle of an editable element, then try to extend the selection to the top of the document.
|
| // The selection range should be clipped to the bounds of the editable element.
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "select_range_span_editable.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "select_range_span_editable.html");
|
| frame = m_webView->mainFrame();
|
| EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
|
| m_webView->selectionBounds(startWebRect, endWebRect);
|
| @@ -2616,7 +2638,7 @@ TEST_F(WebFrameTest, DISABLED_SelectRangeSpanContentEditable)
|
| m_webView = 0;
|
|
|
| // As above, but extending the selection to the bottom of the document.
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "select_range_span_editable.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "select_range_span_editable.html");
|
| frame = m_webView->mainFrame();
|
|
|
| m_webView->selectionBounds(startWebRect, endWebRect);
|
| @@ -2635,7 +2657,7 @@ TEST_F(WebFrameTest, DISABLED_SelectRangeSpanContentEditable)
|
| TEST_F(WebFrameTest, SelectRangeCanMoveSelectionStart)
|
| {
|
| registerMockedHttpURLLoad("text_selection.html");
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "text_selection.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "text_selection.html");
|
| WebFrame* frame = m_webView->mainFrame();
|
|
|
| // Select second span. We can move the start to include the first span.
|
| @@ -2682,7 +2704,7 @@ TEST_F(WebFrameTest, SelectRangeCanMoveSelectionStart)
|
| TEST_F(WebFrameTest, SelectRangeCanMoveSelectionEnd)
|
| {
|
| registerMockedHttpURLLoad("text_selection.html");
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "text_selection.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "text_selection.html");
|
| WebFrame* frame = m_webView->mainFrame();
|
|
|
| // Select first span. We can move the end to include the second span.
|
| @@ -2736,14 +2758,14 @@ static int computeOffset(WebCore::RenderObject* renderer, int x, int y)
|
| TEST_F(WebFrameTest, DISABLED_PositionForPointTest)
|
| {
|
| registerMockedHttpURLLoad("select_range_span_editable.html");
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "select_range_span_editable.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "select_range_span_editable.html");
|
| WebFrameImpl* mainFrame = toWebFrameImpl(m_webView->mainFrame());
|
| WebCore::RenderObject* renderer = mainFrame->frame()->selection().rootEditableElement()->renderer();
|
| EXPECT_EQ(0, computeOffset(renderer, -1, -1));
|
| EXPECT_EQ(64, computeOffset(renderer, 1000, 1000));
|
|
|
| registerMockedHttpURLLoad("select_range_div_editable.html");
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "select_range_div_editable.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "select_range_div_editable.html");
|
| mainFrame = toWebFrameImpl(m_webView->mainFrame());
|
| renderer = mainFrame->frame()->selection().rootEditableElement()->renderer();
|
| EXPECT_EQ(0, computeOffset(renderer, -1, -1));
|
| @@ -2756,7 +2778,7 @@ TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved)
|
| WebFrameImpl* frame;
|
| registerMockedHttpURLLoad("move_caret.html");
|
|
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "move_caret.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "move_caret.html");
|
| frame = (WebFrameImpl*)m_webView->mainFrame();
|
|
|
| WebRect initialStartRect;
|
| @@ -2800,7 +2822,7 @@ TEST_F(WebFrameTest, MoveCaretStaysHorizontallyAlignedWhenMoved)
|
| WebFrameImpl* frame;
|
| registerMockedHttpURLLoad("move_caret.html");
|
|
|
| - m_webView = createWebViewForTextSelection(m_baseURL + "move_caret.html");
|
| + initializeWebViewForTextSelection(m_baseURL + "move_caret.html");
|
| frame = (WebFrameImpl*)m_webView->mainFrame();
|
|
|
| WebRect initialStartRect;
|
| @@ -2860,7 +2882,7 @@ TEST_F(WebFrameTest, DisambiguationPopup)
|
|
|
| // Make sure we initialize to minimum scale, even if the window size
|
| // only becomes available after the load begins.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client);
|
| m_webView->resize(WebSize(1000, 1000));
|
| m_webView->layout();
|
|
|
| @@ -2907,7 +2929,7 @@ TEST_F(WebFrameTest, DisambiguationPopupNoContainer)
|
|
|
| // Make sure we initialize to minimum scale, even if the window size
|
| // only becomes available after the load begins.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup_no_container.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "disambiguation_popup_no_container.html", true, 0, &client);
|
| m_webView->resize(WebSize(1000, 1000));
|
| m_webView->layout();
|
|
|
| @@ -2928,7 +2950,7 @@ TEST_F(WebFrameTest, DisambiguationPopupMobileSite)
|
|
|
| // Make sure we initialize to minimum scale, even if the window size
|
| // only becomes available after the load begins.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(1000, 1000));
|
| @@ -2967,7 +2989,7 @@ TEST_F(WebFrameTest, DisambiguationPopupViewportSite)
|
|
|
| // Make sure we initialize to minimum scale, even if the window size
|
| // only becomes available after the load begins.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client);
|
| m_webView->enableFixedLayoutMode(true);
|
| m_webView->settings()->setViewportEnabled(true);
|
| m_webView->resize(WebSize(1000, 1000));
|
| @@ -3009,7 +3031,7 @@ TEST_F(WebFrameTest, DisambiguationPopupBlacklist)
|
|
|
| // Make sure we initialize to minimum scale, even if the window size
|
| // only becomes available after the load begins.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client);
|
| m_webView->resize(WebSize(viewportWidth, viewportHeight));
|
| m_webView->layout();
|
|
|
| @@ -3040,7 +3062,7 @@ TEST_F(WebFrameTest, DisambiguationPopupPageScale)
|
|
|
| // Make sure we initialize to minimum scale, even if the window size
|
| // only becomes available after the load begins.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup_page_scale.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "disambiguation_popup_page_scale.html", true, 0, &client);
|
| m_webView->resize(WebSize(1000, 1000));
|
| m_webView->layout();
|
|
|
| @@ -3096,7 +3118,7 @@ TEST_F(WebFrameTest, ReplaceNavigationAfterHistoryNavigation)
|
| {
|
| TestSubstituteDataWebFrameClient webFrameClient;
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad("about:blank", true, &webFrameClient);
|
| + initializeWebViewAndLoad("about:blank", true, &webFrameClient);
|
| runPendingTasks();
|
| WebFrame* frame = m_webView->mainFrame();
|
|
|
| @@ -3160,7 +3182,7 @@ TEST_F(WebFrameTest, HTMLDocument)
|
| registerMockedHttpURLLoad("clipped-body.html");
|
|
|
| TestWillInsertBodyWebFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "clipped-body.html", false, &webFrameClient);
|
| + initializeWebViewAndLoad(m_baseURL + "clipped-body.html", false, &webFrameClient);
|
|
|
| EXPECT_TRUE(webFrameClient.m_didLoad);
|
| EXPECT_EQ(1, webFrameClient.m_numBodies);
|
| @@ -3174,7 +3196,7 @@ TEST_F(WebFrameTest, EmptyDocument)
|
| registerMockedHttpURLLoad("pageserializer/green_rectangle.svg");
|
|
|
| TestWillInsertBodyWebFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebView(false, &webFrameClient);
|
| + initializeWebView(false, &webFrameClient);
|
|
|
| EXPECT_FALSE(webFrameClient.m_didLoad);
|
| EXPECT_EQ(1, webFrameClient.m_numBodies); // The empty document that a new frame starts with triggers this.
|
| @@ -3184,7 +3206,7 @@ TEST_F(WebFrameTest, EmptyDocument)
|
|
|
| TEST_F(WebFrameTest, MoveCaretSelectionTowardsWindowPointWithNoSelection)
|
| {
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad("about:blank", true);
|
| + initializeWebViewAndLoad("about:blank", true);
|
| WebFrame* frame = m_webView->mainFrame();
|
|
|
| // This test passes if this doesn't crash.
|
| @@ -3213,7 +3235,7 @@ private:
|
| TEST_F(WebFrameTest, ReplaceMisspelledRange)
|
| {
|
| registerMockedHttpURLLoad("spell.html");
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "spell.html");
|
| + initializeWebViewAndLoad(m_baseURL + "spell.html");
|
| SpellCheckClient spellcheck;
|
| m_webView->setSpellCheckClient(&spellcheck);
|
|
|
| @@ -3246,7 +3268,7 @@ TEST_F(WebFrameTest, ReplaceMisspelledRange)
|
| TEST_F(WebFrameTest, RemoveSpellingMarkers)
|
| {
|
| registerMockedHttpURLLoad("spell.html");
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "spell.html");
|
| + initializeWebViewAndLoad(m_baseURL + "spell.html");
|
| SpellCheckClient spellcheck;
|
| m_webView->setSpellCheckClient(&spellcheck);
|
|
|
| @@ -3276,7 +3298,7 @@ TEST_F(WebFrameTest, RemoveSpellingMarkers)
|
|
|
| TEST_F(WebFrameTest, MarkerHashIdentifiers) {
|
| registerMockedHttpURLLoad("spell.html");
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "spell.html");
|
| + initializeWebViewAndLoad(m_baseURL + "spell.html");
|
|
|
| static const uint32_t kHash = 42;
|
| SpellCheckClient spellcheck(kHash);
|
| @@ -3335,7 +3357,7 @@ private:
|
| TEST_F(WebFrameTest, SlowSpellcheckMarkerPosition)
|
| {
|
| registerMockedHttpURLLoad("spell.html");
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "spell.html");
|
| + initializeWebViewAndLoad(m_baseURL + "spell.html");
|
|
|
| StubbornSpellCheckClient spellcheck;
|
| m_webView->setSpellCheckClient(&spellcheck);
|
| @@ -3369,7 +3391,7 @@ TEST_F(WebFrameTest, SlowSpellcheckMarkerPosition)
|
| TEST_F(WebFrameTest, CancelSpellingRequestCrash)
|
| {
|
| registerMockedHttpURLLoad("spell.html");
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "spell.html");
|
| + initializeWebViewAndLoad(m_baseURL + "spell.html");
|
| m_webView->setSpellCheckClient(0);
|
|
|
| WebFrameImpl* frame = toWebFrameImpl(m_webView->mainFrame());
|
| @@ -3406,7 +3428,7 @@ public:
|
| TEST_F(WebFrameTest, DidAccessInitialDocumentBody)
|
| {
|
| TestAccessInitialDocumentWebFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebView(true, &webFrameClient);
|
| + initializeWebView(true, &webFrameClient);
|
| runPendingTasks();
|
| EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
|
|
|
| @@ -3436,7 +3458,7 @@ TEST_F(WebFrameTest, DidAccessInitialDocumentBody)
|
| TEST_F(WebFrameTest, DidAccessInitialDocumentNavigator)
|
| {
|
| TestAccessInitialDocumentWebFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebView(true, &webFrameClient);
|
| + initializeWebView(true, &webFrameClient);
|
| runPendingTasks();
|
| EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
|
|
|
| @@ -3460,7 +3482,7 @@ TEST_F(WebFrameTest, DidAccessInitialDocumentNavigator)
|
| TEST_F(WebFrameTest, DidAccessInitialDocumentViaJavascriptUrl)
|
| {
|
| TestAccessInitialDocumentWebFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebView(true, &webFrameClient);
|
| + initializeWebView(true, &webFrameClient);
|
| runPendingTasks();
|
| EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
|
|
|
| @@ -3476,7 +3498,7 @@ TEST_F(WebFrameTest, DidAccessInitialDocumentViaJavascriptUrl)
|
| TEST_F(WebFrameTest, DidAccessInitialDocumentBodyBeforeModalDialog)
|
| {
|
| TestAccessInitialDocumentWebFrameClient webFrameClient;
|
| - m_webView = FrameTestHelpers::createWebView(true, &webFrameClient);
|
| + initializeWebView(true, &webFrameClient);
|
| runPendingTasks();
|
| EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
|
|
|
| @@ -3544,7 +3566,7 @@ TEST_F(WebFrameTest, CompositorScrollIsUserScrollLongPage)
|
|
|
| // Make sure we initialize to minimum scale, even if the window size
|
| // only becomes available after the load begins.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "long_scroll.html", true, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "long_scroll.html", true, &client);
|
| m_webView->resize(WebSize(1000, 1000));
|
| m_webView->layout();
|
|
|
| @@ -3599,7 +3621,7 @@ TEST_F(WebFrameTest, CompositorScrollIsUserScrollShortPage)
|
| TestMainFrameUserOrProgrammaticScrollFrameClient client;
|
|
|
| // Short page tests.
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "short_scroll.html", true, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "short_scroll.html", true, &client);
|
|
|
| m_webView->resize(WebSize(1000, 1000));
|
| m_webView->layout();
|
| @@ -3637,7 +3659,7 @@ TEST_F(WebFrameTest, FirstPartyForCookiesForRedirect)
|
| finalResponse.setMIMEType("text/html");
|
| Platform::current()->unitTestSupport()->registerMockedURL(redirectURL, finalResponse, filePath);
|
|
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "first_party_redirect.html", true);
|
| + initializeWebViewAndLoad(m_baseURL + "first_party_redirect.html", true);
|
| EXPECT_TRUE(m_webView->mainFrame()->document().firstPartyForCookies() == redirectURL);
|
|
|
| m_webView->close();
|
| @@ -3657,7 +3679,7 @@ TEST_F(WebFrameTest, SimulateFragmentAnchorMiddleClick)
|
| {
|
| registerMockedHttpURLLoad("fragment_middle_click.html");
|
| TestNavigationPolicyWebFrameClient client;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fragment_middle_click.html", true, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "fragment_middle_click.html", true, &client);
|
|
|
| WebCore::Document* document = webViewImpl()->page()->mainFrame()->document();
|
| WebCore::KURL destination = document->url();
|
| @@ -3676,7 +3698,7 @@ TEST_F(WebFrameTest, SimulateFragmentAnchorMiddleClick)
|
| TEST_F(WebFrameTest, BackToReload)
|
| {
|
| registerMockedHttpURLLoad("fragment_middle_click.html");
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "fragment_middle_click.html", true);
|
| + initializeWebViewAndLoad(m_baseURL + "fragment_middle_click.html", true);
|
| WebFrame* frame = m_webView->mainFrame();
|
| WebHistoryItem firstItem = frame->currentHistoryItem();
|
| EXPECT_FALSE(firstItem.isNull());
|
| @@ -3722,7 +3744,7 @@ TEST_F(WebFrameTest, NavigateToSame)
|
| {
|
| registerMockedHttpURLLoad("navigate_to_same.html");
|
| TestSameDocumentWebFrameClient client;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "navigate_to_same.html", true, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "navigate_to_same.html", true, &client);
|
| EXPECT_FALSE(client.frameLoadTypeSameSeen());
|
|
|
| WebCore::FrameLoadRequest frameRequest(0, WebCore::ResourceRequest(webViewImpl()->page()->mainFrame()->document()->url()));
|
| @@ -3736,7 +3758,7 @@ TEST_F(WebFrameTest, NavigateToSame)
|
|
|
| TEST_F(WebFrameTest, WebNodeImageContents)
|
| {
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad("about:blank", true);
|
| + initializeWebViewAndLoad("about:blank", true);
|
| WebFrame* frame = m_webView->mainFrame();
|
|
|
| static const char bluePNG[] = "<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGElEQVQYV2NkYPj/n4EIwDiqEF8oUT94AFIQE/cCn90IAAAAAElFTkSuQmCC\">";
|
| @@ -3790,7 +3812,7 @@ TEST_F(WebFrameTest, PushStateStartsAndStops)
|
| {
|
| registerMockedHttpURLLoad("push_state.html");
|
| TestStartStopCallbackWebViewClient client;
|
| - m_webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "push_state.html", true, 0, &client);
|
| + initializeWebViewAndLoad(m_baseURL + "push_state.html", true, 0, &client);
|
| runPendingTasks();
|
|
|
| EXPECT_EQ(client.startLoadingCount(), 2);
|
|
|