diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 07:27:28 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 07:27:28 +0000 |
| commit | e198683d045842e9da6cd5ce53b4f3c690ad2070 (patch) | |
| tree | 8a134325ba972af789a39623dbd9e674f429ce47 /content/renderer | |
| parent | 00464e4f3f8286cc1265db6b0dfc61cc40b94932 (diff) | |
| download | chromium_src-e198683d045842e9da6cd5ce53b4f3c690ad2070.zip chromium_src-e198683d045842e9da6cd5ce53b4f3c690ad2070.tar.gz chromium_src-e198683d045842e9da6cd5ce53b4f3c690ad2070.tar.bz2 | |
Eliminate SwapOut message parameters, keeping state in RVHM instead.
We no longer need to process SwapOut messages on the IO thread, and we no longer pass browser-internal request IDs to the renderer to be echoed back. This paves the way to support transferring navigations using
CrossSiteResourceHandler.
BUG=238331
TEST=No behavior change.
Review URL: https://chromiumcodereview.appspot.com/15682009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_view_browsertest.cc | 25 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.cc | 5 | ||||
| -rw-r--r-- | content/renderer/render_view_impl.h | 3 |
3 files changed, 7 insertions, 26 deletions
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index d964fbe..f412f72 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -425,32 +425,20 @@ TEST_F(RenderViewImplTest, SendSwapOutACK) { int initial_page_id = view()->GetPageId(); // Respond to a swap out request. - ViewMsg_SwapOut_Params params; - params.closing_process_id = 10; - params.closing_route_id = 11; - params.new_render_process_host_id = 12; - params.new_request_id = 13; - view()->OnSwapOut(params); + view()->OnSwapOut(); // Ensure the swap out commits synchronously. EXPECT_NE(initial_page_id, view()->GetPageId()); - // Check for a valid OnSwapOutACK with echoed params. + // Check for a valid OnSwapOutACK. const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching( ViewHostMsg_SwapOut_ACK::ID); ASSERT_TRUE(msg); - ViewHostMsg_SwapOut_ACK::Param reply_params; - ViewHostMsg_SwapOut_ACK::Read(msg, &reply_params); - EXPECT_EQ(params.closing_process_id, reply_params.a.closing_process_id); - EXPECT_EQ(params.closing_route_id, reply_params.a.closing_route_id); - EXPECT_EQ(params.new_render_process_host_id, - reply_params.a.new_render_process_host_id); - EXPECT_EQ(params.new_request_id, reply_params.a.new_request_id); // It is possible to get another swap out request. Ensure that we send // an ACK, even if we don't have to do anything else. render_thread_->sink().ClearMessages(); - view()->OnSwapOut(params); + view()->OnSwapOut(); const IPC::Message* msg2 = render_thread_->sink().GetUniqueMessageMatching( ViewHostMsg_SwapOut_ACK::ID); ASSERT_TRUE(msg2); @@ -505,12 +493,7 @@ TEST_F(RenderViewImplTest, ReloadWhileSwappedOut) { ProcessPendingMessages(); // Respond to a swap out request. - ViewMsg_SwapOut_Params params; - params.closing_process_id = 10; - params.closing_route_id = 11; - params.new_render_process_host_id = 12; - params.new_request_id = 13; - view()->OnSwapOut(params); + view()->OnSwapOut(); // Check for a OnSwapOutACK. const IPC::Message* msg = render_thread_->sink().GetUniqueMessageMatching( diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index e87392b..19ddf5f 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -5624,7 +5624,7 @@ void RenderViewImpl::OnShouldClose() { before_unload_end_time)); } -void RenderViewImpl::OnSwapOut(const ViewMsg_SwapOut_Params& params) { +void RenderViewImpl::OnSwapOut() { // Only run unload if we're not swapped out yet, but send the ack either way. if (!is_swapped_out_) { // Swap this RenderView out so the tab can navigate to a page rendered by a @@ -5657,8 +5657,7 @@ void RenderViewImpl::OnSwapOut(const ViewMsg_SwapOut_Params& params) { webview()->setVisibilityState(WebKit::WebPageVisibilityStateHidden, false); } - // Just echo back the params in the ACK. - Send(new ViewHostMsg_SwapOut_ACK(routing_id_, params)); + Send(new ViewHostMsg_SwapOut_ACK(routing_id_)); } void RenderViewImpl::NavigateToSwappedOutURL(WebKit::WebFrame* frame) { diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index c2cb2be..ddd1283 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -79,7 +79,6 @@ struct PP_NetAddress_Private; struct ViewMsg_Navigate_Params; struct ViewMsg_PostMessage_Params; struct ViewMsg_StopFinding_Params; -struct ViewMsg_SwapOut_Params; struct WebDropData; namespace ui { @@ -1042,7 +1041,7 @@ class CONTENT_EXPORT RenderViewImpl void OnShouldClose(); void OnStop(); void OnStopFinding(StopFindAction action); - void OnSwapOut(const ViewMsg_SwapOut_Params& params); + void OnSwapOut(); void OnThemeChanged(); void OnUpdateTargetURLAck(); void OnUpdateTimezone(); |