Vector-of-structs (instead of struct-of-vectors) in "savable resources" IPC.

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 "base/auto_reset.h"
@@ skipping 23 matching lines @@
 #include "content/child/web_url_request_util.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/child/websocket_bridge.h"
 #include "content/child/weburlresponse_extradata_impl.h"
 #include "content/common/accessibility_messages.h"
 #include "content/common/clipboard_messages.h"
 #include "content/common/frame_messages.h"
 #include "content/common/frame_replication_state.h"
 #include "content/common/input_messages.h"
 #include "content/common/navigation_params.h"
+#include "content/common/savable_subframe.h"
 #include "content/common/service_worker/service_worker_types.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/common/swapped_out_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/public/common/isolated_world_ids.h"
 #include "content/public/common/page_state.h"
@@ skipping 48 matching lines @@
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
 #include "content/renderer/renderer_webcolorchooser_impl.h"
 #include "content/renderer/savable_resources.h"
 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
 #include "content/renderer/shared_worker_repository.h"
 #include "content/renderer/skia_benchmarking_extension.h"
 #include "content/renderer/stats_collection_controller.h"
 #include "content/renderer/wake_lock/wake_lock_dispatcher.h"
+#include "content/renderer/web_frame_utils.h"
 #include "content/renderer/web_ui_extension.h"
 #include "content/renderer/websharedworker_proxy.h"
 #include "gin/modules/module_registry.h"
 #include "media/base/audio_renderer_mixer_input.h"
 #include "media/base/media_log.h"
 #include "media/blink/webencryptedmediaclient_impl.h"
 #include "media/blink/webmediaplayer_impl.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "mojo/common/url_type_converters.h"
 #include "net/base/data_url.h"
@@ skipping 398 matching lines @@
   return media::Context3D(provider->ContextGL(), provider->GrContext());
 }
 #endif
 
 bool IsReload(FrameMsg_Navigate_Type::Value navigation_type) {
   return navigation_type == FrameMsg_Navigate_Type::RELOAD ||
          navigation_type == FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE ||
          navigation_type == FrameMsg_Navigate_Type::RELOAD_ORIGINAL_REQUEST_URL;
 }
 
-// Returns the routing ID of the RenderFrameImpl or RenderFrameProxy
-// associated with |web_frame|.
-int GetRoutingIdForFrameOrProxy(WebFrame* web_frame) {
-  if (!web_frame)
-    return MSG_ROUTING_NONE;
-  if (web_frame->isWebRemoteFrame())
-    return RenderFrameProxy::FromWebFrame(web_frame)->routing_id();
-  return RenderFrameImpl::FromWebFrame(web_frame)->GetRoutingID();
-}
-
 RenderFrameImpl::CreateRenderFrameImplFunction g_create_render_frame_impl =
     nullptr;
 
 void OnGotContentHandlerID(uint32_t content_handler_id) {}
 
 }  // namespace
 
 // static
 RenderFrameImpl* RenderFrameImpl::Create(RenderViewImpl* render_view,
                                          int32 routing_id) {
@@ skipping 4008 matching lines @@
       ShouldMakeNetworkRequestForURL(url)) {
     BeginNavigation(&info.urlRequest);
     return blink::WebNavigationPolicyIgnore;
   }
 
   return info.defaultPolicy;
 }
 
 void RenderFrameImpl::OnGetSavableResourceLinks() {
   std::vector<GURL> resources_list;
-  std::vector<GURL> subframe_original_urls;
-  std::vector<blink::WebFrame*> subframes;
-  SavableResourcesResult result(&resources_list,
-                                &subframe_original_urls, &subframes);
+  std::vector<SavableSubframe> subframes;
+  SavableResourcesResult result(&resources_list, &subframes);
 
   if (!GetSavableResourceLinksForFrame(
           frame_, &result, const_cast<const char**>(GetSavableSchemes()))) {
     Send(new FrameHostMsg_SavableResourceLinksError(routing_id_));
     return;
   }
 
   Referrer referrer =
       Referrer(frame_->document().url(), frame_->document().referrerPolicy());
 
-  std::vector<int> subframe_routing_ids;
-  for (WebFrame* subframe : subframes) {
-    subframe_routing_ids.push_back(GetRoutingIdForFrameOrProxy(subframe));
-  }
-
-  DCHECK_EQ(subframe_original_urls.size(), subframe_routing_ids.size());
   Send(new FrameHostMsg_SavableResourceLinksResponse(
-      routing_id_, resources_list, referrer,
-      subframe_original_urls, subframe_routing_ids));
+      routing_id_, resources_list, referrer, subframes));
 }
 
 void RenderFrameImpl::OnGetSerializedHtmlWithLocalLinks(
     std::vector<GURL> original_urls,
     std::vector<base::FilePath> equivalent_local_paths,
     base::FilePath local_directory_path) {
   // Only DCHECK, since the message comes from the trusted browser process.
   DCHECK(original_urls.size() == equivalent_local_paths.size());
 
   // Convert std::vector of GURLs to WebVector<WebURL>
@@ skipping 720 matching lines @@
   mojo::ServiceProviderPtr service_provider;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From(url);
   mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
                                     nullptr, nullptr,
                                     base::Bind(&OnGotContentHandlerID));
   return service_provider.Pass();
 }
 
 }  // namespace content