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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 15682009: Eliminate SwapOut message parameters, keeping state in RVHM instead. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to get Android build fix Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 3057 matching lines...) Expand 10 before | Expand all | Expand 10 after
3068 #endif 3068 #endif
3069 3069
3070 // Ignore this if it comes from a RenderViewHost that we aren't showing. 3070 // Ignore this if it comes from a RenderViewHost that we aren't showing.
3071 if (delegate_ && rvh == GetRenderViewHost()) 3071 if (delegate_ && rvh == GetRenderViewHost())
3072 delegate_->CloseContents(this); 3072 delegate_->CloseContents(this);
3073 } 3073 }
3074 3074
3075 void WebContentsImpl::SwappedOut(RenderViewHost* rvh) { 3075 void WebContentsImpl::SwappedOut(RenderViewHost* rvh) {
3076 if (delegate_ && rvh == GetRenderViewHost()) 3076 if (delegate_ && rvh == GetRenderViewHost())
3077 delegate_->SwappedOut(this); 3077 delegate_->SwappedOut(this);
3078
3079 // Allow the navigation to proceed.
3080 render_manager_.SwappedOut(rvh);
3078 } 3081 }
3079 3082
3080 void WebContentsImpl::RequestMove(const gfx::Rect& new_bounds) { 3083 void WebContentsImpl::RequestMove(const gfx::Rect& new_bounds) {
3081 if (delegate_ && delegate_->IsPopupOrPanel(this)) 3084 if (delegate_ && delegate_->IsPopupOrPanel(this))
3082 delegate_->MoveContents(this, new_bounds); 3085 delegate_->MoveContents(this, new_bounds);
3083 } 3086 }
3084 3087
3085 void WebContentsImpl::DidStartLoading(RenderViewHost* render_view_host) { 3088 void WebContentsImpl::DidStartLoading(RenderViewHost* render_view_host) {
3086 SetIsLoading(true, NULL); 3089 SetIsLoading(true, NULL);
3087 3090
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
3668 } 3671 }
3669 3672
3670 BrowserPluginGuestManager* 3673 BrowserPluginGuestManager*
3671 WebContentsImpl::GetBrowserPluginGuestManager() const { 3674 WebContentsImpl::GetBrowserPluginGuestManager() const {
3672 return static_cast<BrowserPluginGuestManager*>( 3675 return static_cast<BrowserPluginGuestManager*>(
3673 GetBrowserContext()->GetUserData( 3676 GetBrowserContext()->GetUserData(
3674 browser_plugin::kBrowserPluginGuestManagerKeyName)); 3677 browser_plugin::kBrowserPluginGuestManagerKeyName));
3675 } 3678 }
3676 3679
3677 } // namespace content 3680 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698