Update android WebView to use WebElementCollection instead of WebNode…

…Collection

Update android WebView to use WebElementCollection instead of WebNodeCollection.
After Blink r166411 and r166500, WebNodeCollection is renamed to
WebElementCollection and its API returns WebElements instead of WebNodes.

The new code is clearer and avoids an unnecessary isElementNode() check.

Review URL: https://codereview.chromium.org/149313005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250284 0039d316-1c4b-4281-b951-d872f2087c98

android_webview/renderer/aw_render_view_ext.cc

@@ -23,11 +23,11 @@
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
+#include "third_party/WebKit/public/web/WebElementCollection.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #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/WebNodeCollection.h"
 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "url/url_canon.h"
@@ -54,11 +54,11 @@ GURL GetAbsoluteSrcUrl(const blink::WebElement& element) {
   return GetAbsoluteUrl(element, element.getAttribute("src"));
 }
 
-blink::WebNode GetImgChild(const blink::WebNode& node) {
+blink::WebElement GetImgChild(const blink::WebElement& element) {
   // This implementation is incomplete (for example if is an area tag) but
   // matches the original WebViewClassic implementation.
 
-  blink::WebNodeCollection collection = node.getElementsByTagName("img");
+  blink::WebElementCollection collection = element.getElementsByTagName("img");
   DCHECK(!collection.isNull());
   return collection.firstItem();
 }
@@ -261,10 +261,10 @@ void AwRenderViewExt::FocusedNodeChanged(const blink::WebNode& node) {
     absolute_link_url = GetAbsoluteUrl(node, data.href);
 
   GURL absolute_image_url;
-  const blink::WebNode child_img = GetImgChild(node);
-  if (!child_img.isNull() && child_img.isElementNode()) {
+  const blink::WebElement child_img = GetImgChild(element);
+  if (!child_img.isNull()) {
     absolute_image_url =
-        GetAbsoluteSrcUrl(child_img.toConst<blink::WebElement>());
+        GetAbsoluteSrcUrl(child_img);
   }
 
   PopulateHitTestData(absolute_link_url,