diff options
| -rw-r--r-- | android_webview/renderer/aw_render_view_ext.cc | 9 | ||||
| -rw-r--r-- | components/autofill/content/renderer/form_autofill_util.cc | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc index 0f9797d..25fa971 100644 --- a/android_webview/renderer/aw_render_view_ext.cc +++ b/android_webview/renderer/aw_render_view_ext.cc @@ -27,7 +27,7 @@ #include "third_party/WebKit/public/web/WebHitTestResult.h" #include "third_party/WebKit/public/web/WebImageCache.h" #include "third_party/WebKit/public/web/WebNode.h" -#include "third_party/WebKit/public/web/WebNodeList.h" +#include "third_party/WebKit/public/web/WebNodeCollection.h" #include "third_party/WebKit/public/web/WebSecurityOrigin.h" #include "third_party/WebKit/public/web/WebView.h" #include "url/url_canon.h" @@ -58,10 +58,9 @@ blink::WebNode GetImgChild(const blink::WebNode& node) { // This implementation is incomplete (for example if is an area tag) but // matches the original WebViewClassic implementation. - blink::WebNodeList list = node.getElementsByTagName("img"); - if (list.length() > 0) - return list.item(0); - return blink::WebNode(); + blink::WebNodeCollection collection = node.getElementsByTagName("img"); + DCHECK(!collection.isNull()); + return collection.firstItem(); } bool RemovePrefixAndAssignIfMatches(const base::StringPiece& prefix, diff --git a/components/autofill/content/renderer/form_autofill_util.cc b/components/autofill/content/renderer/form_autofill_util.cc index 5d1f379..e0ed222 100644 --- a/components/autofill/content/renderer/form_autofill_util.cc +++ b/components/autofill/content/renderer/form_autofill_util.cc @@ -28,6 +28,7 @@ #include "third_party/WebKit/public/web/WebInputElement.h" #include "third_party/WebKit/public/web/WebLabelElement.h" #include "third_party/WebKit/public/web/WebNode.h" +#include "third_party/WebKit/public/web/WebNodeCollection.h" #include "third_party/WebKit/public/web/WebNodeList.h" #include "third_party/WebKit/public/web/WebOptionElement.h" #include "third_party/WebKit/public/web/WebSelectElement.h" @@ -42,6 +43,7 @@ using blink::WebFrame; using blink::WebInputElement; using blink::WebLabelElement; using blink::WebNode; +using blink::WebNodeCollection; using blink::WebNodeList; using blink::WebOptionElement; using blink::WebSelectElement; @@ -905,9 +907,11 @@ bool WebFormElementToFormData( // element's name as a key into the <name, FormFieldData> map to find the // previously created FormFieldData and set the FormFieldData's label to the // label.firstChild().nodeValue() of the label element. - WebNodeList labels = form_element.getElementsByTagName(kLabel); - for (unsigned i = 0; i < labels.length(); ++i) { - WebLabelElement label = labels.item(i).to<WebLabelElement>(); + WebNodeCollection labels = form_element.getElementsByTagName(kLabel); + DCHECK(!labels.isNull()); + for (WebNode item = labels.firstItem(); !item.isNull(); + item = labels.nextItem()) { + WebLabelElement label = item.to<WebLabelElement>(); WebFormControlElement field_element = label.correspondingControl().to<WebFormControlElement>(); |