Move GetDocument 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "public/web/WebFrame.h"
 
 #include <stdarg.h>
 
+#include <limits>
 #include <map>
 #include <memory>
+#include <set>
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "bindings/core/v8/V8BindingForCore.h"
 #include "bindings/core/v8/V8Node.h"
 #include "bindings/core/v8/serialization/SerializedScriptValueFactory.h"
 #include "bindings/core/v8/serialization/V8ScriptValueSerializer.h"
 #include "core/clipboard/DataTransfer.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/css/resolver/StyleResolver.h"
@@ skipping 567 matching lines @@
   EXPECT_EQ(String(), callback_helper.StringValue());
 }
 
 TEST_P(ParameterizedWebFrameTest, FormWithNullFrame) {
   RegisterMockedHttpURLLoad("form.html");
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "form.html");
 
   WebVector<WebFormElement> forms;
-  web_view_helper.WebView()->MainFrame()->GetDocument().Forms(forms);
+  web_view_helper.WebView()->MainFrameImpl()->GetDocument().Forms(forms);
   web_view_helper.Reset();
 
   EXPECT_EQ(forms.size(), 1U);
 
   // This test passes if this doesn't crash.
   WebSearchableFormData searchable_data_form(forms[0]);
 }
 
 TEST_P(ParameterizedWebFrameTest, ChromePageJavascript) {
   RegisterMockedChromeURLLoad("history.html");
@@ skipping 367 matching lines @@
 
 TEST_P(ParameterizedWebFrameTest, DispatchMessageEventWithOriginCheck) {
   RegisterMockedHttpURLLoad("postmessage_test.html");
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "postmessage_test.html");
 
   // Send a message with the correct origin.
   WebSecurityOrigin correct_origin(
       WebSecurityOrigin::Create(ToKURL(base_url_)));
-  WebDocument document = web_view_helper.WebView()->MainFrame()->GetDocument();
+  WebDocument document =
+      web_view_helper.WebView()->MainFrameImpl()->GetDocument();
   WebSerializedScriptValue data(WebSerializedScriptValue::CreateInvalid());
   WebDOMMessageEvent message(data, "http://origin.com");
   web_view_helper.WebView()
       ->MainFrameImpl()
       ->DispatchMessageEventWithOriginCheck(correct_origin, message);
 
   // Send another message with incorrect origin.
   WebSecurityOrigin incorrect_origin(
       WebSecurityOrigin::Create(ToKURL(chrome_url_)));
   web_view_helper.WebView()
@@ skipping 2897 matching lines @@
   web_view_helper.WebView()->EnableFakePageScaleAnimationForTesting(true);
 
   WebRect edit_box_with_text(200, 200, 250, 20);
   WebRect edit_box_with_no_text(200, 250, 250, 20);
 
   // Test scrolling the focused node
   // The edit box is shorter and narrower than the viewport when legible.
   web_view_helper.WebView()->AdvanceFocus(false);
   // Set the caret to the end of the input box.
   web_view_helper.WebView()
-      ->MainFrame()
+      ->MainFrameImpl()
       ->GetDocument()
       .GetElementById("EditBoxWithText")
       .To<WebInputElement>()
       .SetSelectionRange(1000, 1000);
   SetScaleAndScrollAndLayout(web_view_helper.WebView(), WebPoint(0, 0), 1);
   WebRect rect, caret;
   web_view_helper.WebView()->SelectionBounds(caret, rect);
 
   // Set the page scale to be smaller than the minimal readable scale.
   float initial_scale = min_readable_caret_height / caret.height * 0.5f;
@@ skipping 76 matching lines @@
   web_view_helper.WebView()->GetPage()->GetSettings().SetTextAutosizingEnabled(
       false);
   web_view_helper.Resize(WebSize(kViewportWidth, kViewportHeight));
   web_view_helper.WebView()->EnableFakePageScaleAnimationForTesting(true);
 
   const WebRect edit_box_with_text(200, 200, 250, 20);
 
   web_view_helper.WebView()->AdvanceFocus(false);
   // Set the caret to the begining of the input box.
   web_view_helper.WebView()
-      ->MainFrame()
+      ->MainFrameImpl()
       ->GetDocument()
       .GetElementById("EditBoxWithText")
       .To<WebInputElement>()
       .SetSelectionRange(0, 0);
   SetScaleAndScrollAndLayout(web_view_helper.WebView(), WebPoint(0, 0), 1);
   WebRect rect, caret;
   web_view_helper.WebView()->SelectionBounds(caret, rect);
 
   // Set the page scale to be twice as large as the minimal readable scale.
   float new_scale = kMinReadableCaretHeight / caret.height * 2.0;
@@ skipping 1282 matching lines @@
 }
 
 static WebPoint BottomRightMinusOne(const WebRect& rect) {
   // FIXME: If we don't subtract 1 from the x- and y-coordinates of the
   // selection bounds, selectRange() will select the *next* element. That's
   // strictly correct, as hit-testing checks the pixel to the lower-right of
   // the input coordinate, but it's a wart on the API.
   return WebPoint(rect.x + rect.width - 1, rect.y + rect.height - 1);
 }
 
-static WebRect ElementBounds(WebFrame* frame, const WebString& id) {
+static WebRect ElementBounds(WebLocalFrame* frame, const WebString& id) {
   return frame->GetDocument().GetElementById(id).BoundsInViewport();
 }
 
 static std::string SelectionAsString(WebFrame* frame) {
   return frame->ToWebLocalFrame()->SelectionAsText().Utf8();
 }
 
 TEST_P(ParameterizedWebFrameTest, SelectRange) {
   WebLocalFrame* frame;
   WebRect start_web_rect;
@@ skipping 1356 matching lines @@
   WebVector<unsigned> offsets2;
   GetSpellingMarkerOffsets(&offsets2, *frame->GetDocument());
   EXPECT_EQ(0U, offsets2.size());
 }
 
 class StubbornTextCheckClient : public WebTextCheckClient {
  public:
   StubbornTextCheckClient() : completion_(0) {}
   virtual ~StubbornTextCheckClient() {}
 
-  virtual void RequestCheckingOfText(
-      const WebString&,
-      WebTextCheckingCompletion* completion) override {
+  void RequestCheckingOfText(const WebString&,
+                             WebTextCheckingCompletion* completion) override {
     completion_ = completion;
   }
 
   void CancelAllPendingRequests() override {
     if (!completion_)
       return;
     completion_->DidCancelCheckingText();
     completion_ = nullptr;
   }
 
@@ skipping 448 matching lines @@
       test_url, redirect_response, file_path);
 
   WebURLResponse final_response;
   final_response.SetMIMEType("text/html");
   Platform::Current()->GetURLLoaderMockFactory()->RegisterURL(
       redirect_url, final_response, file_path);
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + "first_party_redirect.html");
   EXPECT_TRUE(web_view_helper.WebView()
-                  ->MainFrame()
+                  ->MainFrameImpl()
                   ->GetDocument()
                   .FirstPartyForCookies() == redirect_url);
 }
 
 class TestNavigationPolicyWebFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
   void DidNavigateWithinPage(const WebHistoryItem&,
                              WebHistoryCommitType,
                              bool) override {
@@ skipping 22 matching lines @@
       MouseEvent::Create(nullptr, EventTypeNames::click, mouse_initializer);
   FrameLoadRequest frame_request(document, ResourceRequest(destination));
   frame_request.SetTriggeringEvent(event);
   ToLocalFrame(web_view_helper.WebView()->GetPage()->MainFrame())
       ->Loader()
       .Load(frame_request);
 }
 
 class TestNewWindowWebViewClient : public FrameTestHelpers::TestWebViewClient {
  public:
-  virtual WebView* CreateView(WebLocalFrame*,
-                              const WebURLRequest&,
-                              const WebWindowFeatures&,
-                              const WebString&,
-                              WebNavigationPolicy,
-                              bool) override {
+  WebView* CreateView(WebLocalFrame*,
+                      const WebURLRequest&,
+                      const WebWindowFeatures&,
+                      const WebString&,
+                      WebNavigationPolicy,
+                      bool) override {
     EXPECT_TRUE(false);
     return 0;
   }
 };
 
 class TestNewWindowWebFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
   TestNewWindowWebFrameClient() : decide_policy_call_count_(0) {}
 
@@ skipping 458 matching lines @@
 
   TestHistoryWebFrameClient client;
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad("about:blank", &client);
 
   WebLocalFrame* frame = web_view_helper.WebView()->MainFrameImpl();
 
   frame->ExecuteScript(WebScriptSource(WebString::FromUTF8(
       "document.body.appendChild(document.createElement('iframe'))")));
 
-  WebFrame* iframe = frame->FirstChild();
-  ASSERT_EQ(&client.ChildClient(), ToWebLocalFrameBase(iframe)->Client());
+  WebLocalFrameBase* iframe = ToWebLocalFrameBase(frame->FirstChild());
+  ASSERT_EQ(&client.ChildClient(), iframe->Client());
 
   std::string url1 = base_url_ + "history.html";
   FrameTestHelpers::LoadFrame(iframe, url1);
   EXPECT_EQ(url1, iframe->GetDocument().Url().GetString().Utf8());
   EXPECT_TRUE(client.ChildClient().ReplacesCurrentHistoryItem());
 
   std::string url2 = base_url_ + "find.html";
   FrameTestHelpers::LoadFrame(iframe, url2);
   EXPECT_EQ(url2, iframe->GetDocument().Url().GetString().Utf8());
   EXPECT_FALSE(client.ChildClient().ReplacesCurrentHistoryItem());
 }
 
 // Tests that a navigation in a frame with a non-blank initial URL will create
 // a new history item, unlike the case above.
 TEST_P(ParameterizedWebFrameTest, FirstNonBlankSubframeNavigation) {
   RegisterMockedHttpURLLoad("history.html");
   RegisterMockedHttpURLLoad("find.html");
 
   TestHistoryWebFrameClient client;
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad("about:blank", &client);
 
-  WebFrame* frame = web_view_helper.WebView()->MainFrame();
+  WebLocalFrame* frame = web_view_helper.WebView()->MainFrameImpl();

[dcheng, 2017/06/20 09:02:21]

Nit: this can just be web_view_helper.LocalMainFrame()

(Similar for other changes that introduce MainFrameImpl in this CL)

[dcheng, 2017/06/20 09:03:13]

(Of course this only applies when there's an accessible WebViewHelper)

[Łukasz Anforowicz, 2017/06/20 16:59:44]

This cleanup opportunity impacts more lines than the ones touched in the CL
under review, so I've spun off a separate CL for getting rid of unnecessary
helper.WebView()->MainFrameImpl() calls: 
https://codereview.chromium.org/2945093002.

 
   std::string url1 = base_url_ + "history.html";
   FrameTestHelpers::LoadFrame(
       frame,
       "javascript:var f = document.createElement('iframe'); "
       "f.src = '" +
           url1 +
           "';"
           "document.body.appendChild(f)");
 
-  WebFrame* iframe = frame->FirstChild();
+  WebLocalFrame* iframe = frame->FirstChild()->ToWebLocalFrame();
   EXPECT_EQ(url1, iframe->GetDocument().Url().GetString().Utf8());
 
   std::string url2 = base_url_ + "find.html";
   FrameTestHelpers::LoadFrame(iframe, url2);
   EXPECT_EQ(url2, iframe->GetDocument().Url().GetString().Utf8());
   EXPECT_FALSE(client.ChildClient().ReplacesCurrentHistoryItem());
 }
 
 // Test verifies that layout will change a layer's scrollable attibutes
 TEST_F(WebFrameTest, overflowHiddenRewrite) {
@@ skipping 1839 matching lines @@
   remote_frame->Swap(local_frame);
 
   // And the opener cycle should still be preserved.
   EXPECT_EQ(local_frame, local_frame->Opener());
 
   view->Close();
 }
 
 class CommitTypeWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
  public:
-  explicit CommitTypeWebFrameClient()
-      : history_commit_type_(kWebHistoryInertCommit) {}
+  CommitTypeWebFrameClient() : history_commit_type_(kWebHistoryInertCommit) {}
 
   void DidCommitProvisionalLoad(
       const WebHistoryItem&,
       WebHistoryCommitType history_commit_type) override {
     history_commit_type_ = history_commit_type;
   }
 
   WebHistoryCommitType HistoryCommitType() const {
     return history_commit_type_;
   }
@@ skipping 1086 matching lines @@
   local_frame->CopyImageAt(WebPoint(50, 50));
 
   EXPECT_NE(sequence, Platform::Current()->Clipboard()->SequenceNumber(
                           WebClipboard::kBufferStandard));
 
   WebImage image =
       static_cast<WebMockClipboard*>(Platform::Current()->Clipboard())
           ->ReadRawImage(WebClipboard::Buffer());
 
   EXPECT_EQ(SkColorSetARGB(255, 255, 0, 0), image.GetSkBitmap().getColor(0, 0));
-};
+}
 
 TEST_F(WebFrameTest, CopyImageAtWithPinchZoom) {
   std::string url = base_url_ + "canvas-copy-image.html";
   RegisterMockedURLLoadFromBase(base_url_, "canvas-copy-image.html");
 
   FrameTestHelpers::WebViewHelper helper;
   WebViewBase* web_view = helper.InitializeAndLoad(url);
   web_view->Resize(WebSize(400, 400));
   web_view->UpdateAllLifecyclePhases();
   web_view->SetPageScaleFactor(2);
   web_view->SetVisualViewportOffset(WebFloatPoint(200, 200));
 
   uint64_t sequence = Platform::Current()->Clipboard()->SequenceNumber(
       WebClipboard::kBufferStandard);
 
   WebLocalFrame* local_frame = web_view->MainFrameImpl();
   local_frame->CopyImageAt(WebPoint(0, 0));
 
   EXPECT_NE(sequence, Platform::Current()->Clipboard()->SequenceNumber(
                           WebClipboard::kBufferStandard));
 
   WebImage image =
       static_cast<WebMockClipboard*>(Platform::Current()->Clipboard())
           ->ReadRawImage(WebClipboard::Buffer());
 
   EXPECT_EQ(SkColorSetARGB(255, 255, 0, 0), image.GetSkBitmap().getColor(0, 0));
-};
+}
 
 TEST_F(WebFrameTest, CopyImageWithImageMap) {
   SaveImageFromDataURLWebFrameClient client;
 
   std::string url = base_url_ + "image-map.html";
   RegisterMockedURLLoadFromBase(base_url_, "image-map.html");
 
   FrameTestHelpers::WebViewHelper helper;
   WebViewBase* web_view = helper.InitializeAndLoad(url, &client);
   web_view->Resize(WebSize(400, 400));
@@ skipping 1286 matching lines @@
 
   // Verify that the right WebWidgetClient has been notified.
   EXPECT_TRUE(web_widget_client.DidShowVirtualKeyboard());
 
   remote_frame->Close();
   web_view_helper.Reset();
 }
 
 class ContextMenuWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
  public:
-  ContextMenuWebFrameClient(){};
+  ContextMenuWebFrameClient() {}
   // WebFrameClient methods
   void ShowContextMenu(const WebContextMenuData& data) override {
     menu_data_ = data;
   }
 
   WebContextMenuData GetMenuData() { return menu_data_; }
 
  private:
   WebContextMenuData menu_data_;
   DISALLOW_COPY_AND_ASSIGN(ContextMenuWebFrameClient);
@@ skipping 76 matching lines @@
 
   // Local frame with remote parent should have transparent baseBackgroundColor.
   Color color = local_frame->GetFrameView()->BaseBackgroundColor();
   EXPECT_EQ(Color::kTransparent, color);
 
   view->Close();
 }
 
 class TestFallbackWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
  public:
-  explicit TestFallbackWebFrameClient() : child_client_(nullptr) {}
+  TestFallbackWebFrameClient() : child_client_(nullptr) {}
 
   void SetChildWebFrameClient(TestFallbackWebFrameClient* client) {
     child_client_ = client;
   }
 
   WebLocalFrame* CreateChildFrame(
       WebLocalFrame* parent,
       WebTreeScopeType scope,
       const WebString&,
       const WebString&,
@@ skipping 68 matching lines @@
     if (obj->IsText()) {
       LayoutText* layout_text = ToLayoutText(obj);
       text = layout_text->GetText();
       break;
     }
   }
   EXPECT_EQ("foo alt", text.Utf8());
 }
 
 }  // namespace blink