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

Unified Diff: content/browser/frame_host/frame_tree_node.h

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.h
diff --git a/content/browser/frame_host/frame_tree_node.h b/content/browser/frame_host/frame_tree_node.h
index 2d033a65db6f56f0f7ad88b946186f2f8457c79c..e8c481f2f5f36c510d406d8494195dfe712c9f7f 100644
--- a/content/browser/frame_host/frame_tree_node.h
+++ b/content/browser/frame_host/frame_tree_node.h
@@ -15,6 +15,7 @@
#include "content/browser/frame_host/render_frame_host_manager.h"
#include "content/common/content_export.h"
#include "content/common/frame_replication_state.h"
+#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -53,7 +54,8 @@ class CONTENT_EXPORT FrameTreeNode {
RenderFrameHostManager::Delegate* manager_delegate,
blink::WebTreeScopeType scope,
const std::string& name,
- blink::WebSandboxFlags sandbox_flags);
+ blink::WebSandboxFlags sandbox_flags,
+ const blink::WebFrameOwnerProperties& frame_owner_properties);
~FrameTreeNode();
@@ -147,6 +149,13 @@ class CONTENT_EXPORT FrameTreeNode {
return replication_state_;
}
+ const blink::WebFrameOwnerProperties& frame_owner_properties() {
+ return frame_owner_properties_;
+ }
+
+ void SetFrameOwnerProperties(
+ const blink::WebFrameOwnerProperties& frame_owner_properties);
+
RenderFrameHostImpl* current_frame_host() const {
return render_manager_.current_frame_host();
}
@@ -276,6 +285,14 @@ class CONTENT_EXPORT FrameTreeNode {
// flags when a navigation for this frame commits.
blink::WebSandboxFlags effective_sandbox_flags_;
+ // Tracks the scrolling and margin properties for this frame. These
+ // properties affect the child renderer but are available on its parent's
alexmos 2015/09/21 18:53:21 nit: replace "available" with "maintained" or "sto
lazyboy 2015/09/22 02:38:54 Done.
+ // frame element. When a parent frame dynamically updates these properties,
+ // we store it here.
alexmos 2015/09/21 18:53:21 nit: When this frame's parent dynamically updates
lazyboy 2015/09/22 02:38:54 Done.
+ // TODO(dcheng): The update only takes effect on the next frame navigation,
+ // due to the limitation of current blink implementation. Fix.
alexmos 2015/09/21 18:53:21 nit: I'd say "to be consistent with the current Bl
lazyboy 2015/09/22 02:38:54 Done.
+ blink::WebFrameOwnerProperties frame_owner_properties_;
+
// Used to track this node's loading progress (from 0 to 1).
double loading_progress_;

Powered by Google App Engine
This is Rietveld 408576698