Add minimal implementation of unprefixed MediaSource API that has feature parity with prefixed API

Source/modules/mediasource/SourceBufferList.cpp

 /*
- * 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
  * 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.
  */
 
 #include "config.h"
-#include "modules/mediasource/WebKitSourceBufferList.h"
+#include "modules/mediasource/SourceBufferList.h"
 
 #include "core/dom/Event.h"
 #include "core/dom/GenericEventQueue.h"
-#include "modules/mediasource/WebKitSourceBuffer.h"
+#include "modules/mediasource/SourceBuffer.h"
 
 namespace WebCore {
 
-WebKitSourceBufferList::WebKitSourceBufferList(ScriptExecutionContext* context, GenericEventQueue* asyncEventQueue)
+SourceBufferList::SourceBufferList(ScriptExecutionContext* context, GenericEventQueue* asyncEventQueue)
     : m_scriptExecutionContext(context)
     , m_asyncEventQueue(asyncEventQueue)
 {
     ScriptWrappable::init(this);
 }
 
-unsigned long WebKitSourceBufferList::length() const
+SourceBufferList::~SourceBufferList()
+{
+    ASSERT(m_list.isEmpty());
+}
+
+unsigned long SourceBufferList::length() const
 {
     return m_list.size();

[adamk, 2013/06/10 23:05:40]

Any reason not to inline? Similar questions about most small functions in this
patch. I guess that can easily wait till later, if only to make the diff for
this patch small.

[acolwell GONE FROM CHROMIUM, 2013/06/10 23:36:15]

Done for all non-virtual methods. It isn't clear from the style guide whether
Chromium's ban on inline virtual functions applies to Blink.

 }
 
-WebKitSourceBuffer* WebKitSourceBufferList::item(unsigned index) const
+SourceBuffer* SourceBufferList::item(unsigned index) const
 {
     if (index >= m_list.size())
         return 0;
     return m_list[index].get();
 }
 
-void WebKitSourceBufferList::add(PassRefPtr<WebKitSourceBuffer> buffer)
+void SourceBufferList::add(PassRefPtr<SourceBuffer> buffer)
 {
     m_list.append(buffer);
-    createAndFireEvent(eventNames().webkitaddsourcebufferEvent);
+    createAndFireEvent(eventNames().addsourcebufferEvent);
 }
 
-bool WebKitSourceBufferList::remove(WebKitSourceBuffer* buffer)
+bool SourceBufferList::contains(SourceBuffer* buffer)
+{
+    return m_list.find(buffer) != notFound;
+}
+
+void SourceBufferList::remove(SourceBuffer* buffer)
 {
     size_t index = m_list.find(buffer);
     if (index == notFound)
-        return false;
-
-    buffer->removedFromMediaSource();
+        return;
     m_list.remove(index);
-    createAndFireEvent(eventNames().webkitremovesourcebufferEvent);
-    return true;
+    createAndFireEvent(eventNames().removesourcebufferEvent);
 }
 
-void WebKitSourceBufferList::clear()
+void SourceBufferList::clear()
 {
-    for (size_t i = 0; i < m_list.size(); ++i)
-        m_list[i]->removedFromMediaSource();
     m_list.clear();
-    createAndFireEvent(eventNames().webkitremovesourcebufferEvent);
+    createAndFireEvent(eventNames().removesourcebufferEvent);
 }
 
-void WebKitSourceBufferList::createAndFireEvent(const AtomicString& eventName)
+void SourceBufferList::createAndFireEvent(const AtomicString& eventName)
 {
     ASSERT(m_asyncEventQueue);
 
     RefPtr<Event> event = Event::create(eventName, false, false);
     event->setTarget(this);
 
     m_asyncEventQueue->enqueueEvent(event.release());
 }
 
-const AtomicString& WebKitSourceBufferList::interfaceName() const
+const AtomicString& SourceBufferList::interfaceName() const
 {
-    return eventNames().interfaceForWebKitSourceBufferList;
+    return eventNames().interfaceForSourceBufferList;
 }
 
-ScriptExecutionContext* WebKitSourceBufferList::scriptExecutionContext() const
+ScriptExecutionContext* SourceBufferList::scriptExecutionContext() const
 {
     return m_scriptExecutionContext;
 }
 
-EventTargetData* WebKitSourceBufferList::eventTargetData()
+EventTargetData* SourceBufferList::eventTargetData()
 {
     return &m_eventTargetData;
 }
 
-EventTargetData* WebKitSourceBufferList::ensureEventTargetData()
+EventTargetData* SourceBufferList::ensureEventTargetData()
 {
     return &m_eventTargetData;
 }
 
 } // namespace WebCore