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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 21 matching lines...) Expand all
32 #define MediaSource_h 32 #define MediaSource_h
33 33
34 #include "bindings/core/v8/ActiveScriptWrappable.h" 34 #include "bindings/core/v8/ActiveScriptWrappable.h"
35 #include "core/dom/ActiveDOMObject.h" 35 #include "core/dom/ActiveDOMObject.h"
36 #include "core/events/EventTarget.h" 36 #include "core/events/EventTarget.h"
37 #include "core/html/HTMLMediaSource.h" 37 #include "core/html/HTMLMediaSource.h"
38 #include "core/html/URLRegistry.h" 38 #include "core/html/URLRegistry.h"
39 #include "modules/mediasource/SourceBuffer.h" 39 #include "modules/mediasource/SourceBuffer.h"
40 #include "modules/mediasource/SourceBufferList.h" 40 #include "modules/mediasource/SourceBufferList.h"
41 #include "public/platform/WebMediaSource.h" 41 #include "public/platform/WebMediaSource.h"
42 #include "wtf/PassOwnPtr.h"
42 #include "wtf/Vector.h" 43 #include "wtf/Vector.h"
43 #include <memory>
44 44
45 namespace blink { 45 namespace blink {
46 46
47 class ExceptionState; 47 class ExceptionState;
48 class GenericEventQueue; 48 class GenericEventQueue;
49 class WebSourceBuffer; 49 class WebSourceBuffer;
50 50
51 class MediaSource final 51 class MediaSource final
52 : public EventTargetWithInlineData 52 : public EventTargetWithInlineData
53 , public HTMLMediaSource 53 , public HTMLMediaSource
(...skipping 17 matching lines...) Expand all
71 SourceBuffer* addSourceBuffer(const String& type, ExceptionState&); 71 SourceBuffer* addSourceBuffer(const String& type, ExceptionState&);
72 void removeSourceBuffer(SourceBuffer*, ExceptionState&); 72 void removeSourceBuffer(SourceBuffer*, ExceptionState&);
73 void setDuration(double, ExceptionState&); 73 void setDuration(double, ExceptionState&);
74 const AtomicString& readyState() const { return m_readyState; } 74 const AtomicString& readyState() const { return m_readyState; }
75 void endOfStream(const AtomicString& error, ExceptionState&); 75 void endOfStream(const AtomicString& error, ExceptionState&);
76 void endOfStream(ExceptionState&); 76 void endOfStream(ExceptionState&);
77 static bool isTypeSupported(const String& type); 77 static bool isTypeSupported(const String& type);
78 78
79 // HTMLMediaSource 79 // HTMLMediaSource
80 bool attachToElement(HTMLMediaElement*) override; 80 bool attachToElement(HTMLMediaElement*) override;
81 void setWebMediaSourceAndOpen(std::unique_ptr<WebMediaSource>) override; 81 void setWebMediaSourceAndOpen(PassOwnPtr<WebMediaSource>) override;
82 void close() override; 82 void close() override;
83 bool isClosed() const override; 83 bool isClosed() const override;
84 double duration() const override; 84 double duration() const override;
85 TimeRanges* buffered() const override; 85 TimeRanges* buffered() const override;
86 TimeRanges* seekable() const override; 86 TimeRanges* seekable() const override;
87 87
88 // EventTarget interface 88 // EventTarget interface
89 const AtomicString& interfaceName() const override; 89 const AtomicString& interfaceName() const override;
90 ExecutionContext* getExecutionContext() const override; 90 ExecutionContext* getExecutionContext() const override;
91 91
(...skipping 19 matching lines...) Expand all
111 DECLARE_VIRTUAL_TRACE(); 111 DECLARE_VIRTUAL_TRACE();
112 112
113 private: 113 private:
114 explicit MediaSource(ExecutionContext*); 114 explicit MediaSource(ExecutionContext*);
115 115
116 void setReadyState(const AtomicString&); 116 void setReadyState(const AtomicString&);
117 void onReadyStateChange(const AtomicString&, const AtomicString&); 117 void onReadyStateChange(const AtomicString&, const AtomicString&);
118 118
119 bool isUpdating() const; 119 bool isUpdating() const;
120 120
121 std::unique_ptr<WebSourceBuffer> createWebSourceBuffer(const String& type, c onst String& codecs, ExceptionState&); 121 PassOwnPtr<WebSourceBuffer> createWebSourceBuffer(const String& type, const String& codecs, ExceptionState&);
122 void scheduleEvent(const AtomicString& eventName); 122 void scheduleEvent(const AtomicString& eventName);
123 void endOfStreamInternal(const WebMediaSource::EndOfStreamStatus, ExceptionS tate&); 123 void endOfStreamInternal(const WebMediaSource::EndOfStreamStatus, ExceptionS tate&);
124 124
125 // Implements the duration change algorithm. 125 // Implements the duration change algorithm.
126 // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-sou rce.html#duration-change-algorithm 126 // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-sou rce.html#duration-change-algorithm
127 void durationChangeAlgorithm(double newDuration); 127 void durationChangeAlgorithm(double newDuration);
128 128
129 std::unique_ptr<WebMediaSource> m_webMediaSource; 129 OwnPtr<WebMediaSource> m_webMediaSource;
130 AtomicString m_readyState; 130 AtomicString m_readyState;
131 Member<GenericEventQueue> m_asyncEventQueue; 131 Member<GenericEventQueue> m_asyncEventQueue;
132 WeakMember<HTMLMediaElement> m_attachedElement; 132 WeakMember<HTMLMediaElement> m_attachedElement;
133 133
134 Member<SourceBufferList> m_sourceBuffers; 134 Member<SourceBufferList> m_sourceBuffers;
135 Member<SourceBufferList> m_activeSourceBuffers; 135 Member<SourceBufferList> m_activeSourceBuffers;
136 136
137 bool m_isAddedToRegistry; 137 bool m_isAddedToRegistry;
138 }; 138 };
139 139
140 } // namespace blink 140 } // namespace blink
141 141
142 #endif // MediaSource_h 142 #endif // MediaSource_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698