Rename WebKit namespace to blink (part 5)

android_webview/renderer/aw_render_view_ext.cc

Index: android_webview/renderer/aw_render_view_ext.cc
diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc
index 5a110d7567cedc43bf3be94841499d69cba637f7..f8061154c2d69930364260022837483ba568a67d 100644
--- a/android_webview/renderer/aw_render_view_ext.cc
+++ b/android_webview/renderer/aw_render_view_ext.cc
@@ -37,7 +37,7 @@ namespace android_webview {
 
 namespace {
 
-bool AllowMixedContent(const WebKit::WebURL& url) {
+bool AllowMixedContent(const blink::WebURL& url) {
   // We treat non-standard schemes as "secure" in the WebView to allow them to
   // be used for request interception.
   // TODO(benm): Tighten this restriction by requiring embedders to register
@@ -46,30 +46,30 @@ bool AllowMixedContent(const WebKit::WebURL& url) {
   return !gurl.IsStandard();
 }
 
-GURL GetAbsoluteUrl(const WebKit::WebNode& node, const string16& url_fragment) {
+GURL GetAbsoluteUrl(const blink::WebNode& node, const string16& url_fragment) {
   return GURL(node.document().completeURL(url_fragment));
 }
 
-string16 GetHref(const WebKit::WebElement& element) {
+string16 GetHref(const blink::WebElement& element) {
   // Get the actual 'href' attribute, which might relative if valid or can
   // possibly contain garbage otherwise, so not using absoluteLinkURL here.
   return element.getAttribute("href");
 }
 
-GURL GetAbsoluteSrcUrl(const WebKit::WebElement& element) {
+GURL GetAbsoluteSrcUrl(const blink::WebElement& element) {
   if (element.isNull())
     return GURL();
   return GetAbsoluteUrl(element, element.getAttribute("src"));
 }
 
-WebKit::WebNode GetImgChild(const WebKit::WebNode& node) {
+blink::WebNode GetImgChild(const blink::WebNode& node) {
   // This implementation is incomplete (for example if is an area tag) but
   // matches the original WebViewClassic implementation.
 
-  WebKit::WebNodeList list = node.getElementsByTagName("img");
+  blink::WebNodeList list = node.getElementsByTagName("img");
   if (list.length() > 0)
     return list.item(0);
-  return WebKit::WebNode();
+  return blink::WebNode();
 }
 
 bool RemovePrefixAndAssignIfMatches(const base::StringPiece& prefix,
@@ -175,9 +175,9 @@ bool AwRenderViewExt::OnMessageReceived(const IPC::Message& message) {
 void AwRenderViewExt::OnDocumentHasImagesRequest(int id) {
   bool hasImages = false;
   if (render_view()) {
-    WebKit::WebView* webview = render_view()->GetWebView();
+    blink::WebView* webview = render_view()->GetWebView();
     if (webview) {
-      WebKit::WebVector<WebKit::WebElement> images;
+      blink::WebVector<blink::WebElement> images;
       webview->mainFrame()->document().images(images);
       hasImages = !images.isEmpty();
     }
@@ -187,27 +187,27 @@ void AwRenderViewExt::OnDocumentHasImagesRequest(int id) {
 }
 
 bool AwRenderViewExt::allowDisplayingInsecureContent(
-      WebKit::WebFrame* frame,
+      blink::WebFrame* frame,
       bool enabled_per_settings,
-      const WebKit::WebSecurityOrigin& origin,
-      const WebKit::WebURL& url) {
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url) {
   return enabled_per_settings ? true : AllowMixedContent(url);
 }
 
 bool AwRenderViewExt::allowRunningInsecureContent(
-      WebKit::WebFrame* frame,
+      blink::WebFrame* frame,
       bool enabled_per_settings,
-      const WebKit::WebSecurityOrigin& origin,
-      const WebKit::WebURL& url) {
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url) {
   return enabled_per_settings ? true : AllowMixedContent(url);
 }
 
-void AwRenderViewExt::DidCommitProvisionalLoad(WebKit::WebFrame* frame,
+void AwRenderViewExt::DidCommitProvisionalLoad(blink::WebFrame* frame,
                                                bool is_new_navigation) {
   content::DocumentState* document_state =
       content::DocumentState::FromDataSource(frame->dataSource());
   if (document_state->can_load_local_resources()) {
-    WebKit::WebSecurityOrigin origin = frame->document().securityOrigin();
+    blink::WebSecurityOrigin origin = frame->document().securityOrigin();
     origin.grantLoadLocalResources();
   }
 }
@@ -239,7 +239,7 @@ void AwRenderViewExt::CheckContentsSize() {
 
   gfx::Size contents_size;
 
-  WebKit::WebFrame* main_frame = render_view()->GetWebView()->mainFrame();
+  blink::WebFrame* main_frame = render_view()->GetWebView()->mainFrame();
   if (main_frame)
     contents_size = main_frame->contentsSize();
 
@@ -264,15 +264,15 @@ void AwRenderViewExt::Navigate(const GURL& url) {
   // the browser side (in RenderViewHostManger), to the IPCmessages and to the
   // RenderViewObserver. Thus, clearing decoding image cache on Navigate, seems
   // a more acceptable compromise.
-  WebKit::WebImageCache::clear();
+  blink::WebImageCache::clear();
 }
 
-void AwRenderViewExt::FocusedNodeChanged(const WebKit::WebNode& node) {
+void AwRenderViewExt::FocusedNodeChanged(const blink::WebNode& node) {
   if (node.isNull() || !node.isElementNode() || !render_view())
     return;
 
   // Note: element is not const due to innerText() is not const.
-  WebKit::WebElement element = node.toConst<WebKit::WebElement>();
+  blink::WebElement element = node.toConst<blink::WebElement>();
   AwHitTestData data;
 
   data.href = GetHref(element);
@@ -283,10 +283,10 @@ void AwRenderViewExt::FocusedNodeChanged(const WebKit::WebNode& node) {
     absolute_link_url = GetAbsoluteUrl(node, data.href);
 
   GURL absolute_image_url;
-  const WebKit::WebNode child_img = GetImgChild(node);
+  const blink::WebNode child_img = GetImgChild(node);
   if (!child_img.isNull() && child_img.isElementNode()) {
     absolute_image_url =
-        GetAbsoluteSrcUrl(child_img.toConst<WebKit::WebElement>());
+        GetAbsoluteSrcUrl(child_img.toConst<blink::WebElement>());
   }
 
   PopulateHitTestData(absolute_link_url,
@@ -300,9 +300,9 @@ void AwRenderViewExt::OnDoHitTest(int view_x, int view_y) {
   if (!render_view() || !render_view()->GetWebView())
     return;
 
-  const WebKit::WebHitTestResult result =
+  const blink::WebHitTestResult result =
       render_view()->GetWebView()->hitTestResultAt(
-          WebKit::WebPoint(view_x, view_y));
+          blink::WebPoint(view_x, view_y));
   AwHitTestData data;
 
   if (!result.urlElement().isNull()) {