diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 01:50:40 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 01:50:40 +0000 |
| commit | f17986f4821128bb1fdf4c8287dd5ae2eea5b1cf (patch) | |
| tree | dcfef12b9419696ae88f46382978577cd9798f37 /content/browser/frame_host/navigation_controller_impl.h | |
| parent | 53623a6a4f432c5c075c368963374faf05804eb2 (diff) | |
| download | chromium_src-f17986f4821128bb1fdf4c8287dd5ae2eea5b1cf.zip chromium_src-f17986f4821128bb1fdf4c8287dd5ae2eea5b1cf.tar.gz chromium_src-f17986f4821128bb1fdf4c8287dd5ae2eea5b1cf.tar.bz2 | |
Revert 249516 "Move DidCommitProvisionalLoad code from RenderVie..."
> Move DidCommitProvisionalLoad code from RenderView to RenderFrame.
>
> BUG=304341
> R=creis@chromium.org
>
> Review URL: https://codereview.chromium.org/135723003
Casuses a UAF on ASAN bots in SigninBrowserTest.SigninSkipForNowAndGoBack
http://build.chromium.org/p/chromium.memory/builders/Linux%20ASAN%20Tests%20%283%29/builds/22688/steps/browser_tests/logs/stdio
TBR=nasko@chromium.org
Review URL: https://codereview.chromium.org/152143010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/frame_host/navigation_controller_impl.h')
| -rw-r--r-- | content/browser/frame_host/navigation_controller_impl.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/content/browser/frame_host/navigation_controller_impl.h b/content/browser/frame_host/navigation_controller_impl.h index a33f5bc..e9206b4 100644 --- a/content/browser/frame_host/navigation_controller_impl.h +++ b/content/browser/frame_host/navigation_controller_impl.h @@ -16,7 +16,7 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_type.h" -struct FrameHostMsg_DidCommitProvisionalLoad_Params; +struct ViewHostMsg_FrameNavigate_Params; namespace content { class NavigationEntryImpl; @@ -136,10 +136,9 @@ class CONTENT_EXPORT NavigationControllerImpl // and it will return false. // // TODO(creis): Change RenderViewHost to RenderFrameHost. - bool RendererDidNavigate( - RenderViewHost* rvh, - const FrameHostMsg_DidCommitProvisionalLoad_Params& params, - LoadCommittedDetails* details); + bool RendererDidNavigate(RenderViewHost* rvh, + const ViewHostMsg_FrameNavigate_Params& params, + LoadCommittedDetails* details); // Notifies us that we just became active. This is used by the WebContentsImpl // so that we know to load URLs that were pending as "lazy" loads. @@ -236,7 +235,7 @@ class CONTENT_EXPORT NavigationControllerImpl // Classifies the given renderer navigation (see the NavigationType enum). NavigationType ClassifyNavigation( RenderViewHost* rvh, - const FrameHostMsg_DidCommitProvisionalLoad_Params& params) const; + const ViewHostMsg_FrameNavigate_Params& params) const; // Causes the controller to load the specified entry. The function assumes // ownership of the pointer since it is put in the navigation list. @@ -259,24 +258,24 @@ class CONTENT_EXPORT NavigationControllerImpl // TODO(creis): Change RenderViewHost to RenderFrameHost. void RendererDidNavigateToNewPage( RenderViewHost* rvh, - const FrameHostMsg_DidCommitProvisionalLoad_Params& params, + const ViewHostMsg_FrameNavigate_Params& params, bool replace_entry); void RendererDidNavigateToExistingPage( RenderViewHost* rvh, - const FrameHostMsg_DidCommitProvisionalLoad_Params& params); + const ViewHostMsg_FrameNavigate_Params& params); void RendererDidNavigateToSamePage( RenderViewHost* rvh, - const FrameHostMsg_DidCommitProvisionalLoad_Params& params); + const ViewHostMsg_FrameNavigate_Params& params); void RendererDidNavigateInPage( RenderViewHost* rvh, - const FrameHostMsg_DidCommitProvisionalLoad_Params& params, + const ViewHostMsg_FrameNavigate_Params& params, bool* did_replace_entry); void RendererDidNavigateNewSubframe( RenderViewHost* rvh, - const FrameHostMsg_DidCommitProvisionalLoad_Params& params); + const ViewHostMsg_FrameNavigate_Params& params); bool RendererDidNavigateAutoSubframe( RenderViewHost* rvh, - const FrameHostMsg_DidCommitProvisionalLoad_Params& params); + const ViewHostMsg_FrameNavigate_Params& params); // Helper function for code shared between Reload() and ReloadIgnoringCache(). void ReloadInternal(bool check_for_repost, ReloadType reload_type); |