Index: content/renderer/render_frame_impl.h |
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h |
index 4c58e59a74d60e8b1494b4bf1ada13b6e800022f..c8c0c7be943c6b72a879ff5ac6beeadfb7b8448b 100644 |
--- a/content/renderer/render_frame_impl.h |
+++ b/content/renderer/render_frame_impl.h |
@@ -33,6 +33,7 @@ |
#include "third_party/WebKit/public/web/WebAXObject.h" |
#include "third_party/WebKit/public/web/WebDataSource.h" |
#include "third_party/WebKit/public/web/WebFrameClient.h" |
+#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" |
#include "third_party/WebKit/public/web/WebHistoryCommitType.h" |
#include "third_party/WebKit/public/web/WebScriptExecutionCallback.h" |
#include "ui/gfx/range/range.h" |
@@ -143,13 +144,15 @@ class CONTENT_EXPORT RenderFrameImpl |
// identified by |proxy_routing_id|. Note: This is called only when |
// RenderFrame is being created in response to IPC message from the browser |
// process. All other frame creation is driven through Blink and Create. |
- static void CreateFrame(int routing_id, |
- int parent_routing_id, |
- int previous_sibling_routing_id, |
- int proxy_routing_id, |
- const FrameReplicationState& replicated_state, |
- CompositorDependencies* compositor_deps, |
- const FrameMsg_NewFrame_WidgetParams& params); |
+ static void CreateFrame( |
+ int routing_id, |
+ int parent_routing_id, |
+ int previous_sibling_routing_id, |
+ int proxy_routing_id, |
+ const FrameReplicationState& replicated_state, |
+ CompositorDependencies* compositor_deps, |
+ const FrameMsg_NewFrame_WidgetParams& params, |
+ const blink::WebFrameOwnerProperties& frameOwner_properties); |
// Returns the RenderFrameImpl for the given routing ID. |
static RenderFrameImpl* FromRoutingID(int routing_id); |
@@ -386,7 +389,8 @@ class CONTENT_EXPORT RenderFrameImpl |
blink::WebLocalFrame* parent, |
blink::WebTreeScopeType scope, |
const blink::WebString& name, |
- blink::WebSandboxFlags sandboxFlags); |
+ blink::WebSandboxFlags sandboxFlags, |
+ const blink::WebFrameOwnerProperties& frameOwnerProperties); |
virtual void didChangeOpener(blink::WebFrame* frame); |
virtual void frameDetached(blink::WebFrame* frame, DetachType type); |
virtual void frameFocused(); |
@@ -395,6 +399,13 @@ class CONTENT_EXPORT RenderFrameImpl |
const blink::WebString& name); |
virtual void didChangeSandboxFlags(blink::WebFrame* child_frame, |
blink::WebSandboxFlags flags); |
+ virtual void didChangeScrollingMode( |
+ blink::WebFrame* child_frame, |
+ blink::WebFrameOwnerProperties::ScrollingMode scrolling_mode); |
+ virtual void didChangeMarginWidth(blink::WebFrame* child_frame, |
+ int marginWidth); |
+ virtual void didChangeMarginHeight(blink::WebFrame* child_frame, |
+ int marginHeight); |
virtual void didMatchCSS( |
blink::WebLocalFrame* frame, |
const blink::WebVector<blink::WebString>& newly_matching_selectors, |