Refactor Autofill for OOPIF, step 1: add autofillClient to WebLocalFrame

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2020 matching lines @@
         return EventTypeNames::touchend;
     case WebInputEvent::TouchCancel:
         return EventTypeNames::touchcancel;
     default:
         return String("unknown");
     }
 }
 
 bool WebViewImpl::handleInputEvent(const WebInputEvent& inputEvent)
 {
-    UserGestureNotifier notifier(m_autofillClient, &m_userGestureObserved);
+    WebAutofillClient* autofillClient = m_autofillClient ? m_autofillClient :
+        mainFrameImpl() ? mainFrameImpl()->autofillClient() : 0;
+    UserGestureNotifier notifier(autofillClient, &m_userGestureObserved);
     // On the first input event since page load, |notifier| instructs the
     // autofill client to unblock values of password input fields of any forms
     // on the page. There is a single input event, GestureTap, which can both
     // be the first event after page load, and cause a form submission. In that
     // case, the form submission happens before the autofill client is told
     // to unblock the password values, and so the password values are not
     // submitted. To avoid that, GestureTap is handled explicitly:
-    if (inputEvent.type == WebInputEvent::GestureTap && m_autofillClient) {
+    if (inputEvent.type == WebInputEvent::GestureTap && autofillClient) {
         m_userGestureObserved = true;
-        m_autofillClient->firstUserGestureObserved();
+        autofillClient->firstUserGestureObserved();
     }
 
     TRACE_EVENT1("input", "WebViewImpl::handleInputEvent", "type", inputTypeToName(inputEvent.type).ascii());
     // If we've started a drag and drop operation, ignore input events until
     // we're done.
     if (m_doingDragAndDrop)
         return true;
 
     if (m_devToolsAgent && m_devToolsAgent->handleInputEvent(m_page.get(), inputEvent))
         return true;
 
     // Report the event to be NOT processed by WebKit, so that the browser can handle it appropriately.
     if (m_ignoreInputEvents)
         return false;
 
     TemporaryChange<const WebInputEvent*> currentEventChange(m_currentInputEvent, &inputEvent);
 
     if (isPointerLocked() && WebInputEvent::isMouseEventType(inputEvent.type)) {
-      pointerLockMouseEvent(inputEvent);
-      return true;
+        pointerLockMouseEvent(inputEvent);
+        return true;
     }
 
     if (m_mouseCaptureNode && WebInputEvent::isMouseEventType(inputEvent.type)) {
         TRACE_EVENT1("input", "captured mouse event", "type", inputEvent.type);
         // Save m_mouseCaptureNode since mouseCaptureLost() will clear it.
         RefPtrWillBeRawPtr<Node> node = m_mouseCaptureNode;
 
         // Not all platforms call mouseCaptureLost() directly.
         if (inputEvent.type == WebInputEvent::MouseUp)
             mouseCaptureLost();
@@ skipping 78 matching lines @@
 
         LocalFrame* frame = m_page->mainFrame() && m_page->mainFrame()->isLocalFrame()
             ? m_page->deprecatedLocalMainFrame() : 0;
         if (!frame)
             return;
 
         RefPtrWillBeRawPtr<Frame> focusedFrame = m_page->focusController().focusedFrame();
         if (focusedFrame && focusedFrame->isLocalFrame()) {
             // Finish an ongoing composition to delete the composition node.
             if (toLocalFrame(focusedFrame.get())->inputMethodController().hasComposition()) {
-                if (m_autofillClient)
-                    m_autofillClient->setIgnoreTextChanges(true);
+                WebAutofillClient* autofillClient = m_autofillClient ? m_autofillClient :
+                    WebLocalFrameImpl::fromFrame(toLocalFrame(focusedFrame.get()))->autofillClient();
+
+                if (autofillClient)
+                    autofillClient->setIgnoreTextChanges(true);
 
                 toLocalFrame(focusedFrame.get())->inputMethodController().confirmComposition();
 
-                if (m_autofillClient)
-                    m_autofillClient->setIgnoreTextChanges(false);
+                if (autofillClient)
+                    autofillClient->setIgnoreTextChanges(false);
             }
             m_imeAcceptEvents = false;
         }
     }
 }
 
 bool WebViewImpl::setComposition(
     const WebString& text,
     const WebVector<WebCompositionUnderline>& underlines,
     int selectionStart,
@@ skipping 1374 matching lines @@
     m_dragOperation = WebDragOperationNone;
     m_currentDragData = nullptr;
 }
 
 void WebViewImpl::dragTargetDrop(const WebPoint& clientPoint,
                                  const WebPoint& screenPoint,
                                  int keyModifiers)
 {
     ASSERT(m_currentDragData);
 
-    UserGestureNotifier notifier(m_autofillClient, &m_userGestureObserved);
+    WebAutofillClient* autofillClient =  m_autofillClient ? m_autofillClient :
+        mainFrameImpl() ? mainFrameImpl()->autofillClient() : 0;
+    UserGestureNotifier notifier(autofillClient, &m_userGestureObserved);
 
     // If this webview transitions from the "drop accepting" state to the "not
     // accepting" state, then our IPC message reply indicating that may be in-
     // flight, or else delayed by javascript processing in this webview.  If a
     // drop happens before our IPC reply has reached the browser process, then
     // the browser forwards the drop to this webview.  So only allow a drop to
     // proceed if our webview m_dragOperation state is not DragOperationNone.
 
     if (m_dragOperation == WebDragOperationNone) { // IPC RACE CONDITION: do not allow this drop.
         dragTargetDragLeave();
@@ skipping 931 matching lines @@
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 void WebViewImpl::forceNextWebGLContextCreationToFail()
 {
     WebGLRenderingContext::forceNextWebGLContextCreationToFail();
 }
 
 } // namespace blink