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

Unified Diff: content/browser/frame_host/frame_tree_node.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: consolidate render->browser ipcs into one 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/frame_tree_node.cc
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index f317b2887cab4643b07b30241b87df3044d644ff..0e457de23d8142c5ee6e488d865db060080b5435 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -67,15 +67,17 @@ FrameTreeNode* FrameTreeNode::GloballyFindByID(int frame_tree_node_id) {
return it == nodes->end() ? nullptr : it->second;
}
-FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,
- Navigator* navigator,
- RenderFrameHostDelegate* render_frame_delegate,
- RenderViewHostDelegate* render_view_delegate,
- RenderWidgetHostDelegate* render_widget_delegate,
- RenderFrameHostManager::Delegate* manager_delegate,
- blink::WebTreeScopeType scope,
- const std::string& name,
- blink::WebSandboxFlags sandbox_flags)
+FrameTreeNode::FrameTreeNode(
+ FrameTree* frame_tree,
+ Navigator* navigator,
+ RenderFrameHostDelegate* render_frame_delegate,
+ RenderViewHostDelegate* render_view_delegate,
+ RenderWidgetHostDelegate* render_widget_delegate,
+ RenderFrameHostManager::Delegate* manager_delegate,
+ blink::WebTreeScopeType scope,
+ const std::string& name,
+ blink::WebSandboxFlags sandbox_flags,
+ const blink::WebFrameOwnerProperties& frame_owner_properties)
: frame_tree_(frame_tree),
navigator_(navigator),
render_manager_(this,
@@ -92,6 +94,7 @@ FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,
// Effective sandbox flags also need to be set, since initial sandbox
// flags should apply to the initial empty document in the frame.
effective_sandbox_flags_(sandbox_flags),
+ frame_owner_properties_(frame_owner_properties),
loading_progress_(kLoadingProgressNotStarted) {
std::pair<FrameTreeNodeIDMap::iterator, bool> result =
g_frame_tree_node_id_map.Get().insert(
@@ -219,6 +222,11 @@ bool FrameTreeNode::IsDescendantOf(FrameTreeNode* other) const {
return false;
}
+void FrameTreeNode::SetFrameOwnerProperties(
+ const blink::WebFrameOwnerProperties& frame_owner_properties) {
+ frame_owner_properties_ = frame_owner_properties;
alexmos 2015/09/21 18:53:21 nit: if there's no more work beyond the assignment
lazyboy 2015/09/22 02:38:54 Done. Ah, I started /w more work beyond assignment
+}
+
FrameTreeNode* FrameTreeNode::PreviousSibling() const {
if (!parent_)
return nullptr;

Powered by Google App Engine
This is Rietveld 408576698