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

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

Issue 1545973002: Remove the is_loading_ field from WebContentsImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + addressed Nasko's nits Created 4 years, 10 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
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9767a4a5018b459a68f507ec47e21d41499c7abd..a4ba3a463d8af5ecfd69530c00361628e6e795a8 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,12 @@ 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.
+ // TODO(clamy): Remove this once PlzNavigate ships.
+ 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 +536,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 +585,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,
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698