Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 2258523006: Convert Settings::rootLayerScrolls to RuntimeEnabledFeatures (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase & fix mistake Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« third_party/WebKit/Source/web/tests/VisualViewportTest.cpp ('K') | « third_party/WebKit/Source/web/tests/VisualViewportTest.cpp ('k') | third_party/WebKit/public/web/WebRuntimeFeatures.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index 400a8897e4ed2bca521e4078f730ebcc41937a0b..0a7f52e50382a14f5970ece0fda8add268ac2795 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -281,21 +281,30 @@ protected:
std::string m_chromeURL;
};
+typedef bool TestParamRootLayerScrolling;
class ParameterizedWebFrameTest
: public WebFrameTest
- , public ::testing::WithParamInterface<FrameTestHelpers::SettingOverrideFunction>
- , public FrameTestHelpers::SettingOverrider {
+ , public ::testing::WithParamInterface<TestParamRootLayerScrolling> {
public:
+ ParameterizedWebFrameTest()
+ : m_originalRootLayerScrollingEnabled(RuntimeEnabledFeatures::rootLayerScrollingEnabled())
+ , m_enableRootLayerScrolling(GetParam())
+ {
+ RuntimeEnabledFeatures::setRootLayerScrollingEnabled(m_enableRootLayerScrolling);
+ }
- void overrideSettings(WebSettings *settings) override
+ ~ParameterizedWebFrameTest()
{
- GetParam()(settings);
+ CHECK_EQ(m_enableRootLayerScrolling, RuntimeEnabledFeatures::rootLayerScrollingEnabled());
+ RuntimeEnabledFeatures::setRootLayerScrollingEnabled(m_originalRootLayerScrollingEnabled);
}
+
+private:
+ bool m_originalRootLayerScrollingEnabled;
+ bool m_enableRootLayerScrolling;
};
-INSTANTIATE_TEST_CASE_P(All, ParameterizedWebFrameTest, ::testing::Values(
- FrameTestHelpers::DefaultSettingOverride,
- FrameTestHelpers::RootLayerScrollsSettingOverride));
+INSTANTIATE_TEST_CASE_P(All, ParameterizedWebFrameTest, ::testing::Bool());
TEST_P(ParameterizedWebFrameTest, ContentText)
{
@@ -304,7 +313,7 @@ TEST_P(ParameterizedWebFrameTest, ContentText)
registerMockedHttpURLLoad("invisible_iframe.html");
registerMockedHttpURLLoad("zero_sized_iframe.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "iframes_test.html");
// Now retrieve the frames text and test it only includes visible elements.
@@ -323,7 +332,7 @@ TEST_P(ParameterizedWebFrameTest, FrameForEnteredContext)
registerMockedHttpURLLoad("invisible_iframe.html");
registerMockedHttpURLLoad("zero_sized_iframe.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "iframes_test.html", true);
v8::HandleScope scope(v8::Isolate::GetCurrent());
@@ -359,7 +368,7 @@ TEST_P(ParameterizedWebFrameTest, RequestExecuteScript)
{
registerMockedHttpURLLoad("foo.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "foo.html", true);
v8::HandleScope scope(v8::Isolate::GetCurrent());
@@ -375,7 +384,7 @@ TEST_P(ParameterizedWebFrameTest, SuspendedRequestExecuteScript)
registerMockedHttpURLLoad("foo.html");
registerMockedHttpURLLoad("bar.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "foo.html", true);
v8::HandleScope scope(v8::Isolate::GetCurrent());
@@ -398,7 +407,7 @@ TEST_P(ParameterizedWebFrameTest, IframeScriptRemovesSelf)
registerMockedHttpURLLoad("single_iframe.html");
registerMockedHttpURLLoad("visible_iframe.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "single_iframe.html", true);
v8::HandleScope scope(v8::Isolate::GetCurrent());
@@ -413,7 +422,7 @@ TEST_P(ParameterizedWebFrameTest, FormWithNullFrame)
{
registerMockedHttpURLLoad("form.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "form.html");
WebVector<WebFormElement> forms;
@@ -431,7 +440,7 @@ TEST_P(ParameterizedWebFrameTest, ChromePageJavascript)
registerMockedChromeURLLoad("history.html");
// Pass true to enable JavaScript.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_chromeURL + "history.html", true);
// Try to run JS against the chrome-style URL.
@@ -447,7 +456,7 @@ TEST_P(ParameterizedWebFrameTest, ChromePageNoJavascript)
registerMockedChromeURLLoad("history.html");
/// Pass true to enable JavaScript.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_chromeURL + "history.html", true);
// Try to run JS against the chrome-style URL after prohibiting it.
@@ -465,7 +474,7 @@ TEST_P(ParameterizedWebFrameTest, LocationSetHostWithMissingPort)
registerMockedHttpURLLoad(fileName);
URLTestHelpers::registerMockedURLLoad(toKURL("http://internal.test:0/" + fileName), WebString::fromUTF8(fileName));
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
/// Pass true to enable JavaScript.
webViewHelper.initializeAndLoad(m_baseURL + fileName, true);
@@ -485,7 +494,7 @@ TEST_P(ParameterizedWebFrameTest, LocationSetEmptyPort)
registerMockedHttpURLLoad(fileName);
URLTestHelpers::registerMockedURLLoad(toKURL("http://internal.test:0/" + fileName), WebString::fromUTF8(fileName));
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
/// Pass true to enable JavaScript.
webViewHelper.initializeAndLoad(m_baseURL + fileName, true);
@@ -519,7 +528,7 @@ public:
TEST_P(ParameterizedWebFrameTest, DidClearWindowObjectIsNotRecursive)
{
EvaluateOnLoadWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank", true, &webFrameClient);
EXPECT_TRUE(webFrameClient.m_wasExecuted);
}
@@ -796,7 +805,7 @@ TEST_P(ParameterizedWebFrameTest, DispatchMessageEventWithOriginCheck)
registerMockedHttpURLLoad("postmessage_test.html");
// Pass true to enable JavaScript.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "postmessage_test.html", true);
// Send a message with the correct origin.
@@ -818,7 +827,7 @@ TEST_P(ParameterizedWebFrameTest, DispatchMessageEventWithOriginCheck)
TEST_P(ParameterizedWebFrameTest, PostMessageThenDetach)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank");
LocalFrame* frame = toLocalFrame(webViewHelper.webView()->page()->mainFrame());
@@ -891,7 +900,7 @@ TEST_P(ParameterizedWebFrameTest, ChangeInFixedLayoutResetsTextAutosizingMultipl
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
Document* document = toLocalFrame(webViewHelper.webView()->page()->mainFrame())->document();
@@ -917,7 +926,7 @@ TEST_P(ParameterizedWebFrameTest, WorkingTextAutosizingMultipliers_VirtualViewpo
FixedLayoutTestWebViewClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, nullptr, &client, nullptr, configureAndroid);
Document* document = toLocalFrame(webViewHelper.webView()->page()->mainFrame())->document();
@@ -939,7 +948,7 @@ TEST_P(ParameterizedWebFrameTest, VisualViewportSetSizeInvalidatesTextAutosizing
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "iframe_reload.html", true, nullptr, &client, nullptr, enableViewportSettings);
LocalFrame* mainFrame = toLocalFrame(webViewHelper.webView()->page()->mainFrame());
@@ -978,7 +987,7 @@ TEST_P(ParameterizedWebFrameTest, ZeroHeightPositiveWidthNotIgnored)
int viewportWidth = 1280;
int viewportHeight = 0;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -996,7 +1005,7 @@ TEST_P(ParameterizedWebFrameTest, DeviceScaleFactorUsesDefaultWithoutViewportTag
FixedLayoutTestWebViewClient client;
client.m_screenInfo.deviceScaleFactor = 2;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1024,7 +1033,7 @@ TEST_P(ParameterizedWebFrameTest, FixedLayoutInitializeAtMinimumScale)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "fixed_layout.html");
@@ -1061,7 +1070,7 @@ TEST_P(ParameterizedWebFrameTest, WideDocumentInitializeAtMinimumScale)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "wide_document.html");
@@ -1096,7 +1105,7 @@ TEST_P(ParameterizedWebFrameTest, DelayedViewportInitialScale)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1119,7 +1128,7 @@ TEST_P(ParameterizedWebFrameTest, setLoadWithOverviewModeToFalse)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
@@ -1138,7 +1147,7 @@ TEST_P(ParameterizedWebFrameTest, SetLoadWithOverviewModeToFalseAndNoWideViewpor
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1158,7 +1167,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportIgnoresPageViewportWidth)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
@@ -1178,7 +1187,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportIgnoresPageViewportWidthButAccou
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
@@ -1199,7 +1208,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithoutViewportTag)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, nullptr, &client, nullptr, enableViewportSettings);
applyViewportStyleOverride(&webViewHelper);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1219,7 +1228,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithXhtmlMp)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
applyViewportStyleOverride(&webViewHelper);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1240,7 +1249,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportAndHeightInMeta)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-height-1000.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
@@ -1258,7 +1267,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithAutoWidth)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-2x-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
applyViewportStyleOverride(&webViewHelper);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1278,7 +1287,7 @@ TEST_P(ParameterizedWebFrameTest, PageViewportInitialScaleOverridesLoadWithOverv
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1295,7 +1304,7 @@ TEST_P(ParameterizedWebFrameTest, setInitialPageScaleFactorPermanently)
client.m_screenInfo.deviceScaleFactor = 1;
float enforcedPageScaleFactor = 2.0f;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
applyViewportStyleOverride(&webViewHelper);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1326,7 +1335,7 @@ TEST_P(ParameterizedWebFrameTest, PermanentInitialPageScaleFactorOverridesLoadWi
int viewportHeight = 480;
float enforcedPageScaleFactor = 0.5f;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScaleFactor);
@@ -1345,7 +1354,7 @@ TEST_P(ParameterizedWebFrameTest, PermanentInitialPageScaleFactorOverridesPageVi
int viewportHeight = 480;
float enforcedPageScaleFactor = 0.5f;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScaleFactor);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1375,7 +1384,7 @@ TEST_P(ParameterizedWebFrameTest, SmallPermanentInitialPageScaleFactorIsClobbere
for (size_t i = 0; i < WTF_ARRAY_LENGTH(pages); ++i) {
for (int quirkEnabled = 0; quirkEnabled <= 1; ++quirkEnabled) {
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + pages[i], true, nullptr, &client, nullptr, enableViewportSettings);
applyViewportStyleOverride(&webViewHelper);
webViewHelper.webView()->settings()->setClobberUserAgentInitialScaleQuirk(quirkEnabled);
@@ -1396,7 +1405,7 @@ TEST_P(ParameterizedWebFrameTest, PermanentInitialPageScaleFactorAffectsLayoutWi
int viewportHeight = 480;
float enforcedPageScaleFactor = 0.5;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
@@ -1417,7 +1426,7 @@ TEST_P(ParameterizedWebFrameTest, DocumentElementClientHeightWorksWithWrapConten
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "0-by-0.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.webView()->settings()->setForceZeroLayoutHeight(true);
@@ -1438,7 +1447,7 @@ TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeightWorksWithWrapContentMo
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "0-by-0.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.webView()->settings()->setForceZeroLayoutHeight(true);
@@ -1480,7 +1489,7 @@ TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeight)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1643,7 +1652,7 @@ TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeightWorksAcrossNavigations
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setForceZeroLayoutHeight(true);
@@ -1664,7 +1673,7 @@ TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeightWithWideViewportQuirk)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1685,7 +1694,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportAndWideContentWithInitialScale)
int viewportWidth = 600;
int viewportHeight = 800;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
@@ -1710,7 +1719,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportQuirkClobbersHeight)
int viewportWidth = 600;
int viewportHeight = 800;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
@@ -1733,7 +1742,7 @@ TEST_P(ParameterizedWebFrameTest, LayoutSize320Quirk)
int viewportWidth = 600;
int viewportHeight = 800;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
@@ -1784,7 +1793,7 @@ TEST_P(ParameterizedWebFrameTest, ZeroValuesQuirk)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setViewportMetaZeroValuesQuirk(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1810,7 +1819,7 @@ TEST_P(ParameterizedWebFrameTest, OverflowHiddenDisablesScrolling)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, nullptr, &client, nullptr);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "body-overflow-hidden.html");
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1829,7 +1838,7 @@ TEST_P(ParameterizedWebFrameTest, OverflowHiddenDisablesScrollingWithSetCanHaveS
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, nullptr, &client, nullptr);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "body-overflow-hidden-short.html");
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1872,7 +1881,7 @@ TEST_P(ParameterizedWebFrameTest, NonZeroValuesNoQuirk)
int viewportHeight = 480;
float expectedPageScaleFactor = 0.5f;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setViewportMetaZeroValuesQuirk(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -1898,7 +1907,7 @@ TEST_P(ParameterizedWebFrameTest, setPageScaleFactorDoesNotLayout)
int viewportWidth = 64;
int viewportHeight = 48;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1917,7 +1926,7 @@ TEST_P(ParameterizedWebFrameTest, setPageScaleFactorWithOverlayScrollbarsDoesNot
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1937,7 +1946,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorWrittenToHistoryItem)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1954,7 +1963,7 @@ TEST_P(ParameterizedWebFrameTest, initialScaleWrittenToHistoryItem)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "fixed_layout.html");
@@ -1975,7 +1984,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorDoesntShrinkFrameView)
int viewportWidth = 64;
int viewportHeight = 48;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -2013,7 +2022,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorDoesNotApplyCssTransform)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -2039,7 +2048,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiHigh)
float deviceDpi = deviceScaleFactor * 160.0f;
client.m_screenInfo.deviceScaleFactor = deviceScaleFactor;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-high.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
@@ -2067,7 +2076,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiDevice)
for (size_t i = 0; i < WTF_ARRAY_LENGTH(deviceScaleFactors); ++i) {
client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i];
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-device.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
@@ -2092,7 +2101,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiDeviceAndFixedWidth)
for (size_t i = 0; i < WTF_ARRAY_LENGTH(deviceScaleFactors); ++i) {
client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i];
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-device-and-fixed-width.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
@@ -2114,7 +2123,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportAndScaleLessThanOne)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-less-than-1.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -2135,7 +2144,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportAndScaleLessThanOneWithDeviceWid
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-less-than-1-device-width.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -2157,7 +2166,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportAndNoViewportWithInitialPageScal
int viewportHeight = 480;
float enforcedPageScaleFactor = 5.0f;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -2178,7 +2187,7 @@ TEST_P(ParameterizedWebFrameTest, NoUserScalableQuirkIgnoresViewportScale)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-and-user-scalable-no.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setViewportMetaNonUserScalableQuirk(true);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -2197,7 +2206,7 @@ TEST_P(ParameterizedWebFrameTest, NoUserScalableQuirkIgnoresViewportScaleForNonW
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-and-user-scalable-no.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
webViewHelper.webView()->settings()->setViewportMetaNonUserScalableQuirk(true);
@@ -2218,7 +2227,7 @@ TEST_P(ParameterizedWebFrameTest, NoUserScalableQuirkIgnoresViewportScaleForWide
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "viewport-2x-initial-scale-non-user-scalable.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setViewportMetaNonUserScalableQuirk(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -2238,7 +2247,7 @@ TEST_P(ParameterizedWebFrameTest, DesktopPageCanBeZoomedInWhenWideViewportIsTurn
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -2269,7 +2278,7 @@ protected:
const float aspectRatio = static_cast<float>(viewportSize.width) / viewportSize.height;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + url, true, nullptr, nullptr, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
@@ -2302,9 +2311,7 @@ protected:
}
};
-INSTANTIATE_TEST_CASE_P(All, WebFrameResizeTest, ::testing::Values(
- FrameTestHelpers::DefaultSettingOverride,
- FrameTestHelpers::RootLayerScrollsSettingOverride));
+INSTANTIATE_TEST_CASE_P(All, WebFrameResizeTest, ::testing::Bool());
TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForWidthEqualsDeviceWidth)
{
@@ -2371,7 +2378,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorUpdatesScrollbars)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -2394,7 +2401,7 @@ TEST_P(ParameterizedWebFrameTest, CanOverrideScaleLimits)
int viewportWidth = 640;
int viewportHeight = 480;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "no_scale_for_you.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -2479,7 +2486,7 @@ TEST_P(ParameterizedWebFrameTest, DivAutoZoomParamsTest)
int viewportWidth = 640 / deviceScaleFactor;
int viewportHeight = 1280 / deviceScaleFactor;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "get_scale_for_auto_zoom_into_div_test.html", false, nullptr, nullptr, nullptr, configureAndroid);
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
webViewHelper.webView()->setDefaultPageScaleLimits(0.01f, 4);
@@ -2531,7 +2538,7 @@ TEST_P(ParameterizedWebFrameTest, DivAutoZoomWideDivTest)
int viewportWidth = 640 / deviceScaleFactor;
int viewportHeight = 1280 / deviceScaleFactor;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "get_wide_div_for_auto_zoom_test.html", false, nullptr, nullptr, nullptr, configureAndroid);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
@@ -2563,7 +2570,7 @@ TEST_P(ParameterizedWebFrameTest, DivAutoZoomVeryTallTest)
const float deviceScaleFactor = 2.0f;
int viewportWidth = 640 / deviceScaleFactor;
int viewportHeight = 1280 / deviceScaleFactor;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "very_tall_div.html", true, nullptr, nullptr, nullptr, configureAndroid);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
@@ -2855,7 +2862,7 @@ TEST_P(ParameterizedWebFrameTest, BlockBoundTest)
{
registerMockedHttpURLLoad("block_bound.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "block_bound.html", false, nullptr, nullptr, nullptr, configureAndroid);
IntRect rectBack = IntRect(0, 0, 200, 200);
@@ -2893,7 +2900,7 @@ TEST_P(ParameterizedWebFrameTest, DivMultipleTargetZoomMultipleDivsTest)
int viewportWidth = 640 / deviceScaleFactor;
int viewportHeight = 1280 / deviceScaleFactor;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html");
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setDefaultPageScaleLimits(0.5f, 4);
@@ -3165,7 +3172,7 @@ TEST_P(ParameterizedWebFrameTest, CharacterIndexAtPointWithPinchZoom)
{
registerMockedHttpURLLoad("sometext.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "sometext.html");
webViewHelper.resize(WebSize(640, 480));
@@ -3185,7 +3192,7 @@ TEST_P(ParameterizedWebFrameTest, FirstRectForCharacterRangeWithPinchZoom)
{
registerMockedHttpURLLoad("textbox.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "textbox.html", true);
webViewHelper.resize(WebSize(640, 480));
@@ -3227,7 +3234,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadDoesntSetRedirect)
registerMockedHttpURLLoad("form.html");
TestReloadDoesntRedirectWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "form.html", false, &webFrameClient);
webViewHelper.webView()->mainFrame()->reload(WebFrameLoadType::ReloadBypassingCache);
@@ -3294,7 +3301,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadWhileProvisional)
// request to get lost.
registerMockedHttpURLLoad("fixed_layout.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize();
WebURLRequest request;
request.setURL(toKURL(m_baseURL + "fixed_layout.html"));
@@ -3313,7 +3320,7 @@ TEST_P(ParameterizedWebFrameTest, AppendRedirects)
const std::string firstURL = "about:blank";
const std::string secondURL = "http://internal.test";
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(firstURL, true);
WebDataSource* dataSource = webViewHelper.webView()->mainFrame()->dataSource();
@@ -3332,7 +3339,7 @@ TEST_P(ParameterizedWebFrameTest, IframeRedirect)
registerMockedHttpURLLoad("iframe_redirect.html");
registerMockedHttpURLLoad("visible_iframe.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "iframe_redirect.html", true);
// Pump pending requests one more time. The test page loads script that navigates.
FrameTestHelpers::pumpPendingRequestsForFrameToLoad(webViewHelper.webView()->mainFrame());
@@ -3353,7 +3360,7 @@ TEST_P(ParameterizedWebFrameTest, ClearFocusedNodeTest)
registerMockedHttpURLLoad("iframe_clear_focused_node_test.html");
registerMockedHttpURLLoad("autofocus_input_field_iframe.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "iframe_clear_focused_node_test.html", true);
// Clear the focused node.
@@ -3426,7 +3433,7 @@ TEST_P(ParameterizedWebFrameTest, ContextNotificationsLoadUnload)
// Load a frame with an iframe, make sure we get the right create notifications.
ContextLifetimeTestWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
WebFrame* mainFrame = webViewHelper.webView()->mainFrame();
@@ -3465,7 +3472,7 @@ TEST_P(ParameterizedWebFrameTest, ContextNotificationsReload)
registerMockedHttpURLLoad("context_notifications_test_frame.html");
ContextLifetimeTestWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
// Refresh, we should get two release notifications and two more create notifications.
@@ -3503,7 +3510,7 @@ TEST_P(ParameterizedWebFrameTest, ContextNotificationsIsolatedWorlds)
registerMockedHttpURLLoad("context_notifications_test_frame.html");
ContextLifetimeTestWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "context_notifications_test.html", true, &webFrameClient);
// Add an isolated world.
@@ -3541,7 +3548,7 @@ TEST_P(ParameterizedWebFrameTest, ContextNotificationsIsolatedWorlds)
TEST_P(ParameterizedWebFrameTest, FindInPage)
{
registerMockedHttpURLLoad("find.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "find.html");
ASSERT_TRUE(webViewHelper.webView()->mainFrameImpl());
WebLocalFrame* frame = webViewHelper.webView()->mainFrameImpl();
@@ -3598,7 +3605,7 @@ TEST_P(ParameterizedWebFrameTest, FindInPage)
TEST_P(ParameterizedWebFrameTest, GetContentAsPlainText)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank", true);
// We set the size because it impacts line wrapping, which changes the
// resulting text value.
@@ -3640,7 +3647,7 @@ TEST_P(ParameterizedWebFrameTest, GetContentAsPlainText)
TEST_P(ParameterizedWebFrameTest, GetFullHtmlOfPage)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank", true);
WebLocalFrame* frame = webViewHelper.webView()->mainFrameImpl();
@@ -3685,7 +3692,7 @@ TEST_P(ParameterizedWebFrameTest, ExecuteScriptDuringDidCreateScriptContext)
registerMockedHttpURLLoad("hello_world.html");
TestExecuteScriptDuringDidCreateScriptContext webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "hello_world.html", true, &webFrameClient);
FrameTestHelpers::reloadFrame(webViewHelper.webView()->mainFrame());
@@ -3727,7 +3734,7 @@ TEST_P(ParameterizedWebFrameTest, FindInPageMatchRects)
registerMockedHttpURLLoad("find_in_page_frame.html");
FindUpdateWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "find_in_page_frame.html", true, &client);
webViewHelper.resize(WebSize(640, 480));
webViewHelper.webView()->setMaximumLegibleScale(1.f);
@@ -3840,7 +3847,7 @@ TEST_P(ParameterizedWebFrameTest, FindOnDetachedFrame)
registerMockedHttpURLLoad("find_in_page_frame.html");
FindUpdateWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "find_in_page.html", true, &client);
webViewHelper.resize(WebSize(640, 480));
runPendingTasks();
@@ -3877,7 +3884,7 @@ TEST_P(ParameterizedWebFrameTest, FindDetachFrameBeforeScopeStrings)
registerMockedHttpURLLoad("find_in_page_frame.html");
FindUpdateWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "find_in_page.html", true, &client);
webViewHelper.resize(WebSize(640, 480));
runPendingTasks();
@@ -3913,7 +3920,7 @@ TEST_P(ParameterizedWebFrameTest, FindDetachFrameWhileScopingStrings)
registerMockedHttpURLLoad("find_in_page_frame.html");
FindUpdateWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "find_in_page.html", true, &client);
webViewHelper.resize(WebSize(640, 480));
runPendingTasks();
@@ -3948,7 +3955,7 @@ TEST_P(ParameterizedWebFrameTest, ResetMatchCount)
registerMockedHttpURLLoad("find_in_generated_frame.html");
FindUpdateWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "find_in_generated_frame.html", true, &client);
webViewHelper.resize(WebSize(640, 480));
runPendingTasks();
@@ -3977,7 +3984,7 @@ TEST_P(ParameterizedWebFrameTest, SetTickmarks)
registerMockedHttpURLLoad("find.html");
FindUpdateWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "find.html", true, &client);
webViewHelper.resize(WebSize(640, 480));
runPendingTasks();
@@ -4030,7 +4037,7 @@ TEST_P(ParameterizedWebFrameTest, FindInPageJavaScriptUpdatesDOM)
registerMockedHttpURLLoad("find.html");
FindUpdateWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "find.html", true, &client);
webViewHelper.resize(WebSize(640, 480));
runPendingTasks();
@@ -4105,7 +4112,7 @@ TEST_P(ParameterizedWebFrameTest, SelectRange)
registerMockedHttpURLLoad("select_range_basic.html");
registerMockedHttpURLLoad("select_range_scroll.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "select_range_basic.html", &webViewHelper);
frame = webViewHelper.webView()->mainFrameImpl();
EXPECT_EQ("Some test text for testing.", selectionAsString(frame));
@@ -4140,7 +4147,7 @@ TEST_P(ParameterizedWebFrameTest, SelectRangeInIframe)
registerMockedHttpURLLoad("select_range_iframe.html");
registerMockedHttpURLLoad("select_range_basic.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "select_range_iframe.html", &webViewHelper);
frame = webViewHelper.webView()->mainFrame();
WebLocalFrame* subframe = frame->firstChild()->toWebLocalFrame();
@@ -4165,7 +4172,7 @@ TEST_P(ParameterizedWebFrameTest, 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.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "select_range_div_editable.html", &webViewHelper);
frame = webViewHelper.webView()->mainFrameImpl();
EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
@@ -4200,7 +4207,7 @@ TEST_P(ParameterizedWebFrameTest, 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.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "select_range_span_editable.html", &webViewHelper);
frame = webViewHelper.webView()->mainFrameImpl();
EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
@@ -4227,7 +4234,7 @@ TEST_P(ParameterizedWebFrameTest, DISABLED_SelectRangeSpanContentEditable)
TEST_P(ParameterizedWebFrameTest, SelectRangeCanMoveSelectionStart)
{
registerMockedHttpURLLoad("text_selection.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "text_selection.html", &webViewHelper);
WebLocalFrame* frame = webViewHelper.webView()->mainFrameImpl();
@@ -4275,7 +4282,7 @@ TEST_P(ParameterizedWebFrameTest, SelectRangeCanMoveSelectionStart)
TEST_P(ParameterizedWebFrameTest, SelectRangeCanMoveSelectionEnd)
{
registerMockedHttpURLLoad("text_selection.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "text_selection.html", &webViewHelper);
WebLocalFrame* frame = webViewHelper.webView()->mainFrameImpl();
@@ -4328,7 +4335,7 @@ TEST_P(ParameterizedWebFrameTest, MoveRangeSelectionExtent)
registerMockedHttpURLLoad("move_range_selection_extent.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "move_range_selection_extent.html", &webViewHelper);
frame = webViewHelper.webView()->mainFrameImpl();
EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
@@ -4362,7 +4369,7 @@ TEST_P(ParameterizedWebFrameTest, MoveRangeSelectionExtentCannotCollapse)
registerMockedHttpURLLoad("move_range_selection_extent.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "move_range_selection_extent.html", &webViewHelper);
frame = webViewHelper.webView()->mainFrameImpl();
EXPECT_EQ("This text is initially selected.", selectionAsString(frame));
@@ -4387,7 +4394,7 @@ TEST_P(ParameterizedWebFrameTest, MoveRangeSelectionExtentScollsInputField)
registerMockedHttpURLLoad("move_range_selection_extent_input_field.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "move_range_selection_extent_input_field.html", &webViewHelper);
frame = webViewHelper.webView()->mainFrameImpl();
EXPECT_EQ("Length", selectionAsString(frame));
@@ -4409,7 +4416,7 @@ static int computeOffset(LayoutObject* layoutObject, int x, int y)
TEST_P(ParameterizedWebFrameTest, DISABLED_PositionForPointTest)
{
registerMockedHttpURLLoad("select_range_span_editable.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "select_range_span_editable.html", &webViewHelper);
WebLocalFrameImpl* mainFrame = webViewHelper.webView()->mainFrameImpl();
LayoutObject* layoutObject = mainFrame->frame()->selection().rootEditableElement()->layoutObject();
@@ -4429,7 +4436,7 @@ TEST_P(ParameterizedWebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved)
{
registerMockedHttpURLLoad("move_caret.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "move_caret.html", &webViewHelper);
WebLocalFrameImpl* frame = webViewHelper.webView()->mainFrameImpl();
@@ -4474,7 +4481,7 @@ TEST_P(ParameterizedWebFrameTest, MoveCaretStaysHorizontallyAlignedWhenMoved)
WebLocalFrameImpl* frame;
registerMockedHttpURLLoad("move_caret.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
initializeTextSelectionWebView(m_baseURL + "move_caret.html", &webViewHelper);
frame = (WebLocalFrameImpl*)webViewHelper.webView()->mainFrame();
@@ -4670,7 +4677,7 @@ TEST_P(ParameterizedWebFrameTest, CompositedSelectionBoundsCleared)
CompositedSelectionBoundsTestWebViewClient fakeSelectionWebViewClient;
CompositedSelectionBoundsTestLayerTreeView& fakeSelectionLayerTreeView = fakeSelectionWebViewClient.selectionLayerTreeView();
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, nullptr, &fakeSelectionWebViewClient, nullptr);
webViewHelper.webView()->settings()->setDefaultFontSize(12);
webViewHelper.webView()->setDefaultPageScaleLimits(1, 1);
@@ -4752,7 +4759,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopup)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client);
webViewHelper.resize(WebSize(1000, 1000));
@@ -4805,7 +4812,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupNoContainer)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "disambiguation_popup_no_container.html", true, 0, &client);
webViewHelper.resize(WebSize(1000, 1000));
@@ -4823,7 +4830,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupMobileSite)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(1000, 1000));
@@ -4857,7 +4864,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupViewportSite)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(1000, 1000));
@@ -4944,7 +4951,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupBlacklist)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -4972,7 +4979,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupPageScale)
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "disambiguation_popup_page_scale.html", true, 0, &client);
webViewHelper.resize(WebSize(1000, 1000));
@@ -5024,7 +5031,7 @@ TEST_P(ParameterizedWebFrameTest, ReplaceNavigationAfterHistoryNavigation)
{
TestSubstituteDataWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank", true, &webFrameClient);
WebFrame* frame = webViewHelper.webView()->mainFrame();
@@ -5081,7 +5088,7 @@ TEST_P(ParameterizedWebFrameTest, HTMLDocument)
registerMockedHttpURLLoad("clipped-body.html");
TestWillInsertBodyWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "clipped-body.html", false, &webFrameClient);
EXPECT_TRUE(webFrameClient.m_didLoad);
@@ -5093,7 +5100,7 @@ TEST_P(ParameterizedWebFrameTest, EmptyDocument)
registerMockedHttpURLLoad("frameserializer/svg/green_rectangle.svg");
TestWillInsertBodyWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(false, &webFrameClient);
EXPECT_FALSE(webFrameClient.m_didLoad);
@@ -5102,7 +5109,7 @@ TEST_P(ParameterizedWebFrameTest, EmptyDocument)
TEST_P(ParameterizedWebFrameTest, MoveCaretSelectionTowardsWindowPointWithNoSelection)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank", true);
WebFrame* frame = webViewHelper.webView()->mainFrame();
@@ -5132,7 +5139,7 @@ private:
TEST_P(ParameterizedWebFrameTest, ReplaceMisspelledRange)
{
registerMockedHttpURLLoad("spell.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
SpellCheckClient spellcheck;
webViewHelper.webView()->setSpellCheckClient(&spellcheck);
@@ -5163,7 +5170,7 @@ TEST_P(ParameterizedWebFrameTest, ReplaceMisspelledRange)
TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkers)
{
registerMockedHttpURLLoad("spell.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
SpellCheckClient spellcheck;
webViewHelper.webView()->setSpellCheckClient(&spellcheck);
@@ -5192,7 +5199,7 @@ TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkers)
TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkersUnderWords)
{
registerMockedHttpURLLoad("spell.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
SpellCheckClient spellcheck;
webViewHelper.webView()->setSpellCheckClient(&spellcheck);
@@ -5224,7 +5231,7 @@ TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkersUnderWords)
TEST_P(ParameterizedWebFrameTest, MarkerHashIdentifiers)
{
registerMockedHttpURLLoad("spell.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
static const uint32_t kHash = 42;
@@ -5308,7 +5315,7 @@ private:
TEST_P(ParameterizedWebFrameTest, SlowSpellcheckMarkerPosition)
{
registerMockedHttpURLLoad("spell.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
StubbornSpellCheckClient spellcheck;
@@ -5339,7 +5346,7 @@ TEST_P(ParameterizedWebFrameTest, SlowSpellcheckMarkerPosition)
TEST_P(ParameterizedWebFrameTest, CancelSpellingRequestCrash)
{
registerMockedHttpURLLoad("spell.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
webViewHelper.webView()->setSpellCheckClient(0);
@@ -5357,7 +5364,7 @@ TEST_P(ParameterizedWebFrameTest, CancelSpellingRequestCrash)
TEST_P(ParameterizedWebFrameTest, SpellcheckResultErasesMarkers)
{
registerMockedHttpURLLoad("spell.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
StubbornSpellCheckClient spellcheck;
@@ -5389,7 +5396,7 @@ TEST_P(ParameterizedWebFrameTest, SpellcheckResultErasesMarkers)
TEST_P(ParameterizedWebFrameTest, SpellcheckResultsSavedInDocument)
{
registerMockedHttpURLLoad("spell.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "spell.html");
StubbornSpellCheckClient spellcheck;
@@ -5450,13 +5457,13 @@ TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentBody)
// WebViewHelper destructor.
FrameTestHelpers::TestWebViewClient webViewClient;
TestAccessInitialDocumentWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, &webFrameClient, &webViewClient);
runPendingTasks();
EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
// Create another window that will try to access it.
- FrameTestHelpers::WebViewHelper newWebViewHelper(this);
+ FrameTestHelpers::WebViewHelper newWebViewHelper;
WebView* newView = newWebViewHelper.initializeWithOpener(webViewHelper.webView()->mainFrame(), true);
runPendingTasks();
EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
@@ -5481,13 +5488,13 @@ TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentNavigator)
// WebViewHelper destructor.
FrameTestHelpers::TestWebViewClient webViewClient;
TestAccessInitialDocumentWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, &webFrameClient, &webViewClient);
runPendingTasks();
EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
// Create another window that will try to access it.
- FrameTestHelpers::WebViewHelper newWebViewHelper(this);
+ FrameTestHelpers::WebViewHelper newWebViewHelper;
WebView* newView = newWebViewHelper.initializeWithOpener(webViewHelper.webView()->mainFrame(), true);
runPendingTasks();
EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
@@ -5502,7 +5509,7 @@ TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentNavigator)
TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentViaJavascriptUrl)
{
TestAccessInitialDocumentWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, &webFrameClient);
runPendingTasks();
EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
@@ -5524,13 +5531,13 @@ TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentBodyBeforeModalDialog)
// WebViewHelper destructor.
FrameTestHelpers::TestWebViewClient webViewClient;
TestAccessInitialDocumentWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, &webFrameClient, &webViewClient);
runPendingTasks();
EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
// Create another window that will try to access it.
- FrameTestHelpers::WebViewHelper newWebViewHelper(this);
+ FrameTestHelpers::WebViewHelper newWebViewHelper;
WebView* newView = newWebViewHelper.initializeWithOpener(webViewHelper.webView()->mainFrame(), true);
runPendingTasks();
EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
@@ -5563,13 +5570,13 @@ TEST_P(ParameterizedWebFrameTest, DidWriteToInitialDocumentBeforeModalDialog)
// WebViewHelper destructor.
FrameTestHelpers::TestWebViewClient webViewClient;
TestAccessInitialDocumentWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize(true, &webFrameClient, &webViewClient);
runPendingTasks();
EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
// Create another window that will try to access it.
- FrameTestHelpers::WebViewHelper newWebViewHelper(this);
+ FrameTestHelpers::WebViewHelper newWebViewHelper;
WebView* newView = newWebViewHelper.initializeWithOpener(webViewHelper.webView()->mainFrame(), true);
runPendingTasks();
EXPECT_FALSE(webFrameClient.m_didAccessInitialDocument);
@@ -5617,7 +5624,7 @@ private:
bool m_didScrollFrame;
};
-TEST_P(ParameterizedWebFrameTest, CompositorScrollIsUserScrollLongPage)
+TEST_F(WebFrameTest, CompositorScrollIsUserScrollLongPage)
{
registerMockedHttpURLLoad("long_scroll.html");
TestScrolledFrameClient client;
@@ -5702,7 +5709,7 @@ TEST_P(ParameterizedWebFrameTest, FirstPartyForCookiesForRedirect)
finalResponse.setMIMEType("text/html");
Platform::current()->getURLLoaderMockFactory()->registerURL(redirectURL, finalResponse, filePath);
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "first_party_redirect.html", true);
EXPECT_TRUE(webViewHelper.webView()->mainFrame()->document().firstPartyForCookies() == redirectURL);
}
@@ -5720,7 +5727,7 @@ TEST_P(ParameterizedWebFrameTest, SimulateFragmentAnchorMiddleClick)
{
registerMockedHttpURLLoad("fragment_middle_click.html");
TestNavigationPolicyWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html", true, &client);
Document* document = toLocalFrame(webViewHelper.webView()->page()->mainFrame())->document();
@@ -5770,7 +5777,7 @@ TEST_P(ParameterizedWebFrameTest, ModifiedClickNewWindow)
registerMockedHttpURLLoad("hello_world.html");
TestNewWindowWebViewClient webViewClient;
TestNewWindowWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "ctrl_click.html", true, &webFrameClient, &webViewClient);
Document* document = toLocalFrame(webViewHelper.webView()->page()->mainFrame())->document();
@@ -5793,7 +5800,7 @@ TEST_P(ParameterizedWebFrameTest, ModifiedClickNewWindow)
TEST_P(ParameterizedWebFrameTest, BackToReload)
{
registerMockedHttpURLLoad("fragment_middle_click.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html", true);
WebFrame* frame = webViewHelper.webView()->mainFrame();
const FrameLoader& mainFrameLoader = webViewHelper.webView()->mainFrameImpl()->frame()->loader();
@@ -5814,7 +5821,7 @@ TEST_P(ParameterizedWebFrameTest, BackToReload)
TEST_P(ParameterizedWebFrameTest, BackDuringChildFrameReload)
{
registerMockedHttpURLLoad("page_with_blank_iframe.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "page_with_blank_iframe.html", true);
WebLocalFrame* mainFrame = webViewHelper.webView()->mainFrameImpl();
const FrameLoader& mainFrameLoader = webViewHelper.webView()->mainFrameImpl()->frame()->loader();
@@ -5841,7 +5848,7 @@ TEST_P(ParameterizedWebFrameTest, BackDuringChildFrameReload)
TEST_P(ParameterizedWebFrameTest, ReloadPost)
{
registerMockedHttpURLLoad("reload_post.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "reload_post.html", true);
WebFrame* frame = webViewHelper.webView()->mainFrame();
@@ -5859,7 +5866,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadPost)
TEST_P(ParameterizedWebFrameTest, LoadHistoryItemReload)
{
registerMockedHttpURLLoad("fragment_middle_click.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html", true);
WebFrame* frame = webViewHelper.webView()->mainFrame();
const FrameLoader& mainFrameLoader = webViewHelper.webView()->mainFrameImpl()->frame()->loader();
@@ -5943,7 +5950,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadIframe)
TestCachePolicyWebFrameClient childClient(&mainClient);
mainClient.setChildWebFrameClient(&childClient);
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "iframe_reload.html", true, &mainClient);
WebLocalFrameImpl* mainFrame = webViewHelper.webView()->mainFrameImpl();
@@ -5987,7 +5994,7 @@ TEST_P(ParameterizedWebFrameTest, NavigateToSame)
{
registerMockedHttpURLLoad("navigate_to_same.html");
TestSameDocumentWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "navigate_to_same.html", true, &client);
EXPECT_FALSE(client.frameLoadTypeReloadMainResourceSeen());
@@ -6024,7 +6031,7 @@ TEST_P(ParameterizedWebFrameTest, NavigateToSameNoConditionalRequestForSubresour
registerMockedHttpURLLoad("foo_with_image.html");
registerMockedHttpURLLoad("white-1x1.png");
TestSameDocumentWithImageWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "foo_with_image.html", true, &client, nullptr, nullptr, &configureLoadsImagesAutomatically);
WebCache::clear();
@@ -6037,7 +6044,7 @@ TEST_P(ParameterizedWebFrameTest, NavigateToSameNoConditionalRequestForSubresour
TEST_P(ParameterizedWebFrameTest, WebNodeImageContents)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank", true);
WebFrame* frame = webViewHelper.webView()->mainFrame();
@@ -6098,7 +6105,7 @@ TEST_P(ParameterizedWebFrameTest, PushStateStartsAndStops)
{
registerMockedHttpURLLoad("push_state.html");
TestStartStopCallbackWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "push_state.html", true, &client);
EXPECT_EQ(client.startLoadingCount(), 2);
@@ -6128,7 +6135,7 @@ TEST_P(ParameterizedWebFrameTest, SameDocumentHistoryNavigationCommitType)
{
registerMockedHttpURLLoad("push_state.html");
TestDidNavigateCommitTypeWebFrameClient client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "push_state.html", true, &client);
Persistent<HistoryItem> item = toLocalFrame(webViewImpl->page()->mainFrame())->loader().currentItem();
runPendingTasks();
@@ -6167,7 +6174,7 @@ TEST_P(ParameterizedWebFrameTest, FirstBlankSubframeNavigation)
registerMockedHttpURLLoad("history.html");
registerMockedHttpURLLoad("find.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
TestHistoryWebFrameClient client;
webViewHelper.initializeAndLoad("about:blank", true, &client);
@@ -6200,7 +6207,7 @@ TEST_P(ParameterizedWebFrameTest, FirstNonBlankSubframeNavigation)
registerMockedHttpURLLoad("history.html");
registerMockedHttpURLLoad("find.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
TestHistoryWebFrameClient client;
webViewHelper.initializeAndLoad("about:blank", true, &client);
@@ -6257,7 +6264,7 @@ TEST_P(ParameterizedWebFrameTest, CurrentHistoryItem)
registerMockedHttpURLLoad("fixed_layout.html");
std::string url = m_baseURL + "fixed_layout.html";
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initialize();
WebFrame* frame = webViewHelper.webView()->mainFrame();
const FrameLoader& mainFrameLoader = webViewHelper.webView()->mainFrameImpl()->frame()->loader();
@@ -6298,7 +6305,7 @@ TEST_P(ParameterizedWebFrameTest, CreateChildFrameFailure)
{
registerMockedHttpURLLoad("create_child_frame_fail.html");
FailCreateChildFrame client;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "create_child_frame_fail.html", true, &client);
EXPECT_EQ(1, client.callCount());
@@ -6307,7 +6314,7 @@ TEST_P(ParameterizedWebFrameTest, CreateChildFrameFailure)
TEST_P(ParameterizedWebFrameTest, fixedPositionInFixedViewport)
{
registerMockedHttpURLLoad("fixed-position-in-fixed-viewport.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "fixed-position-in-fixed-viewport.html", true, nullptr, nullptr, nullptr, enableViewportSettings);
WebViewImpl* webView = webViewHelper.webView();
@@ -6332,7 +6339,7 @@ TEST_P(ParameterizedWebFrameTest, fixedPositionInFixedViewport)
TEST_P(ParameterizedWebFrameTest, FrameViewMoveWithSetFrameRect)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank");
webViewHelper.resize(WebSize(200, 200));
webViewHelper.webView()->updateAllLifecyclePhases();
@@ -6430,7 +6437,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenLayerSize)
{
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("fullscreen_div.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
int viewportWidth = 640;
int viewportHeight = 480;
client.m_screenInfo.rect.width = viewportWidth;
@@ -6503,7 +6510,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenMainFrame)
{
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("fullscreen_div.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
int viewportWidth = 640;
int viewportHeight = 480;
WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, nullptr, &client, nullptr, configureAndroid);
@@ -6535,7 +6542,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenSubframe)
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("fullscreen_iframe.html");
registerMockedHttpURLLoad("fullscreen_div.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_iframe.html", true, nullptr, &client, nullptr, configureAndroid);
int viewportWidth = 640;
int viewportHeight = 480;
@@ -6569,7 +6576,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenWithTinyViewport)
{
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("viewport-tiny.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "viewport-tiny.html", true, nullptr, &client, nullptr, configureAndroid);
int viewportWidth = 384;
int viewportHeight = 640;
@@ -6609,7 +6616,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenResizeWithTinyViewport)
{
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("viewport-tiny.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "viewport-tiny.html", true, nullptr, &client, nullptr, configureAndroid);
int viewportWidth = 384;
int viewportHeight = 640;
@@ -6663,7 +6670,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenRestoreScaleFactorUponExiting)
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("fullscreen_restore_scale_factor.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_restore_scale_factor.html", true, nullptr, &client, nullptr, &configureAndroid);
client.m_screenInfo.rect.width = screenSizeMinusStatusBarsMinusUrlBar.width;
client.m_screenInfo.rect.height = screenSizeMinusStatusBarsMinusUrlBar.height;
@@ -6715,7 +6722,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenRestoreScaleFactorUponExiting)
TEST_P(ParameterizedWebFrameTest, ClearFullscreenConstraintsOnNavigation)
{
registerMockedHttpURLLoad("viewport-tiny.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
int viewportWidth = 100;
int viewportHeight = 200;
@@ -6778,7 +6785,7 @@ TEST_P(ParameterizedWebFrameTest, ClearFullscreenConstraintsOnNavigation)
TEST_P(ParameterizedWebFrameTest, LayoutBlockPercentHeightDescendants)
{
registerMockedHttpURLLoad("percent-height-descendants.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "percent-height-descendants.html");
WebViewImpl* webView = webViewHelper.webView();
@@ -6807,7 +6814,7 @@ TEST_P(ParameterizedWebFrameTest, LayoutBlockPercentHeightDescendants)
TEST_P(ParameterizedWebFrameTest, HasVisibleContentOnVisibleFrames)
{
registerMockedHttpURLLoad("visible_frames.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "visible_frames.html");
for (WebFrame* frame = webViewImpl->mainFrameImpl()->traverseNext(false); frame; frame = frame->traverseNext(false)) {
EXPECT_TRUE(frame->hasVisibleContent());
@@ -6817,7 +6824,7 @@ TEST_P(ParameterizedWebFrameTest, HasVisibleContentOnVisibleFrames)
TEST_P(ParameterizedWebFrameTest, HasVisibleContentOnHiddenFrames)
{
registerMockedHttpURLLoad("hidden_frames.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "hidden_frames.html");
for (WebFrame* frame = webViewImpl->mainFrameImpl()->traverseNext(false); frame; frame = frame->traverseNext(false)) {
EXPECT_FALSE(frame->hasVisibleContent());
@@ -6843,7 +6850,7 @@ TEST_P(ParameterizedWebFrameTest, NotifyManifestChange)
registerMockedHttpURLLoad("link-manifest-change.html");
ManifestChangeWebFrameClient webFrameClient;
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "link-manifest-change.html", true, &webFrameClient);
EXPECT_EQ(14, webFrameClient.manifestChangeCount());
@@ -6862,7 +6869,7 @@ TEST_P(ParameterizedWebFrameTest, ManifestFetch)
registerMockedHttpURLLoad("foo.html");
registerMockedHttpURLLoad("link-manifest-fetch.json");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "foo.html");
Document* document = webViewHelper.webView()->mainFrameImpl()->frame()->document();
@@ -6876,7 +6883,7 @@ TEST_P(ParameterizedWebFrameTest, ManifestCSPFetchAllow)
URLTestHelpers::registerMockedURLLoad(toKURL(m_notBaseURL + "link-manifest-fetch.json"), "link-manifest-fetch.json");
registerMockedHttpURLLoadWithCSP("foo.html", "manifest-src *");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "foo.html");
Document* document = webViewHelper.webView()->mainFrameImpl()->frame()->document();
@@ -6890,7 +6897,7 @@ TEST_P(ParameterizedWebFrameTest, ManifestCSPFetchSelf)
URLTestHelpers::registerMockedURLLoad(toKURL(m_notBaseURL + "link-manifest-fetch.json"), "link-manifest-fetch.json");
registerMockedHttpURLLoadWithCSP("foo.html", "manifest-src 'self'");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "foo.html");
Document* document = webViewHelper.webView()->mainFrameImpl()->frame()->document();
@@ -6904,7 +6911,7 @@ TEST_P(ParameterizedWebFrameTest, ManifestCSPFetchSelfReportOnly)
URLTestHelpers::registerMockedURLLoad(toKURL(m_notBaseURL + "link-manifest-fetch.json"), "link-manifest-fetch.json");
registerMockedHttpURLLoadWithCSP("foo.html", "manifest-src 'self'", /* report only */ true);
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "foo.html");
Document* document = webViewHelper.webView()->mainFrameImpl()->frame()->document();
@@ -6918,7 +6925,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadBypassingCache)
// Check that a reload ignoring cache on a frame will result in the cache
// policy of the request being set to ReloadBypassingCache.
registerMockedHttpURLLoad("foo.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad(m_baseURL + "foo.html", true);
WebFrame* frame = webViewHelper.webView()->mainFrame();
FrameTestHelpers::reloadFrameIgnoringCache(frame);
@@ -6942,7 +6949,7 @@ static void nodeImageTestValidation(const IntSize& referenceBitmapSize, DragImag
TEST_P(ParameterizedWebFrameTest, NodeImageTestCSSTransformDescendant)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
std::unique_ptr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-css-3dtransform-descendant"));
EXPECT_TRUE(dragImage);
@@ -6951,7 +6958,7 @@ TEST_P(ParameterizedWebFrameTest, NodeImageTestCSSTransformDescendant)
TEST_P(ParameterizedWebFrameTest, NodeImageTestCSSTransform)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
std::unique_ptr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-css-transform"));
EXPECT_TRUE(dragImage);
@@ -6960,7 +6967,7 @@ TEST_P(ParameterizedWebFrameTest, NodeImageTestCSSTransform)
TEST_P(ParameterizedWebFrameTest, NodeImageTestCSS3DTransform)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
std::unique_ptr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-css-3dtransform"));
EXPECT_TRUE(dragImage);
@@ -6969,7 +6976,7 @@ TEST_P(ParameterizedWebFrameTest, NodeImageTestCSS3DTransform)
TEST_P(ParameterizedWebFrameTest, NodeImageTestInlineBlock)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
std::unique_ptr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-inlineblock"));
EXPECT_TRUE(dragImage);
@@ -6978,7 +6985,7 @@ TEST_P(ParameterizedWebFrameTest, NodeImageTestInlineBlock)
TEST_P(ParameterizedWebFrameTest, NodeImageTestFloatLeft)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
std::unique_ptr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string("case-float-left-overflow-hidden"));
EXPECT_TRUE(dragImage);
@@ -6992,7 +6999,7 @@ TEST_P(ParameterizedWebFrameTest, DISABLED_PrintingBasic)
TEST_P(ParameterizedWebFrameTest, PrintingBasic)
#endif
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("data:text/html,Hello, world.");
WebFrame* frame = webViewHelper.webView()->mainFrame();
@@ -7035,7 +7042,7 @@ private:
TEST_P(ParameterizedWebFrameTest, ThemeColor)
{
registerMockedHttpURLLoad("theme_color_test.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
ThemeColorTestWebFrameClient client;
webViewHelper.initializeAndLoad(m_baseURL + "theme_color_test.html", true, &client);
EXPECT_TRUE(client.didNotify());
@@ -7868,7 +7875,7 @@ public:
// and convert it to a unittest.
TEST_P(ParameterizedWebFrameTest, LoaderOriginAccess)
{
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
webViewHelper.initializeAndLoad("about:blank");
SchemeRegistry::registerURLSchemeAsDisplayIsolated("chrome");
@@ -7927,14 +7934,14 @@ TEST_P(ParameterizedWebFrameTest, CrossDomainAccessErrorsUseCallingWindow)
registerMockedHttpURLLoad("hidden_frames.html");
registerMockedChromeURLLoad("hello_world.html");
- FrameTestHelpers::WebViewHelper webViewHelper(this);
+ FrameTestHelpers::WebViewHelper webViewHelper;
TestConsoleMessageWebFrameClient webFrameClient;
FrameTestHelpers::TestWebViewClient webViewClient;
webViewHelper.initializeAndLoad(m_baseURL + "hidden_frames.html", true, &webFrameClient, &webViewClient);
// Create another window with a cross-origin page, and point its opener to
// first window.
- FrameTestHelpers::WebViewHelper popupWebViewHelper(this);
+ FrameTestHelpers::WebViewHelper popupWebViewHelper;
TestConsoleMessageWebFrameClient popupWebFrameClient;
WebView* popupView = popupWebViewHelper.initializeAndLoad(m_chromeURL + "hello_world.html", true, &popupWebFrameClient);
popupView->mainFrame()->setOpener(webViewHelper.webView()->mainFrame());
@@ -7963,7 +7970,6 @@ TEST_P(ParameterizedWebFrameTest, CrossDomainAccessErrorsUseCallingWindow)
class DeviceEmulationTest : public ParameterizedWebFrameTest {
protected:
DeviceEmulationTest()
- : m_webViewHelper(this)
{
registerMockedHttpURLLoad("device_emulation.html");
m_client.m_screenInfo.deviceScaleFactor = 1;
@@ -7993,9 +7999,7 @@ protected:
FrameTestHelpers::WebViewHelper m_webViewHelper;
};
-INSTANTIATE_TEST_CASE_P(All, DeviceEmulationTest, ::testing::Values(
- FrameTestHelpers::DefaultSettingOverride,
- FrameTestHelpers::RootLayerScrollsSettingOverride));
+INSTANTIATE_TEST_CASE_P(All, DeviceEmulationTest, ::testing::Bool());
TEST_P(DeviceEmulationTest, DeviceSizeInvalidatedOnResize)
{
« third_party/WebKit/Source/web/tests/VisualViewportTest.cpp ('K') | « third_party/WebKit/Source/web/tests/VisualViewportTest.cpp ('k') | third_party/WebKit/public/web/WebRuntimeFeatures.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698