| Index: components/autofill/content/renderer/autofill_agent.h
|
| diff --git a/components/autofill/content/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h
|
| index 5c327db41c17fead30513b9d0cec867c22a8ffdb..6ecd27320f85735a6a37f1ae5269287d26f95164 100644
|
| --- a/components/autofill/content/renderer/autofill_agent.h
|
| +++ b/components/autofill/content/renderer/autofill_agent.h
|
| @@ -18,6 +18,7 @@
|
| #include "components/autofill/core/common/forms_seen_state.h"
|
| #include "content/public/renderer/render_view_observer.h"
|
| #include "third_party/WebKit/public/web/WebAutofillClient.h"
|
| +#include "third_party/WebKit/public/web/WebFormControlElement.h"
|
| #include "third_party/WebKit/public/web/WebFormElement.h"
|
| #include "third_party/WebKit/public/web/WebInputElement.h"
|
|
|
| @@ -68,16 +69,20 @@ class AutofillAgent : public content::RenderViewObserver,
|
| virtual void OrientationChangeEvent(int orientation) OVERRIDE;
|
|
|
| // PageClickListener:
|
| - virtual void InputElementClicked(const blink::WebInputElement& element,
|
| - bool was_focused,
|
| - bool is_focused) OVERRIDE;
|
| - virtual void InputElementLostFocus() OVERRIDE;
|
| + virtual void FormControlElementClicked(
|
| + const blink::WebFormControlElement& element,
|
| + bool was_focused) OVERRIDE;
|
| + virtual void FormControlElementLostFocus() OVERRIDE;
|
|
|
| // blink::WebAutofillClient:
|
| virtual void textFieldDidEndEditing(
|
| const blink::WebInputElement& element) OVERRIDE;
|
| + // TODO(ziran.sun): To be removed once next Blink roll is done
|
| virtual void textFieldDidChange(
|
| - const blink::WebInputElement& element) OVERRIDE;
|
| + const blink::WebInputElement& element);
|
| + // TODO(ziran.sun): OVERRIDE this function once next Blink roll is done
|
| + virtual void textFieldDidChange(
|
| + const blink::WebFormControlElement& element);
|
| virtual void textFieldDidReceiveKeyDown(
|
| const blink::WebInputElement& element,
|
| const blink::WebKeyboardEvent& event) OVERRIDE;
|
| @@ -113,7 +118,7 @@ class AutofillAgent : public content::RenderViewObserver,
|
|
|
| // Called in a posted task by textFieldDidChange() to work-around a WebKit bug
|
| // http://bugs.webkit.org/show_bug.cgi?id=16976
|
| - void TextFieldDidChangeImpl(const blink::WebInputElement& element);
|
| + void TextFieldDidChangeImpl(const blink::WebFormControlElement& element);
|
|
|
| // Shows the autofill suggestions for |element|.
|
| // This call is asynchronous and may or may not lead to the showing of a
|
| @@ -129,7 +134,7 @@ class AutofillAgent : public content::RenderViewObserver,
|
| // |datalist_only| specifies whether all of <datalist> suggestions and no
|
| // autofill suggestions are shown. |autofill_on_empty_values| and
|
| // |requires_caret_at_end| are ignored if |datalist_only| is true.
|
| - void ShowSuggestions(const blink::WebInputElement& element,
|
| + void ShowSuggestions(const blink::WebFormControlElement& element,
|
| bool autofill_on_empty_values,
|
| bool requires_caret_at_end,
|
| bool display_warning_if_disabled,
|
| @@ -137,7 +142,7 @@ class AutofillAgent : public content::RenderViewObserver,
|
|
|
| // Queries the browser for Autocomplete and Autofill suggestions for the given
|
| // |element|.
|
| - void QueryAutofillSuggestions(const blink::WebInputElement& element,
|
| + void QueryAutofillSuggestions(const blink::WebFormControlElement& element,
|
| bool display_warning_if_disabled,
|
| bool datalist_only);
|
|
|
| @@ -174,7 +179,7 @@ class AutofillAgent : public content::RenderViewObserver,
|
| int autofill_query_id_;
|
|
|
| // The element corresponding to the last request sent for form field Autofill.
|
| - blink::WebInputElement element_;
|
| + blink::WebFormControlElement element_;
|
|
|
| // The form element currently requesting an interactive autocomplete.
|
| blink::WebFormElement in_flight_request_form_;
|
|
|