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

Unified Diff: content/common/gpu/media/omx_video_decode_accelerator.cc

Issue 7587004: Destroy OmxVideoDecodeAccelerator on renderer close, too. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | « content/common/gpu/media/gpu_video_decode_accelerator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/omx_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/omx_video_decode_accelerator.cc b/content/common/gpu/media/omx_video_decode_accelerator.cc
index f2e79812ccfe2d4ca0f61c1137cd22dc2bf4768b..80baafe56f3a1dee51f98b965c16fe5d08202df7 100644
--- a/content/common/gpu/media/omx_video_decode_accelerator.cc
+++ b/content/common/gpu/media/omx_video_decode_accelerator.cc
@@ -424,8 +424,10 @@ void OmxVideoDecodeAccelerator::Reset() {
void OmxVideoDecodeAccelerator::Destroy() {
DCHECK_EQ(message_loop_, MessageLoop::current());
- if (current_state_change_ == ERRORING)
+ if (current_state_change_ == ERRORING ||
+ current_state_change_ == DESTROYING) {
return;
+ }
DCHECK(current_state_change_ == NO_TRANSITION ||
current_state_change_ == FLUSHING ||
« no previous file with comments | « content/common/gpu/media/gpu_video_decode_accelerator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698