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

Side by Side Diff: Source/modules/mediasource/SourceBufferList.cpp

Issue 16625011: Add minimal implementation of unprefixed MediaSource API that has feature parity with prefixed API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix global-constructors-listing-expected.txt Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
11 * copyright notice, this list of conditions and the following disclaimer 11 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the 12 * in the documentation and/or other materials provided with the
13 * distribution. 13 * distribution.
14 * * Neither the name of Google Inc. nor the names of its 14 * * Neither the name of Google Inc. nor the names of its
15 * contributors may be used to endorse or promote products derived from 15 * contributors may be used to endorse or promote products derived from
16 * this software without specific prior written permission. 16 * this software without specific prior written permission.
17 * 17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "modules/mediasource/WebKitSourceBufferList.h" 32 #include "modules/mediasource/SourceBufferList.h"
33 33
34 #include "core/dom/Event.h" 34 #include "core/dom/Event.h"
35 #include "core/dom/GenericEventQueue.h" 35 #include "core/dom/GenericEventQueue.h"
36 #include "modules/mediasource/WebKitSourceBuffer.h" 36 #include "modules/mediasource/SourceBuffer.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 WebKitSourceBufferList::WebKitSourceBufferList(ScriptExecutionContext* context, GenericEventQueue* asyncEventQueue) 40 SourceBufferList::SourceBufferList(ScriptExecutionContext* context, GenericEvent Queue* asyncEventQueue)
41 : m_scriptExecutionContext(context) 41 : m_scriptExecutionContext(context)
42 , m_asyncEventQueue(asyncEventQueue) 42 , m_asyncEventQueue(asyncEventQueue)
43 { 43 {
44 ScriptWrappable::init(this); 44 ScriptWrappable::init(this);
45 } 45 }
46 46
47 unsigned long WebKitSourceBufferList::length() const 47 SourceBufferList::~SourceBufferList()
48 { 48 {
49 return m_list.size(); 49 ASSERT(m_list.isEmpty());
50 } 50 }
51 51
52 WebKitSourceBuffer* WebKitSourceBufferList::item(unsigned index) const 52 void SourceBufferList::add(PassRefPtr<SourceBuffer> buffer)
53 { 53 {
54 if (index >= m_list.size()) 54 m_list.append(buffer);
55 return 0; 55 scheduleEvent(eventNames().addsourcebufferEvent);
56 return m_list[index].get();
57 } 56 }
58 57
59 void WebKitSourceBufferList::add(PassRefPtr<WebKitSourceBuffer> buffer) 58 void SourceBufferList::remove(SourceBuffer* buffer)
60 {
61 m_list.append(buffer);
62 createAndFireEvent(eventNames().webkitaddsourcebufferEvent);
63 }
64
65 bool WebKitSourceBufferList::remove(WebKitSourceBuffer* buffer)
66 { 59 {
67 size_t index = m_list.find(buffer); 60 size_t index = m_list.find(buffer);
68 if (index == notFound) 61 if (index == notFound)
69 return false; 62 return;
70
71 buffer->removedFromMediaSource();
72 m_list.remove(index); 63 m_list.remove(index);
73 createAndFireEvent(eventNames().webkitremovesourcebufferEvent); 64 scheduleEvent(eventNames().removesourcebufferEvent);
74 return true;
75 } 65 }
76 66
77 void WebKitSourceBufferList::clear() 67 void SourceBufferList::clear()
78 { 68 {
79 for (size_t i = 0; i < m_list.size(); ++i)
80 m_list[i]->removedFromMediaSource();
81 m_list.clear(); 69 m_list.clear();
82 createAndFireEvent(eventNames().webkitremovesourcebufferEvent); 70 scheduleEvent(eventNames().removesourcebufferEvent);
83 } 71 }
84 72
85 void WebKitSourceBufferList::createAndFireEvent(const AtomicString& eventName) 73 void SourceBufferList::scheduleEvent(const AtomicString& eventName)
86 { 74 {
87 ASSERT(m_asyncEventQueue); 75 ASSERT(m_asyncEventQueue);
88 76
89 RefPtr<Event> event = Event::create(eventName, false, false); 77 RefPtr<Event> event = Event::create(eventName, false, false);
90 event->setTarget(this); 78 event->setTarget(this);
91 79
92 m_asyncEventQueue->enqueueEvent(event.release()); 80 m_asyncEventQueue->enqueueEvent(event.release());
93 } 81 }
94 82
95 const AtomicString& WebKitSourceBufferList::interfaceName() const 83 const AtomicString& SourceBufferList::interfaceName() const
96 { 84 {
97 return eventNames().interfaceForWebKitSourceBufferList; 85 return eventNames().interfaceForSourceBufferList;
98 } 86 }
99 87
100 ScriptExecutionContext* WebKitSourceBufferList::scriptExecutionContext() const 88 ScriptExecutionContext* SourceBufferList::scriptExecutionContext() const
101 { 89 {
102 return m_scriptExecutionContext; 90 return m_scriptExecutionContext;
103 } 91 }
104 92
105 EventTargetData* WebKitSourceBufferList::eventTargetData() 93 EventTargetData* SourceBufferList::eventTargetData()
106 { 94 {
107 return &m_eventTargetData; 95 return &m_eventTargetData;
108 } 96 }
109 97
110 EventTargetData* WebKitSourceBufferList::ensureEventTargetData() 98 EventTargetData* SourceBufferList::ensureEventTargetData()
111 { 99 {
112 return &m_eventTargetData; 100 return &m_eventTargetData;
113 } 101 }
114 102
115 } // namespace WebCore 103 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/mediasource/SourceBufferList.h ('k') | Source/modules/mediasource/SourceBufferList.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698