Move LoadHTMLString method from WebFrame to WebLocalFrame.

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 4759 matching lines @@
   range = frame->SelectionRange();
   ASSERT_TRUE(range.IsNull());
 }
 
 TEST_P(ParameterizedWebFrameTest, GetContentAsPlainText) {
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad("about:blank", true);
   // 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";
   KURL test_url = ToKURL("about:blank");
   FrameTestHelpers::LoadHTMLString(frame, kSimpleSource, test_url);
 
   // Make sure it comes out OK.
   const std::string expected("Foo bar\nbaz");
   WebString text = WebFrameContentDumper::DumpWebViewAsText(
       web_view_helper.WebView(), std::numeric_limits<size_t>::max());
   EXPECT_EQ(expected, text.Utf8());
 
   // Try reading the same one with clipping of the text.
   const int kLength = 5;
   text = WebFrameContentDumper::DumpWebViewAsText(web_view_helper.WebView(),
                                                   kLength);
   EXPECT_EQ(expected.substr(0, kLength), text.Utf8());
 
   // Now do a new test with a subframe.
   const char kOuterFrameSource[] = "Hello<iframe></iframe> world";
   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 local root iterator will make
this reasonably easy to do.

   ASSERT_TRUE(subframe);
   FrameTestHelpers::LoadHTMLString(subframe, "sub<p>text", test_url);
 
   text = WebFrameContentDumper::DumpWebViewAsText(
       web_view_helper.WebView(), std::numeric_limits<size_t>::max());
   EXPECT_EQ("Hello world\n\nsub\ntext", text.Utf8());
 
   // Get the frame text where the subframe separator falls on the boundary of
   // what we'll take. There used to be a crash in this case.
   text =
@@ skipping 2806 matching lines @@
                               base_url_ + "foo_with_image.html");
 
   // 2 images are requested, and each triggers 2 willSendRequest() calls,
   // once for preloading and once for the real request.
   EXPECT_EQ(client.NumOfImageRequests(), 4);
 }
 
 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 "
       "src=\"data:image/"
       "png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+"
       "9AAAAGElEQVQYV2NkYPj/n4EIwDiqEF8oUT94AFIQE/cCn90IAAAAAElFTkSuQmCC\">";
 
   // Load up the image and test that we can extract the contents.
   KURL test_url = ToKURL("about:blank");
   FrameTestHelpers::LoadHTMLString(frame, kBluePNG, test_url);
@@ skipping 852 matching lines @@
   EXPECT_EQ(100, layout_view_item.LogicalWidth().Floor());
   EXPECT_EQ(200, layout_view_item.LogicalHeight().Floor());
   EXPECT_FLOAT_EQ(1.0, web_view_impl->PageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, web_view_impl->MinimumPageScaleFactor());
   EXPECT_FLOAT_EQ(1.0, web_view_impl->MaximumPageScaleFactor());
 
   const char kSource[] = "<meta name=\"viewport\" content=\"width=200\">";
 
   // 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();
 
   // Make sure the new page's layout size and scale factor limits aren't
   // overridden.
   layout_view_item =
       web_view_impl->MainFrameImpl()->GetFrameView()->GetLayoutViewItem();
   EXPECT_EQ(200, layout_view_item.LogicalWidth().Floor());
   EXPECT_EQ(400, layout_view_item.LogicalHeight().Floor());
@@ skipping 3176 matching lines @@
   ASSERT_TRUE(theme.IsMockTheme());
   ASSERT_TRUE(theme.UsesOverlayScrollbars());
   ScrollbarThemeOverlayMock& mock_overlay_theme =
       (ScrollbarThemeOverlayMock&)theme;
   mock_overlay_theme.SetOverlayScrollbarFadeOutDelay(
       kMockOverlayFadeOutDelayMs / 1000.0);
 
   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 {"
                                    "    width: 1000px;"
                                    "    height: 1000px;"
                                    "  }"
                                    "  #container {"
                                    "    width: 200px;"
                                    "    height: 200px;"
                                    "    overflow: scroll;"
@@ skipping 298 matching lines @@
 
  private:
   WebContextMenuData menu_data_;
   DISALLOW_COPY_AND_ASSIGN(ContextMenuWebFrameClient);
 };
 
 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();
   RunPendingTasks();
   web_view->SetInitialFocus(false);
   RunPendingTasks();
 
   WebMouseEvent mouse_event(WebInputEvent::kMouseDown,
                             WebInputEvent::kNoModifiers,
                             WebInputEvent::kTimeStampForTesting);
@@ skipping 15 matching lines @@
   EXPECT_FALSE(TestSelectAll("<div contenteditable></div>"));
   EXPECT_TRUE(TestSelectAll("<div contenteditable>nonempty</div>"));
   EXPECT_TRUE(TestSelectAll("<div contenteditable>\n</div>"));
 }
 
 TEST_F(WebFrameTest, ContextMenuDataSelectedText) {
   ContextMenuWebFrameClient frame;
   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();
   RunPendingTasks();
   web_view->SetInitialFocus(false);
   RunPendingTasks();
 
   web_view->MainFrameImpl()->ExecuteCommand(WebString::FromUTF8("SelectAll"));
 
   WebMouseEvent mouse_event(WebInputEvent::kMouseDown,
@@ skipping 114 matching lines @@
     if (obj->IsText()) {
       LayoutText* layout_text = ToLayoutText(obj);
       text = layout_text->GetText();
       break;
     }
   }
   EXPECT_EQ("foo alt", text.Utf8());
 }
 
 }  // namespace blink