Chromium Code Reviews Chromium Code Reviews
Issue 2917343004:
Move LoadHTMLString method from WebFrame to WebLocalFrame. (Closed)
| 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 0858041c758bf12c970050eb39cb9deffc831340..a975b355dc197db3a15b3a355f32736d3ebc6a04 100644 |
| --- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
| +++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
| @@ -4777,7 +4777,7 @@ TEST_P(ParameterizedWebFrameTest, GetContentAsPlainText) { |
| // We set the size because it impacts line wrapping, which changes the |
| // resulting text value. |
| web_view_helper.Resize(WebSize(640, 480)); |
| - WebFrame* frame = web_view_helper.WebView()->MainFrame(); |
| + WebLocalFrame* frame = web_view_helper.WebView()->MainFrameImpl(); |
| // Generate a simple test case. |
| const char kSimpleSource[] = "<div>Foo bar</div><div></div>baz"; |
| @@ -4801,7 +4801,7 @@ TEST_P(ParameterizedWebFrameTest, GetContentAsPlainText) { |
| FrameTestHelpers::LoadHTMLString(frame, kOuterFrameSource, test_url); |
| // Load something into the subframe. |
| - WebFrame* subframe = frame->FirstChild(); |
| + WebLocalFrame* subframe = frame->FirstChild()->ToWebLocalFrame(); |
|
Łukasz Anforowicz
2017/06/06 18:25:44
This seems safe in practice.
dcheng
2017/06/06 19:49:49
Acknowledged. Long-term, I'm hoping some sort of l
|
| ASSERT_TRUE(subframe); |
| FrameTestHelpers::LoadHTMLString(subframe, "sub<p>text", test_url); |
| @@ -7628,7 +7628,7 @@ TEST_P(ParameterizedWebFrameTest, |
| TEST_P(ParameterizedWebFrameTest, WebNodeImageContents) { |
| FrameTestHelpers::WebViewHelper web_view_helper; |
| web_view_helper.InitializeAndLoad("about:blank", true); |
| - WebFrame* frame = web_view_helper.WebView()->MainFrame(); |
| + WebLocalFrame* frame = web_view_helper.WebView()->MainFrameImpl(); |
| static const char kBluePNG[] = |
| "<img " |
| @@ -8501,7 +8501,7 @@ TEST_P(ParameterizedWebFrameTest, ClearFullscreenConstraintsOnNavigation) { |
| // Load a new page before exiting fullscreen. |
| KURL test_url = ToKURL("about:blank"); |
| - WebFrame* frame = web_view_helper.WebView()->MainFrame(); |
| + WebLocalFrame* frame = web_view_helper.WebView()->MainFrameImpl(); |
| FrameTestHelpers::LoadHTMLString(frame, kSource, test_url); |
| web_view_impl->DidExitFullscreen(); |
| web_view_impl->UpdateAllLifecyclePhases(); |
| @@ -11698,7 +11698,7 @@ TEST_F(WebFrameTest, DISABLE_ON_TSAN(TestNonCompositedOverlayScrollbarsFade)) { |
| web_view_impl->ResizeWithBrowserControls(WebSize(640, 480), 0, false); |
| WebURL base_url = URLTestHelpers::ToKURL("http://example.com/"); |
| - FrameTestHelpers::LoadHTMLString(web_view_impl->MainFrame(), |
| + FrameTestHelpers::LoadHTMLString(web_view_impl->MainFrameImpl(), |
| "<!DOCTYPE html>" |
| "<style>" |
| " #space {" |
| @@ -12017,7 +12017,7 @@ bool TestSelectAll(const std::string& html) { |
| ContextMenuWebFrameClient frame; |
| FrameTestHelpers::WebViewHelper web_view_helper; |
| WebViewBase* web_view = web_view_helper.Initialize(true, &frame); |
| - FrameTestHelpers::LoadHTMLString(web_view->MainFrame(), html, |
| + FrameTestHelpers::LoadHTMLString(web_view->MainFrameImpl(), html, |
| ToKURL("about:blank")); |
| web_view->Resize(WebSize(500, 300)); |
| web_view->UpdateAllLifecyclePhases(); |
| @@ -12053,7 +12053,7 @@ TEST_F(WebFrameTest, ContextMenuDataSelectedText) { |
| FrameTestHelpers::WebViewHelper web_view_helper; |
| WebViewBase* web_view = web_view_helper.Initialize(true, &frame); |
| const std::string& html = "<input value=' '>"; |
| - FrameTestHelpers::LoadHTMLString(web_view->MainFrame(), html, |
| + FrameTestHelpers::LoadHTMLString(web_view->MainFrameImpl(), html, |
| ToKURL("about:blank")); |
| web_view->Resize(WebSize(500, 300)); |
| web_view->UpdateAllLifecyclePhases(); |
