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

Unified Diff: Source/modules/mediasource/WebKitMediaSource.h

Issue 14619016: Add WebKit prefix to MediaSource,SourceBuffer, and SourceBufferList objects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 7 years, 7 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 | « Source/modules/mediasource/SourceBufferList.idl ('k') | Source/modules/mediasource/WebKitMediaSource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediasource/WebKitMediaSource.h
diff --git a/Source/modules/mediasource/MediaSource.h b/Source/modules/mediasource/WebKitMediaSource.h
similarity index 76%
rename from Source/modules/mediasource/MediaSource.h
rename to Source/modules/mediasource/WebKitMediaSource.h
index 089e5fbbd0b765d57ca11458c683c7c5e49dd586..b1529380d739a9494f3c05e5585a92111f32ab62 100644
--- a/Source/modules/mediasource/MediaSource.h
+++ b/Source/modules/mediasource/WebKitMediaSource.h
@@ -28,34 +28,34 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef MediaSource_h
-#define MediaSource_h
+#ifndef WebKitMediaSource_h
+#define WebKitMediaSource_h
#include "core/dom/ActiveDOMObject.h"
#include "core/dom/GenericEventQueue.h"
#include "core/platform/graphics/MediaSourcePrivate.h"
-#include "modules/mediasource/SourceBuffer.h"
-#include "modules/mediasource/SourceBufferList.h"
+#include "modules/mediasource/WebKitSourceBuffer.h"
+#include "modules/mediasource/WebKitSourceBufferList.h"
#include "wtf/RefCounted.h"
namespace WebCore {
-class MediaSource : public RefCounted<MediaSource>, public EventTarget, public ActiveDOMObject {
+class WebKitMediaSource : public RefCounted<WebKitMediaSource>, public EventTarget, public ActiveDOMObject {
public:
static const String& openKeyword();
static const String& closedKeyword();
static const String& endedKeyword();
- static PassRefPtr<MediaSource> create(ScriptExecutionContext*);
- virtual ~MediaSource() { }
+ static PassRefPtr<WebKitMediaSource> create(ScriptExecutionContext*);
+ virtual ~WebKitMediaSource() { }
- // MediaSource.idl methods
- SourceBufferList* sourceBuffers();
- SourceBufferList* activeSourceBuffers();
+ // WebKitMediaSource.idl methods
+ WebKitSourceBufferList* sourceBuffers();
+ WebKitSourceBufferList* activeSourceBuffers();
double duration() const;
void setDuration(double, ExceptionCode&);
- SourceBuffer* addSourceBuffer(const String& type, ExceptionCode&);
- void removeSourceBuffer(SourceBuffer*, ExceptionCode&);
+ WebKitSourceBuffer* addSourceBuffer(const String& type, ExceptionCode&);
+ void removeSourceBuffer(WebKitSourceBuffer*, ExceptionCode&);
const String& readyState() const;
void setReadyState(const String&);
void endOfStream(const String& error, ExceptionCode&);
@@ -71,11 +71,11 @@ public:
virtual bool hasPendingActivity() const OVERRIDE;
virtual void stop() OVERRIDE;
- using RefCounted<MediaSource>::ref;
- using RefCounted<MediaSource>::deref;
+ using RefCounted<WebKitMediaSource>::ref;
+ using RefCounted<WebKitMediaSource>::deref;
private:
- explicit MediaSource(ScriptExecutionContext*);
+ explicit WebKitMediaSource(ScriptExecutionContext*);
virtual EventTargetData* eventTargetData() OVERRIDE;
virtual EventTargetData* ensureEventTargetData() OVERRIDE;
@@ -90,8 +90,8 @@ private:
String m_readyState;
OwnPtr<MediaSourcePrivate> m_private;
- RefPtr<SourceBufferList> m_sourceBuffers;
- RefPtr<SourceBufferList> m_activeSourceBuffers;
+ RefPtr<WebKitSourceBufferList> m_sourceBuffers;
+ RefPtr<WebKitSourceBufferList> m_activeSourceBuffers;
OwnPtr<GenericEventQueue> m_asyncEventQueue;
};
« no previous file with comments | « Source/modules/mediasource/SourceBufferList.idl ('k') | Source/modules/mediasource/WebKitMediaSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698