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

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

Issue 1397713004: Don't bother layout until first navigation is done. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: another attempt to fix tests Created 4 years, 10 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 51d49aaa13eaad1904ad515e566172a48500c028..ec004329453ee220b43dd9c100ecc3ab709dee0e 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -498,6 +498,9 @@ TEST_P(ParameterizedWebFrameTest, LocationSetHostWithMissingPort)
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), "javascript:document.body.textContent = location.href; void 0;");
+ // Required to see any updates in dumpFrameTreeAsText.
+ webViewHelper.webView()->updateAllLifecyclePhases();
+
std::string content = WebFrameContentDumper::dumpFrameTreeAsText(webViewHelper.webView()->mainFrame()->toWebLocalFrame(), 1024).utf8();
EXPECT_EQ("http://internal.test:0/" + fileName, content);
}
@@ -517,6 +520,9 @@ TEST_P(ParameterizedWebFrameTest, LocationSetEmptyPort)
FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), "javascript:document.body.textContent = location.href; void 0;");
+ // Required to see any updates in dumpFrameTreeAsText.
+ webViewHelper.webView()->updateAllLifecyclePhases();
+
std::string content = WebFrameContentDumper::dumpFrameTreeAsText(webViewHelper.webView()->mainFrame()->toWebLocalFrame(), 1024).utf8();
EXPECT_EQ("http://internal.test:0/" + fileName, content);
}
@@ -4761,7 +4767,7 @@ TEST_P(ParameterizedWebFrameTest, CompositedSelectionBoundsCleared)
// The frame starts with no selection.
WebFrame* frame = webViewHelper.webView()->mainFrame();
ASSERT_TRUE(frame->hasSelection());
- EXPECT_TRUE(fakeSelectionLayerTreeView.getAndResetSelectionCleared());
+ EXPECT_FALSE(fakeSelectionLayerTreeView.selection());
// The selection cleared notification should be triggered upon layout.
frame->executeCommand(WebString::fromUTF8("Unselect"));
« no previous file with comments | « third_party/WebKit/Source/web/tests/TextFinderTest.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