Chromium Code Reviews| 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 ec3dd50746f54871fd3ee21036323a4d78d3edb6..c834c73606aed43c2789ebad3152bb7dd832b159 100644 |
| --- a/content/browser/frame_host/render_frame_host_impl.h |
| +++ b/content/browser/frame_host/render_frame_host_impl.h |
| @@ -15,6 +15,7 @@ |
| #include "base/strings/string16.h" |
| #include "base/time/time.h" |
| #include "content/browser/accessibility/browser_accessibility_manager.h" |
| +#include "content/browser/bad_message.h" |
| #include "content/browser/site_instance_impl.h" |
| #include "content/common/accessibility_mode_enums.h" |
| #include "content/common/ax_content_node_data.h" |
| @@ -27,6 +28,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" |
| @@ -203,10 +205,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); |
| RenderViewHostImpl* render_view_host() { return render_view_host_; } |
| RenderFrameHostDelegate* delegate() { return delegate_; } |
| @@ -248,6 +252,8 @@ class CONTENT_EXPORT RenderFrameHostImpl |
| // TODO(creis): Make bindings frame-specific, to support cases like <webview>. |
| int GetEnabledBindings(); |
| + void DidChangeChildFrameOwnerProperties(FrameTreeNode* child); |
|
alexmos
2015/10/02 21:24:20
What is this function for? I don't see it used an
lazyboy
2015/10/05 22:16:08
Used to be used on previous iterations, removed.
|
| + |
| NavigationHandleImpl* navigation_handle() const { |
| return navigation_handle_.get(); |
| } |
| @@ -538,6 +544,9 @@ class CONTENT_EXPORT RenderFrameHostImpl |
| void OnDidAssignPageId(int32 page_id); |
| void OnDidChangeSandboxFlags(int32 frame_routing_id, |
| blink::WebSandboxFlags flags); |
| + void OnDidChangeFrameOwnerProperties( |
| + int32 frame_routing_id, |
| + const blink::WebFrameOwnerProperties& frame_owner_properties); |
| void OnUpdateTitle(const base::string16& title, |
| blink::WebTextDirection title_direction); |
| void OnUpdateEncoding(const std::string& encoding); |
| @@ -610,6 +619,12 @@ class CONTENT_EXPORT RenderFrameHostImpl |
| // frames, it will return the current frame's view. |
| RenderWidgetHostViewBase* GetViewForAccessibility(); |
| + // Returns the child FrameTreeNode if |child_frame_routing_id| is an |
| + // immediate child of this FrameTreeNode. Kills this renderer otherwise |
| + // with bad message |reason|. |
| + FrameTreeNode* CheckAndGetIfImmediateChild( |
| + int32 child_frame_routing_id, bad_message::BadMessageReason reason); |
| + |
| // For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a |
| // refcount that calls Shutdown when it reaches zero. This allows each |
| // RenderFrameHostManager to just care about RenderFrameHosts, while ensuring |