diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 23:06:12 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-07 23:06:12 +0000 |
| commit | 10cd3f49ceb4c26d270902bd0ba27cd9b0bb1187 (patch) | |
| tree | 4f075dfe41c0762e169d47c2c13230c9f9d0f0cc | |
| parent | a762c8eed73365dedf4998389702c9c089237de5 (diff) | |
| download | chromium_src-10cd3f49ceb4c26d270902bd0ba27cd9b0bb1187.zip chromium_src-10cd3f49ceb4c26d270902bd0ba27cd9b0bb1187.tar.gz chromium_src-10cd3f49ceb4c26d270902bd0ba27cd9b0bb1187.tar.bz2 | |
WebKit Merge 43361:43371, Chromium side.
R=darin
BUG=0
TEST=0
Review URL: http://codereview.chromium.org/113127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15592 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/build/WebCore/WebCore.vcproj | 16 | ||||
| -rw-r--r-- | webkit/glue/autofill_form.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/editor_client_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/password_form_dom_manager.cc | 4 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 4 |
7 files changed, 7 insertions, 27 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "43361", + "webkit_revision": "43371", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@243", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@15588", + "/trunk/deps/third_party/WebKit@15591", "src/third_party/icu38": "/trunk/deps/third_party/icu38@13472", diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 49d5dc0..215e846 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@43361
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@43371
\ No newline at end of file diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj index 9156de2..1fe36b7 100644 --- a/webkit/build/WebCore/WebCore.vcproj +++ b/webkit/build/WebCore/WebCore.vcproj @@ -4589,22 +4589,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElement.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElement.h" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElementWithState.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\dom\FormControlElementWithState.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\dom\InputElement.cpp" > </File> diff --git a/webkit/glue/autofill_form.cc b/webkit/glue/autofill_form.cc index d6988bd..ff0725c 100644 --- a/webkit/glue/autofill_form.cc +++ b/webkit/glue/autofill_form.cc @@ -51,7 +51,7 @@ AutofillForm* AutofillForm::CreateAutofillForm( WebCore::HTMLInputElement* input_element = static_cast<WebCore::HTMLInputElement*>(form_element); - if (!input_element->isEnabled()) + if (!input_element->isEnabledFormControl()) continue; // Ignore all input types except TEXT. diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc index 517ad6a..6f952b6 100644 --- a/webkit/glue/editor_client_impl.cc +++ b/webkit/glue/editor_client_impl.cc @@ -712,7 +712,7 @@ bool EditorClientImpl::Autofill(WebCore::HTMLInputElement* input_element, autofill_factory_.RevokeAll(); // Let's try to trigger autofill for that field, if applicable. - if (!input_element->isEnabled() || !input_element->isTextField() || + if (!input_element->isEnabledFormControl() || !input_element->isTextField() || input_element->isPasswordField() || !input_element->autoComplete()) { return false; } diff --git a/webkit/glue/password_form_dom_manager.cc b/webkit/glue/password_form_dom_manager.cc index b6925d2..fb99302 100644 --- a/webkit/glue/password_form_dom_manager.cc +++ b/webkit/glue/password_form_dom_manager.cc @@ -192,7 +192,7 @@ void PasswordFormDomManager::FindPasswordFormFields( WebCore::HTMLInputElement* input_element = static_cast<WebCore::HTMLInputElement*>(form_element); - if (!input_element->isEnabled()) + if (!input_element->isEnabledFormControl()) continue; if ((fields->passwords.size() < kMaxPasswords) && @@ -213,7 +213,7 @@ void PasswordFormDomManager::FindPasswordFormFields( WebCore::HTMLInputElement* input_element = static_cast<WebCore::HTMLInputElement*>(form_element); - if (!input_element->isEnabled()) + if (!input_element->isEnabledFormControl()) continue; if ((input_element->inputType() == WebCore::HTMLInputElement::TEXT) && diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 000a6ac..fd10c85 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -1351,10 +1351,6 @@ '../third_party/WebKit/WebCore/dom/ExceptionBase.h', '../third_party/WebKit/WebCore/dom/ExceptionCode.cpp', '../third_party/WebKit/WebCore/dom/ExceptionCode.h', - '../third_party/WebKit/WebCore/dom/FormControlElement.cpp', - '../third_party/WebKit/WebCore/dom/FormControlElement.h', - '../third_party/WebKit/WebCore/dom/FormControlElementWithState.cpp', - '../third_party/WebKit/WebCore/dom/FormControlElementWithState.h', '../third_party/WebKit/WebCore/dom/InputElement.cpp', '../third_party/WebKit/WebCore/dom/InputElement.h', '../third_party/WebKit/WebCore/dom/KeyboardEvent.cpp', |