Index: content/browser/frame_host/render_frame_host_impl.h |
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h |
index ae4b948cf9878ff9cb45c84671ee172f5d3d2ac5..c9559236c72d8d50adf1dd8cb779ee3295110fd9 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.h |
+++ b/content/browser/frame_host/render_frame_host_impl.h |
@@ -27,6 +27,7 @@ |
#include "content/public/browser/render_frame_host.h" |
#include "content/public/common/javascript_message_type.h" |
#include "net/http/http_response_headers.h" |
+#include "third_party/WebKit/public/web/WebFrameOwnerProperties.h" |
#include "third_party/WebKit/public/web/WebTextDirection.h" |
#include "third_party/WebKit/public/web/WebTreeScopeType.h" |
#include "ui/accessibility/ax_node_data.h" |
@@ -209,10 +210,12 @@ class CONTENT_EXPORT RenderFrameHostImpl |
void Init(); |
int routing_id() const { return routing_id_; } |
- void OnCreateChildFrame(int new_routing_id, |
- blink::WebTreeScopeType scope, |
- const std::string& frame_name, |
- blink::WebSandboxFlags sandbox_flags); |
+ void OnCreateChildFrame( |
+ int new_routing_id, |
+ blink::WebTreeScopeType scope, |
+ const std::string& frame_name, |
+ blink::WebSandboxFlags sandbox_flags, |
+ const blink::WebFrameOwnerProperties& frame_owner_properties); |
alexmos
2015/09/02 21:42:09
I think you need to update some unit tests as well
lazyboy
2015/09/15 19:30:56
Done.
|
RenderViewHostImpl* render_view_host() { return render_view_host_; } |
RenderFrameHostDelegate* delegate() { return delegate_; } |
@@ -543,6 +546,11 @@ class CONTENT_EXPORT RenderFrameHostImpl |
void OnDidAssignPageId(int32 page_id); |
void OnDidChangeSandboxFlags(int32 frame_routing_id, |
blink::WebSandboxFlags flags); |
+ void OnDidChangeScrollingMode( |
+ int32 frame_routing_id, |
+ blink::WebFrameOwnerProperties::ScrollingMode mode); |
+ void OnDidChangeMarginWidth(int32 frame_routing_id, int margin_width); |
+ void OnDidChangeMarginHeight(int32 frame_routing_id, int margin_height); |
void OnUpdateTitle(const base::string16& title, |
blink::WebTextDirection title_direction); |
void OnUpdateEncoding(const std::string& encoding); |