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

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

Issue 1843663005: Change bool ignoreCache to WebFrameLoadType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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
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 ab618ab043a40f5843e3d7b872c5de40c1934b57..e71a7f6d33dfcd09f0b8bc6fe0f9fa5ea17b6e28 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -3227,7 +3227,7 @@ TEST_P(ParameterizedWebFrameTest, ReloadDoesntSetRedirect)
FrameTestHelpers::WebViewHelper webViewHelper(this);
webViewHelper.initializeAndLoad(m_baseURL + "form.html", false, &webFrameClient);
- webViewHelper.webView()->mainFrame()->reload(true);
+ webViewHelper.webView()->mainFrame()->reload(WebFrameLoadType::ReloadBypassingCache);
// start another reload before request is delivered.
FrameTestHelpers::reloadFrameIgnoringCache(webViewHelper.webView()->mainFrame());
}
@@ -3264,21 +3264,21 @@ TEST_F(WebFrameTest, ReloadWithOverrideURLPreservesState)
float previousScale = webViewHelper.webViewImpl()->pageScaleFactor();
// Reload the page and end up at the same url. State should be propagated.
- webViewHelper.webViewImpl()->mainFrame()->reloadWithOverrideURL(toKURL(m_baseURL + firstURL), false);
+ webViewHelper.webViewImpl()->mainFrame()->reloadWithOverrideURL(toKURL(m_baseURL + firstURL), WebFrameLoadType::Reload);
FrameTestHelpers::pumpPendingRequestsForFrameToLoad(webViewHelper.webViewImpl()->mainFrame());
EXPECT_EQ(previousOffset.width, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().width);
EXPECT_EQ(previousOffset.height, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().height);
EXPECT_EQ(previousScale, webViewHelper.webViewImpl()->pageScaleFactor());
// Reload the page using the cache. State should not be propagated.
- webViewHelper.webViewImpl()->mainFrame()->reloadWithOverrideURL(toKURL(m_baseURL + secondURL), false);
+ webViewHelper.webViewImpl()->mainFrame()->reloadWithOverrideURL(toKURL(m_baseURL + secondURL), WebFrameLoadType::Reload);
FrameTestHelpers::pumpPendingRequestsForFrameToLoad(webViewHelper.webViewImpl()->mainFrame());
EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().width);
EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().height);
EXPECT_EQ(1.0f, webViewHelper.webViewImpl()->pageScaleFactor());
// Reload the page while ignoring the cache. State should not be propagated.
- webViewHelper.webViewImpl()->mainFrame()->reloadWithOverrideURL(toKURL(m_baseURL + thirdURL), true);
+ webViewHelper.webViewImpl()->mainFrame()->reloadWithOverrideURL(toKURL(m_baseURL + thirdURL), WebFrameLoadType::ReloadBypassingCache);
FrameTestHelpers::pumpPendingRequestsForFrameToLoad(webViewHelper.webViewImpl()->mainFrame());
EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().width);
EXPECT_EQ(0, webViewHelper.webViewImpl()->mainFrame()->scrollOffset().height);
« no previous file with comments | « third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp ('k') | third_party/WebKit/public/web/WebClientRedirectPolicy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698