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

Unified Diff: content/common/gpu/gpu_command_buffer_stub.cc

Issue 12213073: Re-land: Mark async texture uploads as completed from the upload thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix shutdown issue Created 7 years, 10 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
Index: content/common/gpu/gpu_command_buffer_stub.cc
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index de8d19683f4d56911f871f5e96b453933dd87095..c0cf2150bcdd69d23d04b73376b6682ec6abcc49 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -299,6 +299,9 @@ void GpuCommandBufferStub::Destroy() {
while (!sync_points_.empty())
OnRetireSyncPoint(sync_points_.front());
+ if (decoder_.get())
+ decoder_->set_engine(NULL);
+
// The scheduler has raw references to the decoder and the command buffer so
// destroy it before those.
scheduler_.reset();

Powered by Google App Engine
This is Rietveld 408576698