| 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"));
|
|
|