diff options
| author | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-11 20:36:38 +0000 |
|---|---|---|
| committer | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-11 20:36:38 +0000 |
| commit | 3d3d7b89eecf0884aafb368f38ee038a6018e4ef (patch) | |
| tree | f0a87cd610b23048bf5871e6b89b3749e6ff67be /content/browser/renderer_host | |
| parent | 88a23964bb14522653cae880cdf44a756b6e3d1f (diff) | |
| download | chromium_src-3d3d7b89eecf0884aafb368f38ee038a6018e4ef.zip chromium_src-3d3d7b89eecf0884aafb368f38ee038a6018e4ef.tar.gz chromium_src-3d3d7b89eecf0884aafb368f38ee038a6018e4ef.tar.bz2 | |
Move IPC for DidStartProvisionalLoadForFrame
This CL moves the IPC for DidStartProvisionalLoadForFrame from view_messages to frame_messages. The renderer code is moved from RenderView to RenderFrame. RenderFrameHost doesn't process the message for now, just delegates it back to RenderViewHost.
BUG=304341
Review URL: https://codereview.chromium.org/25811004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host')
4 files changed, 31 insertions, 9 deletions
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc index d6b7ed5..0ec640c 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc @@ -11,6 +11,7 @@ #include "content/common/frame_messages.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" +#include "url/gurl.h" namespace content { @@ -61,6 +62,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) { bool msg_is_ok = true; IPC_BEGIN_MESSAGE_MAP_EX(RenderFrameHostImpl, msg, msg_is_ok) IPC_MESSAGE_HANDLER(FrameHostMsg_Detach, OnDetach) + IPC_MESSAGE_HANDLER(FrameHostMsg_DidStartProvisionalLoadForFrame, + OnDidStartProvisionalLoadForFrame) IPC_END_MESSAGE_MAP_EX() return handled; @@ -88,4 +91,13 @@ void RenderFrameHostImpl::OnDetach(int64 parent_frame_id, int64 frame_id) { frame_tree_->RemoveFrame(parent_frame_id, frame_id); } +void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( + int64 frame_id, + int64 parent_frame_id, + bool is_main_frame, + const GURL& url) { + render_view_host_->OnDidStartProvisionalLoadForFrame( + frame_id, parent_frame_id, is_main_frame, url); +} + } // namespace content diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h index 220f151..b4ba136 100644 --- a/content/browser/renderer_host/render_frame_host_impl.h +++ b/content/browser/renderer_host/render_frame_host_impl.h @@ -10,6 +10,8 @@ #include "base/compiler_specific.h" #include "content/public/browser/render_frame_host.h" +class GURL; + namespace content { class FrameTree; @@ -48,10 +50,14 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost { } private: - bool is_swapped_out() { return is_swapped_out_; } - - // IPC message handlers. + // IPC Message handlers. void OnDetach(int64 parent_frame_id, int64 frame_id); + void OnDidStartProvisionalLoadForFrame(int64 frame_id, + int64 parent_frame_id, + bool main_frame, + const GURL& url); + + bool is_swapped_out() { return is_swapped_out_; } // TODO(nasko): This should be removed and replaced by RenderProcessHost. RenderViewHostImpl* render_view_host_; // Not owned. diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index ed07949..03161aa 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -935,8 +935,6 @@ bool RenderViewHostImpl::OnMessageReceived(const IPC::Message& msg) { IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_RunModal, OnRunModal) IPC_MESSAGE_HANDLER(ViewHostMsg_RenderViewReady, OnRenderViewReady) IPC_MESSAGE_HANDLER(ViewHostMsg_RenderProcessGone, OnRenderProcessGone) - IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartProvisionalLoadForFrame, - OnDidStartProvisionalLoadForFrame) IPC_MESSAGE_HANDLER(ViewHostMsg_DidRedirectProvisionalLoad, OnDidRedirectProvisionalLoad) IPC_MESSAGE_HANDLER(ViewHostMsg_DidFailProvisionalLoadWithError, diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h index 0364894..0a4fc92 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h @@ -464,6 +464,16 @@ class CONTENT_EXPORT RenderViewHostImpl // RenderFrameHost. void AttachToFrameTree(); + // The following IPC handlers are public so RenderFrameHost can call them, + // while we transition the code to not use RenderViewHost. + // + // TODO(nasko): Remove those methods once we are done moving navigation + // into RenderFrameHost. + void OnDidStartProvisionalLoadForFrame(int64 frame_id, + int64 parent_frame_id, + bool main_frame, + const GURL& url); + // NOTE: Do not add functions that just send an IPC message that are called in // one or two places. Have the caller send the IPC message directly (unless // the caller places are in different platforms, in which case it's better @@ -498,10 +508,6 @@ class CONTENT_EXPORT RenderViewHostImpl void OnRunModal(int opener_id, IPC::Message* reply_msg); void OnRenderViewReady(); void OnRenderProcessGone(int status, int error_code); - void OnDidStartProvisionalLoadForFrame(int64 frame_id, - int64 parent_frame_id, - bool main_frame, - const GURL& url); void OnDidRedirectProvisionalLoad(int32 page_id, const GURL& source_url, const GURL& target_url); |