[refactor] Fix autofill features for payments when the form is inside an OOPIF

content/renderer/render_frame_impl.cc

 // Copyright 2013 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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 1074 matching lines @@
     return opener_frame->GetWebFrame();
 
   return nullptr;
 }
 
 blink::WebURL RenderFrameImpl::overrideFlashEmbedWithHTML(
     const blink::WebURL& url) {
   return GetContentClient()->renderer()->OverrideFlashEmbedWithHTML(url);
 }
 
+void RenderFrameImpl::didCompleteLeftMouseDownOrGestureTapInNode(

[Charlie Reis, 2017/04/05 20:13:44]

These should move down with the WebFrameClient overrides as well.

[EhsanK, 2017/04/06 21:31:28]

Done. Both for this method and the one above. Thanks!

+    const blink::WebNode& node) {
+  DCHECK(!node.isNull());
+  if (!frame_)
+    return;
+  for (auto& observer : observers_)
+    observer.DidCompleteLeftMouseDownOrGestureTapInNode(node);
+}
+
 // RenderFrameImpl ----------------------------------------------------------
 RenderFrameImpl::RenderFrameImpl(const CreateParams& params)
     : frame_(NULL),
       is_main_frame_(true),
       unique_name_helper_(this),
       in_browser_initiated_detach_(false),
       in_frame_tree_(false),
       render_view_(params.render_view),
       routing_id_(params.routing_id),
       proxy_routing_id_(MSG_ROUTING_NONE),
@@ skipping 1327 matching lines @@
   // ViewFlushedPaint regarding instances closing themselves, so we take
   // similar precautions.
   PepperPluginSet plugins = active_pepper_instances_;
   for (auto* plugin : plugins) {
     if (active_pepper_instances_.find(plugin) != active_pepper_instances_.end())
       plugin->ViewInitiatedPaint();
   }
 #endif
 }
 
+void RenderFrameImpl::DidCompleteFocusChange() {
+  if (frame_ && frame_ == render_view_->webview()->focusedFrame()) {

[Charlie Reis, 2017/04/05 20:13:44]

Can these methods be called when frame_ is null?  Many of the methods in this
class just have a DCHECK(frame_).

(Also see my question in RenderWidget about whether we can only call this for
focused frames in the first place, possibly eliminating the need for this
check.)

[EhsanK, 2017/04/06 21:31:27]

You are right. WasHidden() only calls GetWebFrame() which contains a
DCHECK(frame_). This method is similar to that (i.e., called from RenderWidget
as observer call).
Yes that would eliminate the if block, but I guess coding-wise, that changes how
things have been layered so far, in that we would have to refer to RenderView
and RenderFrame from inside RenderWidget.

+    for (auto& observer : observers_)
+      observer.DidCompleteFocusChangeInFrame();
+  }
+}
+
 RenderView* RenderFrameImpl::GetRenderView() {
   return render_view_;
 }
 
 RenderAccessibility* RenderFrameImpl::GetRenderAccessibility() {
   return render_accessibility_;
 }
 
 int RenderFrameImpl::GetRoutingID() {
   return routing_id_;
@@ skipping 4514 matching lines @@
       policy(info.defaultPolicy),
       replaces_current_history_item(info.replacesCurrentHistoryItem),
       history_navigation_in_new_child_frame(
           info.isHistoryNavigationInNewChildFrame),
       client_redirect(info.isClientRedirect),
       cache_disabled(info.isCacheDisabled),
       form(info.form),
       source_location(info.sourceLocation) {}
 
 }  // namespace content