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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 275813004: android: Unset the DelegatedResourceCollection before LoseAllResources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android-ack: enabletest Created 6 years, 7 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 | « chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index d093def224919018ef8e1cfcb9c07e7f845ddf7a..2e9efb2a433a618af4786642fda7fabdfe747350 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -808,10 +808,9 @@ void RenderWidgetHostViewAndroid::SwapDelegatedFrame(
// Drop the cc::DelegatedFrameResourceCollection so that we will not return
// any resources from the old output surface with the new output surface id.
if (resource_collection_.get()) {
+ resource_collection_->SetClient(NULL);
if (resource_collection_->LoseAllResources())
SendReturnedDelegatedResources(last_output_surface_id_);
-
- resource_collection_->SetClient(NULL);
resource_collection_ = NULL;
}
DestroyDelegatedContent();
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698