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

Side by Side Diff: third_party/WebKit/Source/modules/mediasource/MediaSource.cpp

Issue 2366253002: Remove ActiveDOMObject::stop() (Closed)
Patch Set: temp Created 4 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 727
728 setReadyState(openKeyword()); 728 setReadyState(openKeyword());
729 m_webMediaSource->unmarkEndOfStream(); 729 m_webMediaSource->unmarkEndOfStream();
730 } 730 }
731 731
732 bool MediaSource::hasPendingActivity() const { 732 bool MediaSource::hasPendingActivity() const {
733 return m_attachedElement || m_webMediaSource || 733 return m_attachedElement || m_webMediaSource ||
734 m_asyncEventQueue->hasPendingEvents() || m_addedToRegistryCounter > 0; 734 m_asyncEventQueue->hasPendingEvents() || m_addedToRegistryCounter > 0;
735 } 735 }
736 736
737 void MediaSource::stop() { 737 void MediaSource::contextDestroyed() {
738 m_asyncEventQueue->close(); 738 m_asyncEventQueue->close();
739 if (!isClosed()) 739 if (!isClosed())
740 setReadyState(closedKeyword()); 740 setReadyState(closedKeyword());
741 m_webMediaSource.reset(); 741 m_webMediaSource.reset();
742 } 742 }
743 743
744 std::unique_ptr<WebSourceBuffer> MediaSource::createWebSourceBuffer( 744 std::unique_ptr<WebSourceBuffer> MediaSource::createWebSourceBuffer(
745 const String& type, 745 const String& type,
746 const String& codecs, 746 const String& codecs,
747 ExceptionState& exceptionState) { 747 ExceptionState& exceptionState) {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 event->setTarget(this); 783 event->setTarget(this);
784 784
785 m_asyncEventQueue->enqueueEvent(event); 785 m_asyncEventQueue->enqueueEvent(event);
786 } 786 }
787 787
788 URLRegistry& MediaSource::registry() const { 788 URLRegistry& MediaSource::registry() const {
789 return MediaSourceRegistry::registry(); 789 return MediaSourceRegistry::registry();
790 } 790 }
791 791
792 } // namespace blink 792 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698