From ba15e2278b62f3c1df84f0e8ed9e2a536b7b5c5e Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 7 Jan 2011 15:15:00 +0000 Subject: [PATCH] Merge Chromium at 9.0.597.55: Merge r67192 See http://src.chromium.org/viewvc/chrome?view=rev&revision=67192 Change-Id: Ia1a391a9e7634e86e5c3166349befc47841b570e --- WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp | 6 ++++-- WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.h | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp b/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp index 7de8308ea..1ba42b8ea 100644 --- a/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp +++ b/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp @@ -616,7 +616,7 @@ bool FormManager::ClearFormWithNode(Node* node) { return true; } -bool FormManager::ClearPreviewedFormWithNode(Node* node) { +bool FormManager::ClearPreviewedFormWithNode(Node* node, bool was_autofilled) { FormElement* form_element = NULL; if (!FindCachedFormElementWithNode(node, &form_element)) return false; @@ -649,8 +649,10 @@ bool FormManager::ClearPreviewedFormWithNode(Node* node) { // Call |setValue()| to force the renderer to update the field's displayed // value. input_element->setValue(input_element->value()); + input_element->setAutofilled(was_autofilled); + } else { + input_element->setAutofilled(false); } - input_element->setAutofilled(false); // Clearing the suggested value in the focused node (above) can cause // selection to be lost. We force selection range to restore the text diff --git a/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.h b/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.h index eed396303..e84498178 100644 --- a/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.h +++ b/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.h @@ -122,9 +122,10 @@ public: bool ClearFormWithNode(Node* node); // Clears the placeholder values and the auto-filled background for any fields - // in the form containing |node| that have been previewed. Returns false if - // the form is not found. - bool ClearPreviewedFormWithNode(Node* node); + // in the form containing |node| that have been previewed. Resets the + // autofilled state of |node| to |was_autofilled|. Returns false if the form + // is not found. + bool ClearPreviewedFormWithNode(Node* node, bool was_autofilled); // Resets the stored set of forms. void Reset(); -- 2.11.0