diff options
| author | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-17 19:10:55 +0000 |
|---|---|---|
| committer | mbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-17 19:10:55 +0000 |
| commit | 762ec957bb973eb4039061ff3d1d423090311835 (patch) | |
| tree | f8a7fcafb901f654c049a249d32c3d93056702f0 /webkit | |
| parent | e0bba9950b1b2ff97835d6687a300944bd80520a (diff) | |
| download | chromium_src-762ec957bb973eb4039061ff3d1d423090311835.zip chromium_src-762ec957bb973eb4039061ff3d1d423090311835.tar.gz chromium_src-762ec957bb973eb4039061ff3d1d423090311835.tar.bz2 | |
Catch up with webkit change which removes id() from the HTMLElement
and instead accesses the attributes directly.
BUG=none
TEST=none
TBR=jparent
Review URL: http://codereview.chromium.org/172053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/autofill_form.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/dom_operations.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/editor_client_impl.cc | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/webkit/glue/autofill_form.cc b/webkit/glue/autofill_form.cc index e484716..976d494 100644 --- a/webkit/glue/autofill_form.cc +++ b/webkit/glue/autofill_form.cc @@ -81,7 +81,7 @@ std::wstring AutofillForm::GetNameForInputElement(WebCore::HTMLInputElement* if (trimmed_name.length() > 0) return trimmed_name; - name = StringToStdWString(element->id()); + name = StringToStdWString(element->getAttribute(WebCore::HTMLNames::idAttr)); TrimWhitespace(name, TRIM_LEADING, &trimmed_name); if (trimmed_name.length() > 0) return trimmed_name; diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc index c05cdf7..4a826fb 100644 --- a/webkit/glue/dom_operations.cc +++ b/webkit/glue/dom_operations.cc @@ -202,7 +202,8 @@ static bool FillFormToUploadFileImpl(WebCore::HTMLFormElement* fe, static_cast<WebCore::HTMLInputElement*>(elements->item(i)); std::wstring name = StringToStdWString(ie->name()); - std::wstring id = StringToStdWString(ie->id()); + std::wstring id = StringToStdWString( + ie->getAttribute(WebCore::HTMLNames::idAttr)); if (!file_found && ie->inputType() == WebCore::HTMLInputElement::FILE && @@ -269,7 +270,8 @@ bool FillFormToUploadFile(WebView* view, const FileUploadData& data) { WebCore::HTMLFormElement* fe = static_cast<WebCore::HTMLFormElement*>(forms->item(i)); std::wstring name = StringToStdWString(fe->name()); - std::wstring id = StringToStdWString(fe->id()); + std::wstring id = StringToStdWString( + fe->getAttribute(WebCore::HTMLNames::idAttr)); if (data.form_name.empty() || id == data.form_name || name == data.form_name) { if (FillFormToUploadFileImpl(fe, data)) diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc index 9a6e950..22ab39d 100644 --- a/webkit/glue/editor_client_impl.cc +++ b/webkit/glue/editor_client_impl.cc @@ -96,7 +96,7 @@ bool EditorClientImpl::shouldShowDeleteInterface(WebCore::HTMLElement* elem) { // it if in testing mode and the test specifically requests it by using this // magic class name. return WebKit::layoutTestMode() && - elem->className() == "needsDeletionUI"; + elem->getAttribute(WebCore::HTMLNames::classAttr) == "needsDeletionUI"; } bool EditorClientImpl::smartInsertDeleteEnabled() { |