Refactor Autofill for OOPIF

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 317 matching lines @@
 }
 
 void WebViewImpl::setMainFrame(WebFrame* frame)
 {
     if (frame->isWebLocalFrame())
         toWebLocalFrameImpl(frame)->initializeCoreFrame(&page()->frameHost(), 0, nullAtom, nullAtom);
     else
         toWebRemoteFrameImpl(frame)->initializeCoreFrame(&page()->frameHost(), 0, nullAtom);
 }
 
-void WebViewImpl::setAutofillClient(WebAutofillClient* autofillClient)
-{
-    m_autofillClient = autofillClient;
-}
-
 void WebViewImpl::setCredentialManagerClient(WebCredentialManagerClient* webCredentialManagerClient)
 {
     ASSERT(m_page);
     provideCredentialManagerClientTo(*m_page, new CredentialManagerClient(webCredentialManagerClient));
 }
 
 void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient)
 {
     if (devToolsClient)
         m_devToolsAgent = adoptPtr(new WebDevToolsAgentImpl(this, devToolsClient));
     else
         m_devToolsAgent.clear();
 }
 
 void WebViewImpl::setPrerendererClient(WebPrerendererClient* prerendererClient)
 {
     ASSERT(m_page);
     providePrerendererClientTo(*m_page, new PrerendererClientImpl(prerendererClient));
 }
 
 void WebViewImpl::setSpellCheckClient(WebSpellCheckClient* spellCheckClient)
 {
     m_spellCheckClient = spellCheckClient;
 }
 
 WebViewImpl::WebViewImpl(WebViewClient* client)
     : m_client(client)
-    , m_autofillClient(0)
     , m_spellCheckClient(0)
     , m_chromeClientImpl(this)
     , m_contextMenuClientImpl(this)
     , m_dragClientImpl(this)
     , m_editorClientImpl(this)
     , m_inspectorClientImpl(this)
     , m_spellCheckerClientImpl(this)
     , m_storageClientImpl(this)
     , m_shouldAutoResize(false)
     , m_zoomLevel(0)
@@ skipping 1650 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 = 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;
@@ skipping 98 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);
+                WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(toLocalFrame(focusedFrame.get()));
+                if (webframe->autofillClient())
+                    webframe->autofillClient()->setIgnoreTextChanges(true);
 
                 toLocalFrame(focusedFrame.get())->inputMethodController().confirmComposition();
 
-                if (m_autofillClient)
-                    m_autofillClient->setIgnoreTextChanges(false);
+                if (webframe->autofillClient())
+                    webframe->autofillClient()->setIgnoreTextChanges(false);
             }
             m_imeAcceptEvents = false;
         }
     }
 }
 
 bool WebViewImpl::setComposition(
     const WebString& text,
     const WebVector<WebCompositionUnderline>& underlines,
     int selectionStart,
@@ skipping 1361 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);
+    UserGestureNotifier notifier(mainFrameImpl() ? mainFrameImpl()->autofillClient() : 0, &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