Move IconURLs method from WebFrame to WebLocalFrame

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 62 matching lines @@
 #include "content/common/worker_url_loader_factory_provider.mojom.h"
 #include "content/public/child/url_loader_throttle.h"
 #include "content/public/common/appcache_info.h"
 #include "content/public/common/associated_interface_provider.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/context_menu_params.h"
+#include "content/public/common/favicon_url.h"
 #include "content/public/common/file_chooser_file_info.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/public/common/isolated_world_ids.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/resource_response.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/renderer/browser_plugin_delegate.h"
 #include "content/public/renderer/content_renderer_client.h"
@@ skipping 577 matching lines @@
   // Explicitly close |file| here to make sure to include any flush operations
   // in the UMA metric.
   file.Close();
   return save_status;
 }
 
 double ConvertToBlinkTime(const base::TimeTicks& time_ticks) {
   return (time_ticks - base::TimeTicks()).InSecondsF();
 }
 
+FaviconURL::IconType ToFaviconType(blink::WebIconURL::Type type) {
+  switch (type) {
+    case blink::WebIconURL::kTypeFavicon:
+      return FaviconURL::FAVICON;
+    case blink::WebIconURL::kTypeTouch:
+      return FaviconURL::TOUCH_ICON;
+    case blink::WebIconURL::kTypeTouchPrecomposed:
+      return FaviconURL::TOUCH_PRECOMPOSED_ICON;
+    case blink::WebIconURL::kTypeInvalid:
+      return FaviconURL::INVALID_ICON;
+  }
+  return FaviconURL::INVALID_ICON;
+}
+
+void ConvertToFaviconSizes(const blink::WebVector<blink::WebSize>& web_sizes,
+                           std::vector<gfx::Size>* sizes) {
+  DCHECK(sizes->empty());
+  sizes->reserve(web_sizes.size());
+  for (size_t i = 0; i < web_sizes.size(); ++i)
+    sizes->push_back(gfx::Size(web_sizes[i]));
+}
+
 }  // namespace
 
 // The following methods are outside of the anonymous namespace to ensure that
 // the corresponding symbols get emmitted even on symbol_level 1.
 NOINLINE void ExhaustMemory() {
   volatile void* ptr = nullptr;
   do {
     ptr = malloc(0x10000000);
     base::debug::Alias(&ptr);
   } while (ptr);
@@ skipping 3070 matching lines @@
     base::string16 shortened_title = title16.substr(0, kMaxTitleChars);
     Send(new FrameHostMsg_UpdateTitle(routing_id_,
                                       shortened_title, direction));
   }
 
   // Also check whether we have new encoding name.
   UpdateEncoding(frame_, frame_->View()->PageEncoding().Utf8());
 }
 
 void RenderFrameImpl::DidChangeIcon(blink::WebIconURL::Type icon_type) {
-  // TODO(nasko): Investigate wheather implementation should move here.
-  render_view_->didChangeIcon(frame_, icon_type);
+  SendUpdateFaviconURL(icon_type);
+}
+
+void RenderFrameImpl::SendUpdateFaviconURL(blink::WebIconURL::Type icon_type) {
+  if (frame_->Parent())
+    return;
+
+  WebVector<blink::WebIconURL> icon_urls = frame_->IconURLs(icon_type);
+  std::vector<FaviconURL> urls;
+  for (size_t i = 0; i < icon_urls.size(); i++) {
+    std::vector<gfx::Size> sizes;
+    ConvertToFaviconSizes(icon_urls[i].Sizes(), &sizes);
+    urls.push_back(FaviconURL(icon_urls[i].GetIconURL(),
+                              ToFaviconType(icon_urls[i].IconType()), sizes));
+  }
+
+  if (!urls.empty())

[dcheng, 2017/06/06 20:01:30]

Maybe we can short-circuit this at line 3801? I guess I could see an argument
for doing it this way, but structuring it to return earlier makes it clear that
there's no filtering logic later on.

[Łukasz Anforowicz, 2017/06/06 20:55:00]

Done.

+    Send(new FrameHostMsg_UpdateFaviconURL(GetRoutingID(), urls));
 }
 
 void RenderFrameImpl::DidFinishDocumentLoad() {
   TRACE_EVENT1("navigation,benchmark,rail",
                "RenderFrameImpl::didFinishDocumentLoad", "id", routing_id_);
   Send(new FrameHostMsg_DidFinishDocumentLoad(routing_id_));
 
   for (auto& observer : observers_)
     observer.DidFinishDocumentLoad();
 
@@ skipping 1222 matching lines @@
 
 void RenderFrameImpl::DidStopLoading() {
   TRACE_EVENT1("navigation,rail", "RenderFrameImpl::didStopLoading",
                "id", routing_id_);
 
   // Any subframes created after this point won't be considered part of the
   // current history navigation (if this was one), so we don't need to track
   // this state anymore.
   history_subframe_unique_names_.clear();
 
+  blink::WebIconURL::Type icon_types = static_cast<blink::WebIconURL::Type>(
+      blink::WebIconURL::kTypeFavicon |
+      blink::WebIconURL::kTypeTouchPrecomposed | blink::WebIconURL::kTypeTouch);
+  SendUpdateFaviconURL(icon_types);
+
   render_view_->FrameDidStopLoading(frame_);
   Send(new FrameHostMsg_DidStopLoading(routing_id_));
 }
 
 void RenderFrameImpl::DidChangeLoadProgress(double load_progress) {
   Send(new FrameHostMsg_DidChangeLoadProgress(routing_id_, load_progress));
 }
 
 void RenderFrameImpl::HandleWebAccessibilityEvent(
     const blink::WebAXObject& obj, blink::WebAXEvent event) {
@@ skipping 1758 matching lines @@
       policy(info.default_policy),
       replaces_current_history_item(info.replaces_current_history_item),
       history_navigation_in_new_child_frame(
           info.is_history_navigation_in_new_child_frame),
       client_redirect(info.is_client_redirect),
       cache_disabled(info.is_cache_disabled),
       form(info.form),
       source_location(info.source_location) {}
 
 }  // namespace content