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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1924043002: Switch the inheritance of WebViewClient from WebWidgetClient to protected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, fix new test Created 4 years, 8 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/ChromeClientImpl.cpp ('K') | « third_party/WebKit/Source/web/tests/VisualViewportTest.cpp ('k') | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('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 9d560a760a3dd06cfd84df1779a55f6ebd0c903c..a6e18154c0c235efb2800a31f798135bf3eb7685 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -912,7 +912,7 @@ TEST_P(ParameterizedWebFrameTest, ChangeInFixedLayoutResetsTextAutosizingMultipl
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();
document->settings()->setTextAutosizingEnabled(true);
@@ -938,7 +938,7 @@ TEST_P(ParameterizedWebFrameTest, WorkingTextAutosizingMultipliers_VirtualViewpo
FixedLayoutTestWebViewClient client;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, nullptr, &client, nullptr, configureAndroid);
Document* document = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame())->document();
document->settings()->setTextAutosizingEnabled(true);
@@ -960,7 +960,7 @@ TEST_P(ParameterizedWebFrameTest, VisualViewportSetSizeInvalidatesTextAutosizing
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "iframe_reload.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "iframe_reload.html", true, nullptr, &client, nullptr, enableViewportSettings);
LocalFrame* mainFrame = toLocalFrame(webViewHelper.webViewImpl()->page()->mainFrame());
Document* document = mainFrame->document();
@@ -999,7 +999,7 @@ TEST_P(ParameterizedWebFrameTest, ZeroHeightPositiveWidthNotIgnored)
int viewportHeight = 0;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initialize(true, 0, &client, enableViewportSettings);
+ webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
EXPECT_EQ(viewportWidth, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width());
@@ -1017,7 +1017,7 @@ TEST_P(ParameterizedWebFrameTest, DeviceScaleFactorUsesDefaultWithoutViewportTag
client.m_screenInfo.deviceScaleFactor = 2;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1045,7 +1045,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);
- webViewHelper.initialize(true, 0, &client, enableViewportSettings);
+ webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "fixed_layout.html");
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1082,7 +1082,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);
- webViewHelper.initialize(true, 0, &client, enableViewportSettings);
+ webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "wide_document.html");
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1117,7 +1117,7 @@ TEST_P(ParameterizedWebFrameTest, DelayedViewportInitialScale)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
EXPECT_EQ(0.25f, webViewHelper.webView()->pageScaleFactor());
@@ -1140,7 +1140,7 @@ TEST_P(ParameterizedWebFrameTest, setLoadWithOverviewModeToFalse)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1159,7 +1159,7 @@ TEST_P(ParameterizedWebFrameTest, SetLoadWithOverviewModeToFalseAndNoWideViewpor
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
@@ -1179,7 +1179,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportIgnoresPageViewportWidth)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1199,7 +1199,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportIgnoresPageViewportWidthButAccou
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client, enableViewportSettings);
+ 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);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1220,7 +1220,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithoutViewportTag)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, nullptr, &client, nullptr, enableViewportSettings);
applyViewportStyleOverride(&webViewHelper);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
@@ -1240,7 +1240,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithXhtmlMp)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initialize(true, 0, &client, enableViewportSettings);
+ webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
applyViewportStyleOverride(&webViewHelper);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
@@ -1261,7 +1261,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportAndHeightInMeta)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-height-1000.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "viewport-height-1000.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1279,7 +1279,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportSetsTo980WithAutoWidth)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-2x-initial-scale.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "viewport-2x-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
applyViewportStyleOverride(&webViewHelper);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
@@ -1299,7 +1299,7 @@ TEST_P(ParameterizedWebFrameTest, PageViewportInitialScaleOverridesLoadWithOverv
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client, enableViewportSettings);
+ 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));
@@ -1316,7 +1316,7 @@ TEST_P(ParameterizedWebFrameTest, setInitialPageScaleFactorPermanently)
float enforcedPageScaleFactor = 2.0f;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
applyViewportStyleOverride(&webViewHelper);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
@@ -1347,7 +1347,7 @@ TEST_P(ParameterizedWebFrameTest, PermanentInitialPageScaleFactorOverridesLoadWi
float enforcedPageScaleFactor = 0.5f;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "viewport-auto-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScaleFactor);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1366,7 +1366,7 @@ TEST_P(ParameterizedWebFrameTest, PermanentInitialPageScaleFactorOverridesPageVi
float enforcedPageScaleFactor = 0.5f;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "viewport-wide-2x-initial-scale.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScaleFactor);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1396,7 +1396,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);
- webViewHelper.initializeAndLoad(m_baseURL + pages[i], true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + pages[i], true, nullptr, &client, nullptr, enableViewportSettings);
applyViewportStyleOverride(&webViewHelper);
webViewHelper.webView()->settings()->setClobberUserAgentInitialScaleQuirk(quirkEnabled);
webViewHelper.webView()->setInitialPageScaleOverride(enforcedPageScaleFactor);
@@ -1417,7 +1417,7 @@ TEST_P(ParameterizedWebFrameTest, PermanentInitialPageScaleFactorAffectsLayoutWi
float enforcedPageScaleFactor = 0.5;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad("about:blank", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad("about:blank", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(false);
@@ -1439,7 +1439,7 @@ TEST_P(ParameterizedWebFrameTest, DocumentElementClientHeightWorksWithWrapConten
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "0-by-0.html", true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "0-by-0.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.webView()->settings()->setForceZeroLayoutHeight(true);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1460,7 +1460,7 @@ TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeightWorksWithWrapContentMo
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "0-by-0.html", true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "0-by-0.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.webView()->settings()->setForceZeroLayoutHeight(true);
PaintLayerCompositor* compositor = webViewHelper.webViewImpl()->compositor();
EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().width());
@@ -1502,7 +1502,7 @@ TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeight)
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
EXPECT_LE(viewportHeight, webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutSize().height());
@@ -1539,7 +1539,7 @@ TEST_F(WebFrameTest, SetForceZeroLayoutHeightWorksWithRelayoutsWhenHeightChanged
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "button.html", true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "button.html", true, nullptr, &client, nullptr, configureAndroid);
// set view height to zero so that if the height of the view is not
// successfully updated during later resizes touch events will fail
// (as in not hit content included in the view)
@@ -1637,7 +1637,7 @@ TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeightWorksAcrossNavigations
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setForceZeroLayoutHeight(true);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1658,7 +1658,7 @@ TEST_P(ParameterizedWebFrameTest, SetForceZeroLayoutHeightWithWideViewportQuirk)
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "200-by-300.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
webViewHelper.webView()->settings()->setForceZeroLayoutHeight(true);
@@ -1678,7 +1678,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportAndWideContentWithInitialScale)
int viewportHeight = 800;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad("about:blank", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad("about:blank", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
webViewHelper.webView()->settings()->setViewportMetaLayoutSizeQuirk(true);
@@ -1703,7 +1703,7 @@ TEST_P(ParameterizedWebFrameTest, WideViewportQuirkClobbersHeight)
int viewportHeight = 800;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad("about:blank", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad("about:blank", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
webViewHelper.webView()->settings()->setViewportMetaLayoutSizeQuirk(true);
@@ -1726,7 +1726,7 @@ TEST_P(ParameterizedWebFrameTest, LayoutSize320Quirk)
int viewportHeight = 800;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad("about:blank", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad("about:blank", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(true);
webViewHelper.webView()->settings()->setViewportMetaLayoutSizeQuirk(true);
@@ -1777,7 +1777,7 @@ TEST_P(ParameterizedWebFrameTest, ZeroValuesQuirk)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initialize(true, 0, &client, enableViewportSettings);
+ webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setViewportMetaZeroValuesQuirk(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setViewportMetaLayoutSizeQuirk(true);
@@ -1803,7 +1803,7 @@ TEST_P(ParameterizedWebFrameTest, OverflowHiddenDisablesScrolling)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initialize(true, 0, &client);
+ webViewHelper.initialize(true, nullptr, &client, nullptr);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "body-overflow-hidden.html");
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1822,7 +1822,7 @@ TEST_P(ParameterizedWebFrameTest, OverflowHiddenDisablesScrollingWithSetCanHaveS
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initialize(true, 0, &client);
+ webViewHelper.initialize(true, nullptr, &client, nullptr);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "body-overflow-hidden-short.html");
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1845,7 +1845,7 @@ TEST_F(WebFrameTest, IgnoreOverflowHiddenQuirk)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initialize(true, 0, &client);
+ webViewHelper.initialize(true, nullptr, &client, nullptr);
webViewHelper.webView()->settings()->setIgnoreMainFrameOverflowHiddenQuirk(true);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "body-overflow-hidden.html");
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1865,7 +1865,7 @@ TEST_P(ParameterizedWebFrameTest, NonZeroValuesNoQuirk)
float expectedPageScaleFactor = 0.5f;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initialize(true, 0, &client, enableViewportSettings);
+ webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setViewportMetaZeroValuesQuirk(true);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "viewport-nonzero-values.html");
@@ -1891,7 +1891,7 @@ TEST_P(ParameterizedWebFrameTest, setPageScaleFactorDoesNotLayout)
int viewportHeight = 48;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
int prevLayoutCount = webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutCount();
@@ -1910,7 +1910,7 @@ TEST_P(ParameterizedWebFrameTest, setPageScaleFactorWithOverlayScrollbarsDoesNot
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
int prevLayoutCount = webViewHelper.webViewImpl()->mainFrameImpl()->frameView()->layoutCount();
@@ -1930,7 +1930,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorWrittenToHistoryItem)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setPageScaleFactor(3);
@@ -1947,7 +1947,7 @@ TEST_P(ParameterizedWebFrameTest, initialScaleWrittenToHistoryItem)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initialize(true, 0, &client, enableViewportSettings);
+ webViewHelper.initialize(true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "fixed_layout.html");
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -1968,7 +1968,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorDoesntShrinkFrameView)
int viewportHeight = 48;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
@@ -2006,7 +2006,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorDoesNotApplyCssTransform)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setPageScaleFactor(2);
@@ -2032,7 +2032,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiHigh)
client.m_screenInfo.deviceScaleFactor = deviceScaleFactor;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-high.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-high.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -2060,7 +2060,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiDevice)
client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i];
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-device.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-device.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setSupportDeprecatedTargetDensityDPI(true);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
@@ -2085,7 +2085,7 @@ TEST_P(ParameterizedWebFrameTest, targetDensityDpiDeviceAndFixedWidth)
client.m_screenInfo.deviceScaleFactor = deviceScaleFactors[i];
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-target-densitydpi-device-and-fixed-width.html", true, 0, &client, enableViewportSettings);
+ 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);
webViewHelper.webView()->settings()->setUseWideViewport(true);
@@ -2107,7 +2107,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportAndScaleLessThanOne)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-less-than-1.html", true, 0, &client, enableViewportSettings);
+ 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);
webViewHelper.webView()->settings()->setUseWideViewport(false);
@@ -2128,7 +2128,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportAndScaleLessThanOneWithDeviceWid
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-less-than-1-device-width.html", true, 0, &client, enableViewportSettings);
+ 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);
webViewHelper.webView()->settings()->setUseWideViewport(false);
@@ -2150,7 +2150,7 @@ TEST_P(ParameterizedWebFrameTest, NoWideViewportAndNoViewportWithInitialPageScal
float enforcedPageScaleFactor = 5.0f;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "large-div.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
@@ -2171,7 +2171,7 @@ TEST_P(ParameterizedWebFrameTest, NoUserScalableQuirkIgnoresViewportScale)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-and-user-scalable-no.html", true, 0, &client, enableViewportSettings);
+ 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));
@@ -2190,7 +2190,7 @@ TEST_P(ParameterizedWebFrameTest, NoUserScalableQuirkIgnoresViewportScaleForNonW
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-initial-scale-and-user-scalable-no.html", true, 0, &client, enableViewportSettings);
+ 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);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
@@ -2211,7 +2211,7 @@ TEST_P(ParameterizedWebFrameTest, NoUserScalableQuirkIgnoresViewportScaleForWide
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "viewport-2x-initial-scale-non-user-scalable.html", true, 0, &client, enableViewportSettings);
+ 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);
webViewHelper.webView()->settings()->setUseWideViewport(true);
@@ -2231,7 +2231,7 @@ TEST_P(ParameterizedWebFrameTest, DesktopPageCanBeZoomedInWhenWideViewportIsTurn
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "no_viewport_tag.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setDefaultPageScaleLimits(0.25f, 5);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setUseWideViewport(false);
@@ -2262,7 +2262,7 @@ protected:
const float aspectRatio = static_cast<float>(viewportSize.width) / viewportSize.height;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + url, true, 0, 0, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + url, true, nullptr, nullptr, nullptr, enableViewportSettings);
webViewHelper.webViewImpl()->setDefaultPageScaleLimits(0.25f, 5);
// Origin scrollOffsets preserved under resize.
@@ -2364,7 +2364,7 @@ TEST_P(ParameterizedWebFrameTest, pageScaleFactorUpdatesScrollbars)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "fixed_layout.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
@@ -2387,7 +2387,7 @@ TEST_P(ParameterizedWebFrameTest, CanOverrideScaleLimits)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "no_scale_for_you.html", true, 0, &client, enableViewportSettings);
+ 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));
@@ -2421,7 +2421,7 @@ TEST_F(WebFrameTest, updateOverlayScrollbarLayers)
OwnPtr<FakeCompositingWebViewClient> fakeCompositingWebViewClient = adoptPtr(new FakeCompositingWebViewClient());
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initialize(true, 0, fakeCompositingWebViewClient.get(), &configueCompositingWebView);
+ webViewHelper.initialize(true, nullptr, fakeCompositingWebViewClient.get(), nullptr, &configueCompositingWebView);
webViewHelper.resize(WebSize(viewWidth, viewHeight));
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "large-div.html");
@@ -2472,7 +2472,7 @@ TEST_P(ParameterizedWebFrameTest, DivAutoZoomParamsTest)
int viewportHeight = 1280 / deviceScaleFactor;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "get_scale_for_auto_zoom_into_div_test.html", false, 0, 0, configureAndroid);
+ 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);
webViewHelper.webView()->setPageScaleFactor(0.5f);
@@ -2524,7 +2524,7 @@ TEST_P(ParameterizedWebFrameTest, DivAutoZoomWideDivTest)
int viewportHeight = 1280 / deviceScaleFactor;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "get_wide_div_for_auto_zoom_test.html", false, 0, 0, configureAndroid);
+ 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);
webViewHelper.webView()->setPageScaleFactor(1.0f);
@@ -2556,7 +2556,7 @@ TEST_P(ParameterizedWebFrameTest, DivAutoZoomVeryTallTest)
int viewportWidth = 640 / deviceScaleFactor;
int viewportHeight = 1280 / deviceScaleFactor;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "very_tall_div.html", true, 0, 0, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "very_tall_div.html", true, nullptr, nullptr, nullptr, configureAndroid);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
webViewHelper.webView()->setPageScaleFactor(1.0f);
@@ -2582,7 +2582,7 @@ TEST_F(WebFrameTest, DivAutoZoomMultipleDivsTest)
int viewportHeight = 1280 / deviceScaleFactor;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html", false, 0, 0, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "get_multiple_divs_for_auto_zoom_test.html", false, nullptr, nullptr, nullptr, configureAndroid);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setDefaultPageScaleLimits(0.5f, 4);
webViewHelper.webView()->setDeviceScaleFactor(deviceScaleFactor);
@@ -2631,7 +2631,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleBoundsTest)
int viewportHeight = 480;
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, 0, 0, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, nullptr, nullptr, nullptr, configureAndroid);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setDeviceScaleFactor(1.5f);
webViewHelper.webView()->setMaximumLegibleScale(1.f);
@@ -2694,7 +2694,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleLegibleScaleTest)
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
float maximumLegibleScaleFactor = 1.13f;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, 0, 0, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, nullptr, nullptr, nullptr, configureAndroid);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setMaximumLegibleScale(maximumLegibleScaleFactor);
webViewHelper.webView()->updateAllLifecyclePhases();
@@ -2773,7 +2773,7 @@ TEST_F(WebFrameTest, DivAutoZoomScaleFontScaleFactorTest)
float doubleTapZoomAlreadyLegibleRatio = 1.2f;
float accessibilityFontScaleFactor = 1.13f;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, 0, 0, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "get_scale_bounds_check_for_auto_zoom_test.html", false, nullptr, nullptr, nullptr, configureAndroid);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webView()->setMaximumLegibleScale(1.f);
webViewHelper.webView()->updateAllLifecyclePhases();
@@ -2848,7 +2848,7 @@ TEST_P(ParameterizedWebFrameTest, BlockBoundTest)
registerMockedHttpURLLoad("block_bound.html");
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "block_bound.html", false, 0, 0, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "block_bound.html", false, nullptr, nullptr, nullptr, configureAndroid);
IntRect rectBack = IntRect(0, 0, 200, 200);
IntRect rectLeftTop = IntRect(10, 10, 80, 80);
@@ -4629,7 +4629,7 @@ protected:
RuntimeEnabledFeatures::setCompositedSelectionUpdateEnabled(true);
registerMockedHttpURLLoad("Ahem.ttf");
- m_webViewHelper.initialize(true, 0, &m_fakeSelectionWebViewClient);
+ m_webViewHelper.initialize(true, nullptr, &m_fakeSelectionWebViewClient, nullptr);
m_webViewHelper.webView()->settings()->setDefaultFontSize(12);
m_webViewHelper.webView()->setDefaultPageScaleLimits(1, 1);
m_webViewHelper.resize(WebSize(640, 480));
@@ -4748,7 +4748,7 @@ TEST_P(ParameterizedWebFrameTest, CompositedSelectionBoundsCleared)
CompositedSelectionBoundsTestLayerTreeView& fakeSelectionLayerTreeView = fakeSelectionWebViewClient.selectionLayerTreeView();
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initialize(true, 0, &fakeSelectionWebViewClient);
+ webViewHelper.initialize(true, nullptr, &fakeSelectionWebViewClient, nullptr);
webViewHelper.webView()->settings()->setDefaultFontSize(12);
webViewHelper.webView()->setDefaultPageScaleLimits(1, 1);
webViewHelper.resize(WebSize(viewWidth, viewHeight));
@@ -4901,7 +4901,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);
- webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(1000, 1000));
client.resetTriggered();
@@ -4935,7 +4935,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);
- webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.resize(WebSize(1000, 1000));
client.resetTriggered();
@@ -4967,7 +4967,7 @@ TEST_F(WebFrameTest, DisambiguationPopupVisualViewport)
DisambiguationPopupTestWebViewClient client;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + htmlFile, true, nullptr, &client, nullptr, configureAndroid);
WebViewImpl* webViewImpl = webViewHelper.webViewImpl();
ASSERT_TRUE(webViewImpl);
@@ -6094,7 +6094,7 @@ TEST_P(ParameterizedWebFrameTest, NavigateToSameNoConditionalRequestForSubresour
registerMockedHttpURLLoad("white-1x1.png");
TestSameDocumentWithImageWebFrameClient client;
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "foo_with_image.html", true, &client, 0, &configureLoadsImagesAutomatically);
+ webViewHelper.initializeAndLoad(m_baseURL + "foo_with_image.html", true, &client, nullptr, nullptr, &configureLoadsImagesAutomatically);
WebCache::clear();
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "foo_with_image.html");
@@ -6296,7 +6296,7 @@ TEST_F(WebFrameTest, overflowHiddenRewrite)
registerMockedHttpURLLoad("non-scrollable.html");
OwnPtr<FakeCompositingWebViewClient> fakeCompositingWebViewClient = adoptPtr(new FakeCompositingWebViewClient());
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initialize(true, 0, fakeCompositingWebViewClient.get(), &configueCompositingWebView);
+ webViewHelper.initialize(true, nullptr, fakeCompositingWebViewClient.get(), nullptr, &configueCompositingWebView);
webViewHelper.resize(WebSize(100, 100));
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "non-scrollable.html");
@@ -6375,7 +6375,7 @@ TEST_P(ParameterizedWebFrameTest, fixedPositionInFixedViewport)
{
registerMockedHttpURLLoad("fixed-position-in-fixed-viewport.html");
FrameTestHelpers::WebViewHelper webViewHelper(this);
- webViewHelper.initializeAndLoad(m_baseURL + "fixed-position-in-fixed-viewport.html", true, 0, 0, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "fixed-position-in-fixed-viewport.html", true, nullptr, nullptr, nullptr, enableViewportSettings);
WebView* webView = webViewHelper.webView();
webViewHelper.resize(WebSize(100, 100));
@@ -6415,7 +6415,7 @@ TEST_F(WebFrameTest, FrameViewScrollAccountsForTopControls)
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("long_scroll.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "long_scroll.html", true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "long_scroll.html", true, nullptr, &client, nullptr, configureAndroid);
WebViewImpl* webView = webViewHelper.webViewImpl();
FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
@@ -6481,7 +6481,7 @@ TEST_F(WebFrameTest, MaximumScrollPositionCanBeNegative)
int viewportHeight = 480;
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "rtl-overview-mode.html", true, 0, &client, enableViewportSettings);
+ webViewHelper.initializeAndLoad(m_baseURL + "rtl-overview-mode.html", true, nullptr, &client, nullptr, enableViewportSettings);
webViewHelper.webView()->setInitialPageScaleOverride(-1);
webViewHelper.webView()->settings()->setWideViewportQuirkEnabled(true);
webViewHelper.webView()->settings()->setLoadWithOverviewMode(true);
@@ -6502,7 +6502,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenLayerSize)
int viewportHeight = 480;
client.m_screenInfo.rect.width = viewportWidth;
client.m_screenInfo.rect.height = viewportHeight;
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configureAndroid);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewImpl->updateAllLifecyclePhases();
@@ -6535,7 +6535,7 @@ TEST_F(WebFrameTest, FullscreenLayerNonScrollable)
FrameTestHelpers::WebViewHelper webViewHelper;
int viewportWidth = 640;
int viewportHeight = 480;
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configureAndroid);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewImpl->updateAllLifecyclePhases();
@@ -6573,7 +6573,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenMainFrame)
FrameTestHelpers::WebViewHelper webViewHelper(this);
int viewportWidth = 640;
int viewportHeight = 480;
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configureAndroid);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
webViewImpl->updateAllLifecyclePhases();
@@ -6603,7 +6603,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenSubframe)
registerMockedHttpURLLoad("fullscreen_iframe.html");
registerMockedHttpURLLoad("fullscreen_div.html");
FrameTestHelpers::WebViewHelper webViewHelper(this);
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_iframe.html", true, 0, &client, configureAndroid);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_iframe.html", true, nullptr, &client, nullptr, configureAndroid);
int viewportWidth = 640;
int viewportHeight = 480;
client.m_screenInfo.rect.width = viewportWidth;
@@ -6637,7 +6637,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenWithTinyViewport)
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("viewport-tiny.html");
FrameTestHelpers::WebViewHelper webViewHelper(this);
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "viewport-tiny.html", true, 0, &client, configureAndroid);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "viewport-tiny.html", true, nullptr, &client, nullptr, configureAndroid);
int viewportWidth = 384;
int viewportHeight = 640;
client.m_screenInfo.rect.width = viewportWidth;
@@ -6677,7 +6677,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenResizeWithTinyViewport)
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("viewport-tiny.html");
FrameTestHelpers::WebViewHelper webViewHelper(this);
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "viewport-tiny.html", true, 0, &client, configureAndroid);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "viewport-tiny.html", true, nullptr, &client, nullptr, configureAndroid);
int viewportWidth = 384;
int viewportHeight = 640;
client.m_screenInfo.rect.width = viewportWidth;
@@ -6731,7 +6731,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenRestoreScaleFactorUponExiting)
FakeCompositingWebViewClient client;
registerMockedHttpURLLoad("fullscreen_restore_scale_factor.html");
FrameTestHelpers::WebViewHelper webViewHelper(this);
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_restore_scale_factor.html", true, nullptr, &client, &configureAndroid);
+ 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;
webViewHelper.resize(screenSizeMinusStatusBarsMinusUrlBar);
@@ -7841,7 +7841,7 @@ TEST_P(ParameterizedWebFrameTest, FrameWidgetTest)
WebLocalFrame* childFrame = FrameTestHelpers::createLocalChild(view->mainFrame()->toWebRemoteFrame());
GestureEventTestWebViewClient childViewClient;
- WebFrameWidget* widget = WebFrameWidget::create(&childViewClient, childFrame);
+ WebFrameWidget* widget = WebFrameWidget::create(childViewClient.widgetClient(), childFrame);
view->resize(WebSize(1000, 1000));
@@ -8165,7 +8165,7 @@ TEST_P(WebFrameOverscrollTest, AccumulatedRootOverscrollAndUnsedDeltaValuesOnOve
OverscrollWebViewClient client;
registerMockedHttpURLLoad("overscroll/overscroll.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.resize(WebSize(200, 200));
// Calculation of accumulatedRootOverscroll and unusedDelta on multiple scrollUpdate.
@@ -8207,7 +8207,7 @@ TEST_P(WebFrameOverscrollTest, AccumulatedOverscrollAndUnusedDeltaValuesOnDiffer
OverscrollWebViewClient client;
registerMockedHttpURLLoad("overscroll/div-overscroll.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "overscroll/div-overscroll.html", true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "overscroll/div-overscroll.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.resize(WebSize(200, 200));
ScrollBegin(&webViewHelper);
@@ -8250,7 +8250,7 @@ TEST_P(WebFrameOverscrollTest, RootLayerOverscrolledOnInnerDivOverScroll)
OverscrollWebViewClient client;
registerMockedHttpURLLoad("overscroll/div-overscroll.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "overscroll/div-overscroll.html", true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "overscroll/div-overscroll.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.resize(WebSize(200, 200));
ScrollBegin(&webViewHelper);
@@ -8275,7 +8275,7 @@ TEST_P(WebFrameOverscrollTest, RootLayerOverscrolledOnInnerIFrameOverScroll)
registerMockedHttpURLLoad("overscroll/iframe-overscroll.html");
registerMockedHttpURLLoad("overscroll/scrollable-iframe.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "overscroll/iframe-overscroll.html", true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "overscroll/iframe-overscroll.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.resize(WebSize(200, 200));
ScrollBegin(&webViewHelper);
@@ -8307,7 +8307,7 @@ TEST_P(WebFrameOverscrollTest, ScaledPageRootLayerOverscrolled)
OverscrollWebViewClient client;
registerMockedHttpURLLoad("overscroll/overscroll.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, 0, &client, configureAndroid);
+ WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.resize(WebSize(200, 200));
webViewImpl->setPageScaleFactor(3.0);
@@ -8341,7 +8341,7 @@ TEST_P(WebFrameOverscrollTest, NoOverscrollForSmallvalues)
OverscrollWebViewClient client;
registerMockedHttpURLLoad("overscroll/overscroll.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.resize(WebSize(200, 200));
ScrollBegin(&webViewHelper);
@@ -8392,7 +8392,7 @@ TEST_P(WebFrameOverscrollTest, ReportingLatestOverscrollForElasticOverscroll)
OverscrollWebViewClient client;
registerMockedHttpURLLoad("overscroll/overscroll.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "overscroll/overscroll.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.resize(WebSize(200, 200));
EXPECT_CALL(client, didOverscroll(WebFloatSize(-1000, -1000), WebFloatSize(-1000, -1000), WebFloatPoint(), WebFloatSize()));
@@ -8407,7 +8407,7 @@ TEST_P(WebFrameOverscrollTest, ScrollPageWithBodyExplicitlyOverflowing)
OverscrollWebViewClient client;
registerMockedHttpURLLoad("mouse-wheel-overflow-body.html");
FrameTestHelpers::WebViewHelper webViewHelper;
- webViewHelper.initializeAndLoad(m_baseURL + "mouse-wheel-overflow-body.html", true, 0, &client, configureAndroid);
+ webViewHelper.initializeAndLoad(m_baseURL + "mouse-wheel-overflow-body.html", true, nullptr, &client, nullptr, configureAndroid);
webViewHelper.resize(WebSize(800, 600));
FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
@@ -8609,7 +8609,7 @@ TEST(WebFrameGlobalReuseTest, MainFrameWithNoOpener)
TEST(WebFrameGlobalReuseTest, ChildFrame)
{
FrameTestHelpers::WebViewHelper helper;
- helper.initialize(true, nullptr, nullptr, enableGlobalReuseForUnownedMainFrames);
+ helper.initialize(true, nullptr, nullptr, nullptr, enableGlobalReuseForUnownedMainFrames);
WebLocalFrame* mainFrame = helper.webView()->mainFrame()->toWebLocalFrame();
FrameTestHelpers::loadFrame(mainFrame, "data:text/html,<iframe></iframe>");
@@ -8629,9 +8629,9 @@ TEST(WebFrameGlobalReuseTest, MainFrameWithOpener)
{
FrameTestHelpers::TestWebViewClient openerWebViewClient;
FrameTestHelpers::WebViewHelper openerHelper;
- openerHelper.initialize(false, nullptr, &openerWebViewClient);
+ openerHelper.initialize(false, nullptr, &openerWebViewClient, nullptr);
FrameTestHelpers::WebViewHelper helper;
- helper.initializeWithOpener(openerHelper.webView()->mainFrame(), true, nullptr, nullptr, enableGlobalReuseForUnownedMainFrames);
+ helper.initializeWithOpener(openerHelper.webView()->mainFrame(), true, nullptr, nullptr, nullptr, enableGlobalReuseForUnownedMainFrames);
WebLocalFrame* mainFrame = helper.webView()->mainFrame()->toWebLocalFrame();
v8::HandleScope scope(v8::Isolate::GetCurrent());
@@ -8649,7 +8649,7 @@ TEST(WebFrameGlobalReuseTest, MainFrameWithOpener)
TEST(WebFrameGlobalReuseTest, ReuseForMainFrameIfEnabled)
{
FrameTestHelpers::WebViewHelper helper;
- helper.initialize(true, nullptr, nullptr, enableGlobalReuseForUnownedMainFrames);
+ helper.initialize(true, nullptr, nullptr, nullptr, enableGlobalReuseForUnownedMainFrames);
WebLocalFrame* mainFrame = helper.webView()->mainFrame()->toWebLocalFrame();
v8::HandleScope scope(v8::Isolate::GetCurrent());
« third_party/WebKit/Source/web/ChromeClientImpl.cpp ('K') | « third_party/WebKit/Source/web/tests/VisualViewportTest.cpp ('k') | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698