Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1308113008: OOPIFs: Transitioning Get/Send...SavableResourceLinks away from RenderViewHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@page-serialization-test
Patch Set: Fixed 2 minor issues caught during a late self-review. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 95 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
96 #include "content/renderer/presentation/presentation_dispatcher.h" 96 #include "content/renderer/presentation/presentation_dispatcher.h"
97 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" 97 #include "content/renderer/push_messaging/push_messaging_dispatcher.h"
98 #include "content/renderer/render_frame_proxy.h" 98 #include "content/renderer/render_frame_proxy.h"
99 #include "content/renderer/render_process.h" 99 #include "content/renderer/render_process.h"
100 #include "content/renderer/render_thread_impl.h" 100 #include "content/renderer/render_thread_impl.h"
101 #include "content/renderer/render_view_impl.h" 101 #include "content/renderer/render_view_impl.h"
102 #include "content/renderer/render_widget_fullscreen_pepper.h" 102 #include "content/renderer/render_widget_fullscreen_pepper.h"
103 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 103 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
104 #include "content/renderer/renderer_webcolorchooser_impl.h" 104 #include "content/renderer/renderer_webcolorchooser_impl.h"
105 #include "content/renderer/savable_resources.h"
105 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 106 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
106 #include "content/renderer/shared_worker_repository.h" 107 #include "content/renderer/shared_worker_repository.h"
107 #include "content/renderer/skia_benchmarking_extension.h" 108 #include "content/renderer/skia_benchmarking_extension.h"
108 #include "content/renderer/stats_collection_controller.h" 109 #include "content/renderer/stats_collection_controller.h"
109 #include "content/renderer/web_ui_extension.h" 110 #include "content/renderer/web_ui_extension.h"
110 #include "content/renderer/websharedworker_proxy.h" 111 #include "content/renderer/websharedworker_proxy.h"
111 #include "gin/modules/module_registry.h" 112 #include "gin/modules/module_registry.h"
112 #include "media/base/audio_renderer_mixer_input.h" 113 #include "media/base/audio_renderer_mixer_input.h"
113 #include "media/base/media_log.h" 114 #include "media/base/media_log.h"
114 #include "media/blink/webencryptedmediaclient_impl.h" 115 #include "media/blink/webencryptedmediaclient_impl.h"
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 OnSetAccessibilityMode) 1115 OnSetAccessibilityMode)
1115 IPC_MESSAGE_HANDLER(AccessibilityMsg_SnapshotTree, 1116 IPC_MESSAGE_HANDLER(AccessibilityMsg_SnapshotTree,
1116 OnSnapshotAccessibilityTree) 1117 OnSnapshotAccessibilityTree)
1117 IPC_MESSAGE_HANDLER(FrameMsg_UpdateOpener, OnUpdateOpener) 1118 IPC_MESSAGE_HANDLER(FrameMsg_UpdateOpener, OnUpdateOpener)
1118 IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation) 1119 IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation)
1119 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags) 1120 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags)
1120 IPC_MESSAGE_HANDLER(FrameMsg_SetTextTrackSettings, 1121 IPC_MESSAGE_HANDLER(FrameMsg_SetTextTrackSettings,
1121 OnTextTrackSettingsChanged) 1122 OnTextTrackSettingsChanged)
1122 IPC_MESSAGE_HANDLER(FrameMsg_PostMessageEvent, OnPostMessageEvent) 1123 IPC_MESSAGE_HANDLER(FrameMsg_PostMessageEvent, OnPostMessageEvent)
1123 IPC_MESSAGE_HANDLER(FrameMsg_FailedNavigation, OnFailedNavigation) 1124 IPC_MESSAGE_HANDLER(FrameMsg_FailedNavigation, OnFailedNavigation)
1125 IPC_MESSAGE_HANDLER(FrameMsg_GetSavableResourceLinks,
1126 OnGetSavableResourceLinks)
1124 #if defined(OS_ANDROID) 1127 #if defined(OS_ANDROID)
1125 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) 1128 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems)
1126 #elif defined(OS_MACOSX) 1129 #elif defined(OS_MACOSX)
1127 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItem, OnSelectPopupMenuItem) 1130 IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItem, OnSelectPopupMenuItem)
1128 IPC_MESSAGE_HANDLER(InputMsg_CopyToFindPboard, OnCopyToFindPboard) 1131 IPC_MESSAGE_HANDLER(InputMsg_CopyToFindPboard, OnCopyToFindPboard)
1129 #endif 1132 #endif
1130 IPC_END_MESSAGE_MAP() 1133 IPC_END_MESSAGE_MAP()
1131 1134
1132 return handled; 1135 return handled;
1133 } 1136 }
(...skipping 3281 matching lines...) Expand 10 before | Expand all | Expand 10 after
4415 switches::kEnableBrowserSideNavigation) && 4418 switches::kEnableBrowserSideNavigation) &&
4416 info.urlRequest.checkForBrowserSideNavigation() && 4419 info.urlRequest.checkForBrowserSideNavigation() &&
4417 ShouldMakeNetworkRequestForURL(url)) { 4420 ShouldMakeNetworkRequestForURL(url)) {
4418 BeginNavigation(&info.urlRequest); 4421 BeginNavigation(&info.urlRequest);
4419 return blink::WebNavigationPolicyIgnore; 4422 return blink::WebNavigationPolicyIgnore;
4420 } 4423 }
4421 4424
4422 return info.defaultPolicy; 4425 return info.defaultPolicy;
4423 } 4426 }
4424 4427
4428 void RenderFrameImpl::OnGetSavableResourceLinks() {
4429 std::vector<GURL> resources_list;
4430 std::vector<GURL> referrer_urls_list;
4431 std::vector<blink::WebReferrerPolicy> referrer_policies_list;
4432 SavableResourcesResult result(&resources_list, &referrer_urls_list,
4433 &referrer_policies_list);
4434
4435 WebFrame* frame = GetWebFrame();
nasko 2015/09/02 23:45:55 nit: Why not just use frame_?
Łukasz Anforowicz 2015/09/03 16:59:57 Done.
4436 if (!GetSavableResourceLinksForFrame(
4437 frame, &result, const_cast<const char**>(GetSavableSchemes()))) {
4438 Send(new FrameHostMsg_NonSavableResponse(routing_id_));
4439 return;
4440 }
4441
4442 std::vector<Referrer> referrers_list;
4443 CHECK_EQ(referrer_urls_list.size(), referrer_policies_list.size());
4444 for (unsigned i = 0; i < referrer_urls_list.size(); ++i) {
4445 referrers_list.push_back(
4446 Referrer(referrer_urls_list[i], referrer_policies_list[i]));
4447 }
4448
4449 Send(new FrameHostMsg_SavableResourceLinksResponse(
4450 routing_id_, resources_list, referrers_list));
4451 }
4452
4425 void RenderFrameImpl::OpenURL(WebFrame* frame, 4453 void RenderFrameImpl::OpenURL(WebFrame* frame,
4426 const GURL& url, 4454 const GURL& url,
4427 const Referrer& referrer, 4455 const Referrer& referrer,
4428 WebNavigationPolicy policy) { 4456 WebNavigationPolicy policy) {
4429 DCHECK_EQ(frame_, frame); 4457 DCHECK_EQ(frame_, frame);
4430 4458
4431 FrameHostMsg_OpenURL_Params params; 4459 FrameHostMsg_OpenURL_Params params;
4432 params.url = url; 4460 params.url = url;
4433 params.referrer = referrer; 4461 params.referrer = referrer;
4434 params.disposition = RenderViewImpl::NavigationPolicyToDisposition(policy); 4462 params.disposition = RenderViewImpl::NavigationPolicyToDisposition(policy);
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after
5108 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_)); 5136 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_));
5109 mojo::ServiceProviderPtr service_provider; 5137 mojo::ServiceProviderPtr service_provider;
5110 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5138 mojo::URLRequestPtr request(mojo::URLRequest::New());
5111 request->url = mojo::String::From(url); 5139 request->url = mojo::String::From(url);
5112 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5140 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5113 nullptr, nullptr); 5141 nullptr, nullptr);
5114 return service_provider.Pass(); 5142 return service_provider.Pass();
5115 } 5143 }
5116 5144
5117 } // namespace content 5145 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698