Index: Source/modules/mediasource/MediaSource.h |
diff --git a/Source/modules/mediasource/WebKitMediaSource.h b/Source/modules/mediasource/MediaSource.h |
similarity index 71% |
copy from Source/modules/mediasource/WebKitMediaSource.h |
copy to Source/modules/mediasource/MediaSource.h |
index ed64c06c0e3e71148d88aea835497d38078c527f..2d5494625422732d2d8a41da602e44a6451719d5 100644 |
--- a/Source/modules/mediasource/WebKitMediaSource.h |
+++ b/Source/modules/mediasource/MediaSource.h |
@@ -1,5 +1,5 @@ |
/* |
- * Copyright (C) 2012 Google Inc. All rights reserved. |
+ * Copyright (C) 2013 Google Inc. All rights reserved. |
* |
* Redistribution and use in source and binary forms, with or without |
* modification, are permitted provided that the following conditions are |
@@ -28,27 +28,27 @@ |
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#ifndef WebKitMediaSource_h |
-#define WebKitMediaSource_h |
+#ifndef MediaSource_h |
+#define MediaSource_h |
#include "bindings/v8/ScriptWrappable.h" |
#include "modules/mediasource/MediaSourceBase.h" |
-#include "modules/mediasource/WebKitSourceBuffer.h" |
-#include "modules/mediasource/WebKitSourceBufferList.h" |
+#include "modules/mediasource/SourceBuffer.h" |
+#include "modules/mediasource/SourceBufferList.h" |
#include "wtf/RefCounted.h" |
namespace WebCore { |
-class WebKitMediaSource : public MediaSourceBase, public ScriptWrappable { |
+class MediaSource : public MediaSourceBase, public ScriptWrappable { |
public: |
- static PassRefPtr<WebKitMediaSource> create(ScriptExecutionContext*); |
- virtual ~WebKitMediaSource() { } |
+ static PassRefPtr<MediaSource> create(ScriptExecutionContext*); |
+ virtual ~MediaSource(); |
- // WebKitMediaSource.idl methods |
- WebKitSourceBufferList* sourceBuffers(); |
- WebKitSourceBufferList* activeSourceBuffers(); |
- WebKitSourceBuffer* addSourceBuffer(const String& type, ExceptionCode&); |
- void removeSourceBuffer(WebKitSourceBuffer*, ExceptionCode&); |
+ // MediaSource.idl methods |
+ SourceBufferList* sourceBuffers() { return m_sourceBuffers.get(); } |
+ SourceBufferList* activeSourceBuffers() { return m_activeSourceBuffers.get(); } |
+ SourceBuffer* addSourceBuffer(const String& type, ExceptionCode&); |
+ void removeSourceBuffer(SourceBuffer*, ExceptionCode&); |
static bool isTypeSupported(const String& type); |
// EventTarget interface |
@@ -60,13 +60,13 @@ public: |
virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE; |
private: |
- explicit WebKitMediaSource(ScriptExecutionContext*); |
+ explicit MediaSource(ScriptExecutionContext*); |
// MediaSourceBase interface |
virtual void setReadyState(const AtomicString&) OVERRIDE; |
- RefPtr<WebKitSourceBufferList> m_sourceBuffers; |
- RefPtr<WebKitSourceBufferList> m_activeSourceBuffers; |
+ RefPtr<SourceBufferList> m_sourceBuffers; |
+ RefPtr<SourceBufferList> m_activeSourceBuffers; |
}; |
} // namespace WebCore |