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

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index ff49586a1752433c88bbbb7a6049b30d5b6f1f9c..f27df418ecfe2e300110b6eb1dd2ea4ac4a4a44a 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -77,6 +77,7 @@
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/scheduler/renderer/render_widget_scheduling_state.h"
 #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h"
+#include "third_party/WebKit/public/web/WebAutofillClient.h"
 #include "third_party/WebKit/public/web/WebDeviceEmulationParams.h"
 #include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebInputMethodController.h"
@@ -981,8 +982,15 @@ std::unique_ptr<cc::SwapPromise> RenderWidget::RequestCopyOfOutputForLayoutTest(
 // RenderWidgetInputHandlerDelegate
 
 void RenderWidget::FocusChangeComplete() {
-  if (owner_delegate_)
-    owner_delegate_->RenderWidgetFocusChangeComplete();
+  if (!GetWebWidget()->IsWebFrameWidget())
+    return;
+  blink::WebLocalFrame* focused =
+      static_cast<blink::WebFrameWidget*>(GetWebWidget())
+          ->LocalRoot()
+          ->View()
+          ->FocusedFrame();
+  if (focused && focused->AutofillClient())

[Charlie Reis, 2017/04/19 20:39:29]

Yeah, it feels weird here too to have RenderWidget treat autofill as a special
case in FocusChangeComplete.  But given vabr's comment about an upcoming
refactor, I won't block on it.

[EhsanK, 2017/04/20 14:17:44]

Yes it is only used for autofill client. I think it is possible to remove this
method if that is more favored but we should note that it is being called from
RenderWidgetInputHandler:
https://cs.chromium.org/chromium/src/content/renderer/input/render_widget_inp...

I am not sure about the coding style here but from the list of reference in
render_widget_input_handler.cc I assumed it is not OK to add any 'public/web'
includes since there is none there.

+    focused->AutofillClient()->DidCompleteFocusChangeInFrame();
 }
 
 bool RenderWidget::HasTouchEventHandlersAt(const gfx::Point& point) const {