Move IconURLs method from WebFrame to WebLocalFrame

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <memory>
 
@@ skipping 42 matching lines @@
 #include "content/common/input_messages.h"
 #include "content/common/page_messages.h"
 #include "content/common/render_message_filter.mojom.h"
 #include "content/common/view_messages.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_client.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/favicon_url.h"
 #include "content/public/common/page_importance_signals.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/three_d_api_types.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/navigation_state.h"
 #include "content/public/renderer/render_view_observer.h"
@@ skipping 139 matching lines @@
 using blink::WebElement;
 using blink::WebFileChooserCompletion;
 using blink::WebFormControlElement;
 using blink::WebFormElement;
 using blink::WebFrame;
 using blink::WebFrameContentDumper;
 using blink::WebGestureEvent;
 using blink::WebHistoryItem;
 using blink::WebHTTPBody;
 using blink::WebHitTestResult;
-using blink::WebIconURL;
 using blink::WebImage;
 using blink::WebInputElement;
 using blink::WebInputEvent;
 using blink::WebLocalFrame;
 using blink::WebMediaPlayerAction;
 using blink::WebMouseEvent;
 using blink::WebNavigationPolicy;
 using blink::WebNavigationType;
 using blink::WebNode;
 using blink::WebPluginAction;
@@ skipping 106 matching lines @@
       *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDisablePreferCompositingToLCDText))
     return false;
   if (command_line.HasSwitch(switches::kEnablePreferCompositingToLCDText))
     return true;
   if (!compositor_deps->IsLcdTextEnabled())
     return true;
   return DeviceScaleEnsuresTextQuality(device_scale_factor);
 }
 
-static 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;
-}
-
-static 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 {
 
 typedef void (*SetFontFamilyWrapper)(blink::WebSettings*,
                                      const base::string16&,
                                      UScriptCode);
 
 void SetStandardFontFamilyWrapper(WebSettings* settings,
                                   const base::string16& font,
@@ skipping 1159 matching lines @@
   frames_in_progress_++;
 }
 
 void RenderViewImpl::FrameDidStopLoading(WebFrame* frame) {
   // TODO(japhet): This should be a DCHECK, but the pdf plugin sometimes
   // calls DidStopLoading() without a matching DidStartLoading().
   if (frames_in_progress_ == 0)
     return;
   frames_in_progress_--;
   if (frames_in_progress_ == 0) {
-    DidStopLoadingIcons();
     for (auto& observer : observers_)
       observer.DidStopLoading();
   }
 }
 
 void RenderViewImpl::AttachWebFrameWidget(blink::WebFrameWidget* frame_widget) {
   // The previous WebFrameWidget must already be detached by CloseForFrame().
   DCHECK(!frame_widget_);
   frame_widget_ = frame_widget;
 }
@@ skipping 338 matching lines @@
     const blink::WebElement& element) {
   blink::WebRect bounding_box_in_window = element.BoundsInViewport();
   ConvertViewportToWindowViaWidget(&bounding_box_in_window);
   return gfx::RectF(bounding_box_in_window);
 }
 
 bool RenderViewImpl::HasAddedInputHandler() const {
   return has_added_input_handler_;
 }
 
-void RenderViewImpl::didChangeIcon(WebLocalFrame* frame,
-                                   WebIconURL::Type icon_type) {
-  if (frame->Parent())
-    return;
-
-  WebVector<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));
-  }
-  SendUpdateFaviconURL(urls);
-}
-
 void RenderViewImpl::CheckPreferredSize() {
   // We don't always want to send the change messages over IPC, only if we've
   // been put in that mode by getting a |ViewMsg_EnablePreferredSizeChangedMode|
   // message.
   if (!send_preferred_size_changes_ || !webview())
     return;
 
   gfx::Size size = webview()->ContentsPreferredMinimumSize();
   if (size == preferred_size_)
     return;
@@ skipping 647 matching lines @@
   webview()->ResolveTapDisambiguation(timestamp_seconds, tap_viewport_offset,
                                       is_long_press);
 }
 
 void RenderViewImpl::DidCommitCompositorFrame() {
   RenderWidget::DidCommitCompositorFrame();
   for (auto& observer : observers_)
     observer.DidCommitCompositorFrame();
 }
 
-void RenderViewImpl::SendUpdateFaviconURL(const std::vector<FaviconURL>& urls) {
-  if (!urls.empty())
-    Send(new ViewHostMsg_UpdateFaviconURL(GetRoutingID(), urls));
-}
-
-void RenderViewImpl::DidStopLoadingIcons() {
-  int icon_types = WebIconURL::kTypeFavicon |
-                   WebIconURL::kTypeTouchPrecomposed | WebIconURL::kTypeTouch;
-
-  // Favicons matter only for the top-level frame. If it is a WebRemoteFrame,
-  // just return early.
-  if (webview()->MainFrame()->IsWebRemoteFrame())
-    return;
-
-  WebVector<WebIconURL> icon_urls =
-      webview()->MainFrame()->IconURLs(icon_types);
-
-  std::vector<FaviconURL> urls;
-  for (size_t i = 0; i < icon_urls.size(); i++) {
-    WebURL url = icon_urls[i].GetIconURL();
-    std::vector<gfx::Size> sizes;
-    ConvertToFaviconSizes(icon_urls[i].Sizes(), &sizes);
-    if (!url.IsEmpty())
-      urls.push_back(
-          FaviconURL(url, ToFaviconType(icon_urls[i].IconType()), sizes));
-  }
-  SendUpdateFaviconURL(urls);
-}
-
 void RenderViewImpl::UpdateWebViewWithDeviceScaleFactor() {
   if (!webview())
     return;
   if (IsUseZoomForDSFEnabled()) {
     webview()->SetZoomFactorForDeviceScaleFactor(device_scale_factor_);
   } else {
     webview()->SetDeviceScaleFactor(device_scale_factor_);
   }
   webview()->GetSettings()->SetPreferCompositingToLCDTextEnabled(
       PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
@@ skipping 23 matching lines @@
                         input_event.GetCoalescedEventsPointers(), latency_info,
                         dispatch_type);
     return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
   }
   idle_user_detector_->ActivityDetected();
   return RenderWidget::HandleInputEvent(input_event, latency_info,
                                         dispatch_type);
 }
 
 }  // namespace content