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

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 7d6113cf65bf6f2f7270097e668eff44b6c7feb7..b7af238138e57dad5913ced27efa9ac7c90b3904 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -130,6 +130,7 @@
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/public_features.h"
 #include "third_party/WebKit/public/web/WebAXObject.h"
+#include "third_party/WebKit/public/web/WebAutofillClient.h"
 #include "third_party/WebKit/public/web/WebColorSuggestion.h"
 #include "third_party/WebKit/public/web/WebDOMEvent.h"
 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h"
@@ -1169,11 +1170,6 @@ void RenderViewImpl::TransferActiveWheelFlingAnimation(
 
 // RenderWidgetInputHandlerDelegate -----------------------------------------
 
-void RenderViewImpl::RenderWidgetFocusChangeComplete() {
-  for (auto& observer : observers_)
-    observer.FocusChangeComplete();
-}
-
 bool RenderViewImpl::DoesRenderWidgetHaveTouchEventHandlersAt(
     const gfx::Point& point) const {
   if (!webview())
@@ -1312,9 +1308,13 @@ void RenderViewImpl::OnMoveCaret(const gfx::Point& point) {
 
 void RenderViewImpl::OnScrollFocusedEditableNodeIntoRect(
     const gfx::Rect& rect) {
+  blink::WebAutofillClient* autofill_client = nullptr;
+  if (auto* focused_frame = GetWebView()->FocusedFrame())
+    autofill_client = focused_frame->AutofillClient();
+
   if (has_scrolled_focused_editable_node_into_rect_ &&
-      rect == rect_for_scrolled_focused_editable_node_) {
-    GetWidget()->FocusChangeComplete();
+      rect == rect_for_scrolled_focused_editable_node_ && autofill_client) {
+    autofill_client->DidCompleteFocusChangeInFrame();

[dcheng, 2017/04/18 04:41:50]

It seems a bit awkward that we're in content, but we need to call back down into
Blink, to call back up into the autofill code. I don't really have a better
suggestion at the moment, but this doesn't seem quite right either.

[vabr (Chromium), 2017/04/18 07:17:02]

I don't immediately see a better option now, and I have one reason against
worrying about this :) -- we have two big refactorings planned for autofill
content layer: one being part of Blink Onion Soup, which will move a lot of
stuff inside Blink, and pushing the rest to the browser process. This will leave
autofill's content layer likely empty, and the call here, if it survives, will
end up either really calling Blink, or talking to browser via Mojo.

[EhsanK, 2017/04/18 17:55:19]

I am not quite sure. There is no apparent content/ interface which represents
the AutofillAgent so either the blink object or a Render(Frame|View)Observer
call seemed to be the way. I think as vabr@ suggested a forthcoming refactoring
should solve this problem;perhaps by moving the logic for
DidCompleteFocusChangeInFrame() from component/ to blink/.
On a separate note, this method (OnScrollFocusedEditable...) needs some fixing
to support OOPIFs as well (currently a blocker for TDI). I believe this is never
called on an OOPIF right now. I don't know what the design for that would look
like, but I guess it might be possible to directly call the autofill agent about
this completion as well.

     return;
   }
 
@@ -1323,8 +1323,8 @@ void RenderViewImpl::OnScrollFocusedEditableNodeIntoRect(
 
   rect_for_scrolled_focused_editable_node_ = rect;
   has_scrolled_focused_editable_node_into_rect_ = true;
-  if (!compositor()->HasPendingPageScaleAnimation())
-    GetWidget()->FocusChangeComplete();
+  if (!compositor()->HasPendingPageScaleAnimation() && autofill_client)
+    autofill_client->DidCompleteFocusChangeInFrame();
 }
 
 void RenderViewImpl::OnSetHistoryOffsetAndLength(int history_offset,
@@ -1803,10 +1803,6 @@ void RenderViewImpl::Show(WebNavigationPolicy policy) {
   RenderWidget::Show(policy);
 }
 
-void RenderViewImpl::OnMouseDown(const WebNode& mouse_down_node) {
-  for (auto& observer : observers_)
-    observer.OnMouseDown(mouse_down_node);
-}
 
 bool RenderViewImpl::CanHandleGestureEvent() {
   return true;
@@ -2327,7 +2323,10 @@ void RenderViewImpl::SetFocus(bool enable) {
 }
 
 void RenderViewImpl::DidCompletePageScaleAnimation() {
-  GetWidget()->FocusChangeComplete();
+  if (auto* focused_frame = GetWebView()->FocusedFrame()) {
+    if (focused_frame->AutofillClient())
+      focused_frame->AutofillClient()->DidCompleteFocusChangeInFrame();
+  }
 }
 
 void RenderViewImpl::OnDeviceScaleFactorChanged() {