Move GetDocument method from WebFrame to WebLocalFrame.

android_webview/renderer/aw_render_frame_ext.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/common/render_view_messages.h"
 #include "android_webview/renderer/aw_render_frame_ext.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/render_frame.h"
@@ skipping 168 matching lines @@
                         OnResetScrollAndScaleState)
     IPC_MESSAGE_HANDLER(AwViewMsg_SetInitialPageScale, OnSetInitialPageScale)
     IPC_MESSAGE_HANDLER(AwViewMsg_SetBackgroundColor, OnSetBackgroundColor)
     IPC_MESSAGE_HANDLER(AwViewMsg_SmoothScroll, OnSmoothScroll)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void AwRenderFrameExt::OnDocumentHasImagesRequest(uint32_t id) {
-  bool hasImages = false;
-  blink::WebView* webview = GetWebView();
-  if (webview) {
-    blink::WebDocument document = webview->MainFrame()->GetDocument();
-    const blink::WebElement child_img = GetImgChild(document);
-    hasImages = !child_img.IsNull();
-  }
-  Send(
-      new AwViewHostMsg_DocumentHasImagesResponse(routing_id(), id, hasImages));
+  blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
+
+  // AwViewMsg_DocumentHasImages should only be sent to the main frame.
+  DCHECK(frame && !frame->Parent());

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

1) AwRenderFrameExt is a RenderFrameObserver
2) AwViewMsg_DocumentHasImages is only sent to the main frame (see
AwRenderViewHostExt::DocumentHasImages)

Therefore, rather than look at GetWebView->MainFrame(), after this CL we just
look at render_frame()->GetWebFrame() and assert that this is a main frame.

PS. I guess the IPC name should be spelled Av*Frame*Msg_DocumentHasImages.  I'd
rather not do it in this CL (because this is slightly complicated -
AwRenderFrameExt is a RenderFrameObserver, *but* some of the IPCs have clearly a
view scope [e.g. AwViewMsg_SetTextZoomFactor]).

+
+  const blink::WebElement child_img = GetImgChild(frame->GetDocument());
+  bool has_images = !child_img.IsNull();
+
+  Send(new AwViewHostMsg_DocumentHasImagesResponse(routing_id(), id,
+                                                   has_images));
 }
 
 void AwRenderFrameExt::FocusedNodeChanged(const blink::WebNode& node) {
   if (node.IsNull() || !node.IsElementNode() || !render_frame() ||
       !render_frame()->GetRenderView())
     return;
 
   const blink::WebElement element = node.ToConst<blink::WebElement>();
   AwHitTestData data;
 
@@ skipping 97 matching lines @@
     return nullptr;
 
   return render_frame()->GetRenderView()->GetWebFrameWidget();
 }
 
 void AwRenderFrameExt::OnDestruct() {
   delete this;
 }
 
 }  // namespace android_webview