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

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

Issue 2632633006: Implement NavigationThrottle::BLOCK_REQUEST_AND_COLLAPSE. (Closed)
Patch Set: Extend tests, fix redirects. Non-PlzNavigate version still broken. Created 3 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_proxy.h" 5 #include "content/renderer/render_frame_proxy.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 bool handled = true; 268 bool handled = true;
269 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg) 269 IPC_BEGIN_MESSAGE_MAP(RenderFrameProxy, msg)
270 IPC_MESSAGE_HANDLER(FrameMsg_DeleteProxy, OnDeleteProxy) 270 IPC_MESSAGE_HANDLER(FrameMsg_DeleteProxy, OnDeleteProxy)
271 IPC_MESSAGE_HANDLER(FrameMsg_ChildFrameProcessGone, OnChildFrameProcessGone) 271 IPC_MESSAGE_HANDLER(FrameMsg_ChildFrameProcessGone, OnChildFrameProcessGone)
272 IPC_MESSAGE_HANDLER(FrameMsg_SetChildFrameSurface, OnSetChildFrameSurface) 272 IPC_MESSAGE_HANDLER(FrameMsg_SetChildFrameSurface, OnSetChildFrameSurface)
273 IPC_MESSAGE_HANDLER(FrameMsg_UpdateOpener, OnUpdateOpener) 273 IPC_MESSAGE_HANDLER(FrameMsg_UpdateOpener, OnUpdateOpener)
274 IPC_MESSAGE_HANDLER(FrameMsg_DidStartLoading, OnDidStartLoading) 274 IPC_MESSAGE_HANDLER(FrameMsg_DidStartLoading, OnDidStartLoading)
275 IPC_MESSAGE_HANDLER(FrameMsg_DidStopLoading, OnDidStopLoading) 275 IPC_MESSAGE_HANDLER(FrameMsg_DidStopLoading, OnDidStopLoading)
276 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags) 276 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateSandboxFlags, OnDidUpdateSandboxFlags)
277 IPC_MESSAGE_HANDLER(FrameMsg_DispatchLoad, OnDispatchLoad) 277 IPC_MESSAGE_HANDLER(FrameMsg_DispatchLoad, OnDispatchLoad)
278 IPC_MESSAGE_HANDLER(FrameMsg_Collapse, OnCollapse)
278 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateName, OnDidUpdateName) 279 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateName, OnDidUpdateName)
279 IPC_MESSAGE_HANDLER(FrameMsg_AddContentSecurityPolicy, 280 IPC_MESSAGE_HANDLER(FrameMsg_AddContentSecurityPolicy,
280 OnAddContentSecurityPolicy) 281 OnAddContentSecurityPolicy)
281 IPC_MESSAGE_HANDLER(FrameMsg_ResetContentSecurityPolicy, 282 IPC_MESSAGE_HANDLER(FrameMsg_ResetContentSecurityPolicy,
282 OnResetContentSecurityPolicy) 283 OnResetContentSecurityPolicy)
283 IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureRequestPolicy, 284 IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureRequestPolicy,
284 OnEnforceInsecureRequestPolicy) 285 OnEnforceInsecureRequestPolicy)
285 IPC_MESSAGE_HANDLER(FrameMsg_SetFrameOwnerProperties, 286 IPC_MESSAGE_HANDLER(FrameMsg_SetFrameOwnerProperties,
286 OnSetFrameOwnerProperties) 287 OnSetFrameOwnerProperties)
287 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateOrigin, OnDidUpdateOrigin) 288 IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateOrigin, OnDidUpdateOrigin)
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 } 339 }
339 340
340 void RenderFrameProxy::OnDidStopLoading() { 341 void RenderFrameProxy::OnDidStopLoading() {
341 web_frame_->didStopLoading(); 342 web_frame_->didStopLoading();
342 } 343 }
343 344
344 void RenderFrameProxy::OnDispatchLoad() { 345 void RenderFrameProxy::OnDispatchLoad() {
345 web_frame_->dispatchLoadEventOnFrameOwner(); 346 web_frame_->dispatchLoadEventOnFrameOwner();
346 } 347 }
347 348
349 void RenderFrameProxy::OnCollapse(bool collapsed) {
350 web_frame_->collapse(collapsed);
351 }
352
348 void RenderFrameProxy::OnDidUpdateName(const std::string& name, 353 void RenderFrameProxy::OnDidUpdateName(const std::string& name,
349 const std::string& unique_name) { 354 const std::string& unique_name) {
350 web_frame_->setReplicatedName(blink::WebString::fromUTF8(name), 355 web_frame_->setReplicatedName(blink::WebString::fromUTF8(name),
351 blink::WebString::fromUTF8(unique_name)); 356 blink::WebString::fromUTF8(unique_name));
352 } 357 }
353 358
354 void RenderFrameProxy::OnAddContentSecurityPolicy( 359 void RenderFrameProxy::OnAddContentSecurityPolicy(
355 const ContentSecurityPolicyHeader& header) { 360 const ContentSecurityPolicyHeader& header) {
356 web_frame_->addReplicatedContentSecurityPolicyHeader( 361 web_frame_->addReplicatedContentSecurityPolicyHeader(
357 blink::WebString::fromUTF8(header.header_value), header.type, 362 blink::WebString::fromUTF8(header.header_value), header.type,
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 blink::WebLocalFrame* source) { 532 blink::WebLocalFrame* source) {
528 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID(); 533 int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID();
529 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id)); 534 Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id));
530 } 535 }
531 536
532 void RenderFrameProxy::frameFocused() { 537 void RenderFrameProxy::frameFocused() {
533 Send(new FrameHostMsg_FrameFocused(routing_id_)); 538 Send(new FrameHostMsg_FrameFocused(routing_id_));
534 } 539 }
535 540
536 } // namespace 541 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698