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

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <memory>
 
@@ skipping 112 matching lines @@
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #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"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebDateTimeChooserCompletion.h"
 #include "third_party/WebKit/public/web/WebDateTimeChooserParams.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFileChooserParams.h"
 #include "third_party/WebKit/public/web/WebFormControlElement.h"
@@ skipping 1019 matching lines @@
 #endif  // ENABLE_PLUGINS
 
 void RenderViewImpl::TransferActiveWheelFlingAnimation(
     const blink::WebActiveWheelFlingParameters& params) {
   if (webview())
     webview()->TransferActiveWheelFlingAnimation(params);
 }
 
 // RenderWidgetInputHandlerDelegate -----------------------------------------
 
-void RenderViewImpl::RenderWidgetFocusChangeComplete() {
-  for (auto& observer : observers_)
-    observer.FocusChangeComplete();
-}
-
 bool RenderViewImpl::DoesRenderWidgetHaveTouchEventHandlersAt(
     const gfx::Point& point) const {
   if (!webview())
     return false;
   return webview()->HasTouchEventHandlersAt(point);
 }
 
 bool RenderViewImpl::RenderWidgetWillHandleMouseEvent(
     const blink::WebMouseEvent& event) {
   // If the mouse is locked, only the current owner of the mouse lock can
@@ skipping 118 matching lines @@
   if (!webview())
     return;
 
   Send(new InputHostMsg_MoveCaret_ACK(GetRoutingID()));
   webview()->FocusedFrame()->MoveCaretSelection(
       ConvertWindowPointToViewport(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();
     return;
   }
 
   if (!webview()->ScrollFocusedEditableElementIntoRect(rect))
     return;
 
   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,
                                                  int history_length) {
   DCHECK_GE(history_offset, -1);
   DCHECK_GE(history_length, 0);
 
   history_list_offset_ = history_offset;
   history_list_length_ = history_length;
 }
@@ skipping 458 matching lines @@
 void RenderViewImpl::Show(WebNavigationPolicy policy) {
   if (did_show_ && !webkit_preferences_.supports_multiple_windows) {
     // When supports_multiple_windows is disabled, popups are reusing
     // the same view. In some scenarios, this makes WebKit to call show() twice.
     return;
   }
 
   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;
 }
 
 bool RenderViewImpl::CanUpdateLayout() {
   return true;
 }
 
 void RenderViewImpl::DidHandleGestureEvent(const WebGestureEvent& event,
@@ skipping 500 matching lines @@
 
 void RenderViewImpl::SetFocus(bool enable) {
   RenderWidget::OnSetFocus(enable);
 
   // Notify all BrowserPlugins of the RenderView's focus state.
   if (BrowserPluginManager::Get())
     BrowserPluginManager::Get()->UpdateFocusState();
 }
 
 void RenderViewImpl::DidCompletePageScaleAnimation() {
-  GetWidget()->FocusChangeComplete();
+  if (auto* focused_frame = GetWebView()->FocusedFrame()) {
+    if (focused_frame->AutofillClient())
+      focused_frame->AutofillClient()->DidCompleteFocusChangeInFrame();
+  }
 }
 
 void RenderViewImpl::OnDeviceScaleFactorChanged() {
   RenderWidget::OnDeviceScaleFactorChanged();
   UpdateWebViewWithDeviceScaleFactor();
   if (auto_resize_mode_)
     AutoResizeCompositor();
 }
 
 void RenderViewImpl::SetScreenMetricsEmulationParameters(
@@ skipping 333 matching lines @@
                             INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
   }
 
   std::unique_ptr<InputEventAck> ack(new InputEventAck(
       InputEventAckSource::MAIN_THREAD, input_event->GetType(),
       INPUT_EVENT_ACK_STATE_NOT_CONSUMED));
   OnInputEventAck(std::move(ack));
 }
 
 }  // namespace content