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 d51b1a5363b894b3bff2507b43f89f15ac0acbf2..0e2730172482392c30d9c2ea90a93750cc8a8da9 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.h |
+++ b/content/browser/frame_host/render_frame_host_impl.h |
@@ -96,9 +96,9 @@ enum CreateRenderFrameFlags { |
CREATE_RF_HIDDEN = 1 << 1, |
}; |
-class CONTENT_EXPORT RenderFrameHostImpl |
- : public RenderFrameHost, |
- public BrowserAccessibilityDelegate { |
+class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost, |
+ public BrowserAccessibilityDelegate, |
+ public SiteInstanceImpl::Observer { |
public: |
using AXTreeSnapshotCallback = |
base::Callback<void( |
@@ -207,6 +207,9 @@ class CONTENT_EXPORT RenderFrameHostImpl |
gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override; |
gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible() override; |
+ // SiteInstanceImpl::Observer |
+ void RenderProcessGone(SiteInstanceImpl* site_instance) override; |
+ |
// Creates a RenderFrame in the renderer process. |
bool CreateRenderFrame(int proxy_routing_id, |
int opener_routing_id, |
@@ -247,6 +250,11 @@ class CONTENT_EXPORT RenderFrameHostImpl |
// call FrameTreeNode::IsLoading. |
bool is_loading() const { return is_loading_; } |
+ // Sets this RenderFrameHost loading state. This is only used in the case of |
+ // transfer navigations, where no DidStart/DidStopLoading notifications |
+ // should be sent during the transfer. |
nasko
2016/02/09 17:15:24
nit: Let's add a TODO() to say that this can be re
clamy
2016/02/10 12:03:31
Done.
|
+ void set_is_loading(bool is_loading) { is_loading_ = is_loading; } |
+ |
// This returns the RenderFrameHost's owned RenderWidgetHost if it has one, |
// or else it returns nullptr. |
// If the RenderFrameHost is the page's main frame, this returns instead a |
@@ -527,6 +535,10 @@ class CONTENT_EXPORT RenderFrameHostImpl |
// Returns the Mojo ImageDownloader service. |
const image_downloader::ImageDownloaderPtr& GetMojoImageDownloader(); |
+ // Resets the loading state. Following this call, the RenderFrameHost will be |
+ // in a non-loading state. |
+ void ResetLoadingState(); |
+ |
protected: |
friend class RenderFrameHostFactory; |
@@ -572,7 +584,6 @@ class CONTENT_EXPORT RenderFrameHostImpl |
const base::string16& error_description, |
bool was_ignored_by_handler); |
void OnDidCommitProvisionalLoad(const IPC::Message& msg); |
- void OnDidDropNavigation(); |
void OnUpdateState(const PageState& state); |
void OnBeforeUnloadACK( |
bool proceed, |