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

Unified Diff: Source/modules/mediastream/MediaStream.h

Issue 545933002: Implement HTMLMediaElement::srcObject. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed sofs easy comments. Created 6 years, 3 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: Source/modules/mediastream/MediaStream.h
diff --git a/Source/modules/mediastream/MediaStream.h b/Source/modules/mediastream/MediaStream.h
index 7e6748ee92c6a746dcdb46e7016560272adcd907..214cd09f88459c8d86a24e8b3b909be02d547c41 100644
--- a/Source/modules/mediastream/MediaStream.h
+++ b/Source/modules/mediastream/MediaStream.h
@@ -27,6 +27,7 @@
#define MediaStream_h
#include "core/dom/ContextLifecycleObserver.h"
+#include "core/html/MediaProvider.h"
#include "core/html/URLRegistry.h"
#include "modules/EventTargetModules.h"
#include "modules/mediastream/MediaStreamTrack.h"
@@ -40,6 +41,7 @@ class ExceptionState;
class MediaStream FINAL
: public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStream>
, public URLRegistrable
+ , public MediaProvider
, public MediaStreamDescriptorClient
, public EventTargetWithInlineData
, public ContextLifecycleObserver {
@@ -88,6 +90,10 @@ public:
// URLRegistrable
virtual URLRegistry& registry() const OVERRIDE;
+ // MediaProvider
+ virtual EventTarget* eventTarget() OVERRIDE { return this; }
+ virtual const String& getObjectUrl() OVERRIDE;
+
virtual void trace(Visitor*) OVERRIDE;
private:
@@ -105,6 +111,7 @@ private:
void scheduledEventTimerFired(Timer<MediaStream>*);
bool m_stopped;
+ String m_objectUrl;
MediaStreamTrackVector m_audioTracks;
MediaStreamTrackVector m_videoTracks;

Powered by Google App Engine
This is Rietveld 408576698