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

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

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove dep patch Created 5 years, 4 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
Index: content/browser/frame_host/frame_tree.cc
diff --git a/content/browser/frame_host/frame_tree.cc b/content/browser/frame_host/frame_tree.cc
index 64774ffbfff8d67af88ea002d53a80399cce90bb..a2b390ebef423c777e343883daf2cba0072008f7 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -114,10 +114,10 @@ FrameTree::FrameTree(Navigator* navigator,
// document scope.
blink::WebTreeScopeType::Document,
std::string(),
- blink::WebSandboxFlags::None)),
+ blink::WebSandboxFlags::None,
+ blink::WebFrameOwnerProperties())),
focused_frame_tree_node_id_(-1),
- load_progress_(0.0) {
-}
+ load_progress_(0.0) {}
FrameTree::~FrameTree() {
}
@@ -182,12 +182,14 @@ void FrameTree::ForEach(
}
}
-RenderFrameHostImpl* FrameTree::AddFrame(FrameTreeNode* parent,
- int process_id,
- int new_routing_id,
- blink::WebTreeScopeType scope,
- const std::string& frame_name,
- blink::WebSandboxFlags sandbox_flags) {
+RenderFrameHostImpl* FrameTree::AddFrame(
+ FrameTreeNode* parent,
+ int process_id,
+ int new_routing_id,
+ blink::WebTreeScopeType scope,
+ const std::string& frame_name,
+ blink::WebSandboxFlags sandbox_flags,
+ const blink::WebFrameOwnerProperties& frame_owner_properties) {
// A child frame always starts with an initial empty document, which means
// it is in the same SiteInstance as the parent frame. Ensure that the process
// which requested a child frame to be added is the same as the process of the
@@ -197,10 +199,10 @@ RenderFrameHostImpl* FrameTree::AddFrame(FrameTreeNode* parent,
if (parent->current_frame_host()->GetProcess()->GetID() != process_id)
return nullptr;
- scoped_ptr<FrameTreeNode> node(
- new FrameTreeNode(this, parent->navigator(), render_frame_delegate_,
- render_view_delegate_, render_widget_delegate_,
- manager_delegate_, scope, frame_name, sandbox_flags));
+ scoped_ptr<FrameTreeNode> node(new FrameTreeNode(
+ this, parent->navigator(), render_frame_delegate_, render_view_delegate_,
+ render_widget_delegate_, manager_delegate_, scope, frame_name,
+ sandbox_flags, frame_owner_properties));
FrameTreeNode* node_ptr = node.get();
// AddChild is what creates the RenderFrameHost.
parent->AddChild(node.Pass(), process_id, new_routing_id);

Powered by Google App Engine
This is Rietveld 408576698