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

Unified Diff: Source/modules/mediasource/WebKitSourceBuffer.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/WebKitMediaSource.idl ('k') | Source/modules/mediasource/WebKitSourceBuffer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediasource/WebKitSourceBuffer.h
diff --git a/Source/modules/mediasource/SourceBuffer.h b/Source/modules/mediasource/WebKitSourceBuffer.h
similarity index 81%
rename from Source/modules/mediasource/SourceBuffer.h
rename to Source/modules/mediasource/WebKitSourceBuffer.h
index c1fada7c225f083da2cc945641fe9334e8af67c9..ca39a2b06ea0dc3fe628dd6821f5e88a1846feaf 100644
--- a/Source/modules/mediasource/SourceBuffer.h
+++ b/Source/modules/mediasource/WebKitSourceBuffer.h
@@ -28,8 +28,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef SourceBuffer_h
-#define SourceBuffer_h
+#ifndef WebKitSourceBuffer_h
+#define WebKitSourceBuffer_h
#include "core/dom/ExceptionCode.h"
#include "wtf/PassRefPtr.h"
@@ -37,17 +37,17 @@
#include "wtf/text/WTFString.h"
namespace WebCore {
-class MediaSource;
+class WebKitMediaSource;
class SourceBufferPrivate;
class TimeRanges;
-class SourceBuffer : public RefCounted<SourceBuffer> {
+class WebKitSourceBuffer : public RefCounted<WebKitSourceBuffer> {
public:
- static PassRefPtr<SourceBuffer> create(PassOwnPtr<SourceBufferPrivate>, PassRefPtr<MediaSource>);
+ static PassRefPtr<WebKitSourceBuffer> create(PassOwnPtr<SourceBufferPrivate>, PassRefPtr<WebKitMediaSource>);
- virtual ~SourceBuffer();
+ virtual ~WebKitSourceBuffer();
- // SourceBuffer.idl methods
+ // WebKitSourceBuffer.idl methods
PassRefPtr<TimeRanges> buffered(ExceptionCode&) const;
double timestampOffset() const;
void setTimestampOffset(double, ExceptionCode&);
@@ -57,14 +57,14 @@ public:
void removedFromMediaSource();
private:
- SourceBuffer(PassOwnPtr<SourceBufferPrivate>, PassRefPtr<MediaSource>);
+ WebKitSourceBuffer(PassOwnPtr<SourceBufferPrivate>, PassRefPtr<WebKitMediaSource>);
bool isRemoved() const;
bool isOpen() const;
- bool isEnded() const;
+ void openIfInEndedState();
OwnPtr<SourceBufferPrivate> m_private;
- RefPtr<MediaSource> m_source;
+ RefPtr<WebKitMediaSource> m_source;
double m_timestampOffset;
};
« no previous file with comments | « Source/modules/mediasource/WebKitMediaSource.idl ('k') | Source/modules/mediasource/WebKitSourceBuffer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698