content/browser/frame_host/render_frame_proxy_host.cc - Issue 2156883002: Use content::FrameOwnerProperties instead of blink::WebFrameOwnerProperties in content/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/frame_host/render_frame_proxy_host.cc

Issue 2156883002: Use content::FrameOwnerProperties instead of blink::WebFrameOwnerProperties in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-delegation-frame-owner-properties

Patch Set: Use this everywhere Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« content/browser/frame_host/render_frame_host_impl.h ('K') | « content/browser/frame_host/render_frame_message_filter.cc ('k') | content/browser/site_per_process_browsertest.cc » ('j') | content/browser/site_per_process_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_frame_proxy_host.cc

diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc

index 55e30ef9b6b17558389dfb82ebb430d1474c6c44..846eb66956a41daa6be440825e537bf30eca2e16 100644

--- a/content/browser/frame_host/render_frame_proxy_host.cc

+++ b/content/browser/frame_host/render_frame_proxy_host.cc

@@ -197,12 +197,11 @@ bool RenderFrameProxyHost::InitRenderFrameProxy() {

// For subframes, initialize the proxy's WebFrameOwnerProperties only if they

alexmos 2016/07/19 00:15:56 s/WebFrameOwnerProperties/FrameOwnerProperties/

raymes 2016/07/19 05:53:09 Done.

// differ from default values.

- bool should_send_properties = frame_tree_node_->frame_owner_properties() !=

- blink::WebFrameOwnerProperties();

+ bool should_send_properties =

+ frame_tree_node_->frame_owner_properties() != FrameOwnerProperties();

if (frame_tree_node_->parent() && should_send_properties) {

Send(new FrameMsg_SetFrameOwnerProperties(

- routing_id_,

- FrameOwnerProperties(frame_tree_node_->frame_owner_properties())));

+ routing_id_, frame_tree_node_->frame_owner_properties()));

}

return true;