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

Source/web/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * 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.
@@ skipping 787 matching lines @@
     return m_webView->requestPointerUnlock();
 }
 
 void ChromeClientImpl::annotatedRegionsChanged()
 {
     WebViewClient* client = m_webView->client();
     if (client)
         client->draggableRegionsChanged();
 }
 
+// FIXME: remove.
 void ChromeClientImpl::didAssociateFormControls(const WillBeHeapVector<RefPtrWillBeMember<Element> >& elements)
 {
     if (m_webView->autofillClient())
         m_webView->autofillClient()->didAssociateFormControls(elements);
 }
 
+void ChromeClientImpl::didAssociateFormControls(const WillBeHeapVector<RefPtrWillBeMember<Element> >& elements, LocalFrame* frame)
+{
+    WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(frame);
+    if (webframe->autofillClient())
+        webframe->autofillClient()->didAssociateFormControls(elements);

[Mike West, 2014/11/19 10:27:45]

If you add an `else if (m_webView->autofillClient())` here, I believe you can
get rid of the existing method entirely. Same thing you do below.

[Evan Stade, 2014/11/19 22:16:41]

Done.

+}
+
 void ChromeClientImpl::didCancelCompositionOnSelectionChange()
 {
     if (m_webView->client())
         m_webView->client()->didCancelCompositionOnSelectionChange();
 }
 
 void ChromeClientImpl::willSetInputMethodState()
 {
     if (m_webView->client())
         m_webView->client()->resetInputMethod();
 }
 
 void ChromeClientImpl::didUpdateTextOfFocusedElementByNonUserInput()
 {
     if (m_webView->client())
         m_webView->client()->didUpdateTextOfFocusedElementByNonUserInput();
 }
 
 void ChromeClientImpl::showImeIfNeeded()
 {
     if (m_webView->client())
         m_webView->client()->showImeIfNeeded();
 }
 
 void ChromeClientImpl::handleKeyboardEventOnTextField(HTMLInputElement& inputElement, KeyboardEvent& event)
 {
-    if (!m_webView->autofillClient())
-        return;
-    m_webView->autofillClient()->textFieldDidReceiveKeyDown(WebInputElement(&inputElement), WebKeyboardEventBuilder(event));
+    // FIXME: remove.

[Mike West, 2014/11/19 10:27:45]

Can you add a link to the bug here and elsewhere so that it's clear when and why
this should be removed?

[Evan Stade, 2014/11/19 22:16:41]

Done.

+    if (m_webView->autofillClient())
+        m_webView->autofillClient()->textFieldDidReceiveKeyDown(WebInputElement(&inputElement), WebKeyboardEventBuilder(event));
+    WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(inputElement.document().frame());
+    if (webframe->autofillClient())
+        webframe->autofillClient()->textFieldDidReceiveKeyDown(WebInputElement(&inputElement), WebKeyboardEventBuilder(event));
 }
 
 void ChromeClientImpl::didChangeValueInTextField(HTMLFormControlElement& element)
 {
-    if (!m_webView->autofillClient())
-        return;
-    m_webView->autofillClient()->textFieldDidChange(WebFormControlElement(&element));
+    // FIXME: remove.
+    if (m_webView->autofillClient())
+        m_webView->autofillClient()->textFieldDidChange(WebFormControlElement(&element));
+    WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(element.document().frame());
+    if (webframe->autofillClient())
+        webframe->autofillClient()->textFieldDidChange(WebFormControlElement(&element));
 }
 
 void ChromeClientImpl::didEndEditingOnTextField(HTMLInputElement& inputElement)
 {
+    // FIXME: remove.
     if (m_webView->autofillClient())
         m_webView->autofillClient()->textFieldDidEndEditing(WebInputElement(&inputElement));
+    WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(inputElement.document().frame());
+    if (webframe->autofillClient())
+        webframe->autofillClient()->textFieldDidEndEditing(WebInputElement(&inputElement));
 }
 
 void ChromeClientImpl::openTextDataListChooser(HTMLInputElement& input)
 {
+    // FIXME: remove.
     if (m_webView->autofillClient())
         m_webView->autofillClient()->openTextDataListChooser(WebInputElement(&input));
+    WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(input.document().frame());
+    if (webframe->autofillClient())
+        webframe->autofillClient()->openTextDataListChooser(WebInputElement(&input));
 }
 
 } // namespace blink