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

Unified Diff: Source/modules/mediasource/MediaSource.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/core/platform/graphics/MediaPlayerPrivate.h ('k') | Source/modules/mediasource/MediaSource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediasource/MediaSource.h
diff --git a/Source/modules/mediasource/MediaSource.h b/Source/modules/mediasource/MediaSource.h
deleted file mode 100644
index 089e5fbbd0b765d57ca11458c683c7c5e49dd586..0000000000000000000000000000000000000000
--- a/Source/modules/mediasource/MediaSource.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2012 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
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef MediaSource_h
-#define MediaSource_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 "wtf/RefCounted.h"
-
-namespace WebCore {
-
-class MediaSource : public RefCounted<MediaSource>, public EventTarget, public ActiveDOMObject {
-public:
- static const String& openKeyword();
- static const String& closedKeyword();
- static const String& endedKeyword();
-
- static PassRefPtr<MediaSource> create(ScriptExecutionContext*);
- virtual ~MediaSource() { }
-
- // MediaSource.idl methods
- SourceBufferList* sourceBuffers();
- SourceBufferList* activeSourceBuffers();
- double duration() const;
- void setDuration(double, ExceptionCode&);
- SourceBuffer* addSourceBuffer(const String& type, ExceptionCode&);
- void removeSourceBuffer(SourceBuffer*, ExceptionCode&);
- const String& readyState() const;
- void setReadyState(const String&);
- void endOfStream(const String& error, ExceptionCode&);
- static bool isTypeSupported(const String& type);
-
- void setPrivateAndOpen(PassOwnPtr<MediaSourcePrivate>);
-
- // EventTarget interface
- virtual const AtomicString& interfaceName() const OVERRIDE;
- virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
-
- // ActiveDOMObject interface
- virtual bool hasPendingActivity() const OVERRIDE;
- virtual void stop() OVERRIDE;
-
- using RefCounted<MediaSource>::ref;
- using RefCounted<MediaSource>::deref;
-
-private:
- explicit MediaSource(ScriptExecutionContext*);
-
- virtual EventTargetData* eventTargetData() OVERRIDE;
- virtual EventTargetData* ensureEventTargetData() OVERRIDE;
-
- virtual void refEventTarget() OVERRIDE { ref(); }
- virtual void derefEventTarget() OVERRIDE { deref(); }
-
- void scheduleEvent(const AtomicString& eventName);
-
- EventTargetData m_eventTargetData;
-
- String m_readyState;
- OwnPtr<MediaSourcePrivate> m_private;
-
- RefPtr<SourceBufferList> m_sourceBuffers;
- RefPtr<SourceBufferList> m_activeSourceBuffers;
- OwnPtr<GenericEventQueue> m_asyncEventQueue;
-};
-
-} // namespace WebCore
-
-#endif
« no previous file with comments | « Source/core/platform/graphics/MediaPlayerPrivate.h ('k') | Source/modules/mediasource/MediaSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698