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

Unified Diff: Source/modules/mediasource/SourceBufferList.h

Issue 270253004: Enable oilpan in modules/mediasource (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/mediasource/SourceBuffer.cpp ('k') | Source/modules/mediasource/SourceBufferList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediasource/SourceBufferList.h
diff --git a/Source/modules/mediasource/SourceBufferList.h b/Source/modules/mediasource/SourceBufferList.h
index fab0d568869c23cca4b2e7cdf9df4c57472dc649..f0c78437a36d5898cdc771de57d9829c48c42430 100644
--- a/Source/modules/mediasource/SourceBufferList.h
+++ b/Source/modules/mediasource/SourceBufferList.h
@@ -34,7 +34,6 @@
#include "bindings/v8/ScriptWrappable.h"
#include "modules/EventTargetModules.h"
#include "platform/heap/Handle.h"
-#include "wtf/RefCounted.h"
#include "wtf/Vector.h"
namespace WebCore {
@@ -42,20 +41,20 @@ namespace WebCore {
class SourceBuffer;
class GenericEventQueue;
-class SourceBufferList FINAL : public RefCountedWillBeRefCountedGarbageCollected<SourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData {
- REFCOUNTED_EVENT_TARGET(SourceBufferList);
+class SourceBufferList FINAL : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<SourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData {
+ DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<SourceBufferList>);
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SourceBufferList);
public:
- static PassRefPtrWillBeRawPtr<SourceBufferList> create(ExecutionContext* context, GenericEventQueue* asyncEventQueue)
+ static SourceBufferList* create(ExecutionContext* context, GenericEventQueue* asyncEventQueue)
{
- return adoptRefWillBeRefCountedGarbageCollected(new SourceBufferList(context, asyncEventQueue));
+ return adoptRefCountedGarbageCollected(new SourceBufferList(context, asyncEventQueue));
Erik Corry 2014/07/01 08:53:56 This does not compile for me in the oilpan=1 confi
}
virtual ~SourceBufferList();
unsigned long length() const { return m_list.size(); }
SourceBuffer* item(unsigned long index) const { return (index < m_list.size()) ? m_list[index].get() : 0; }
- void add(PassRefPtrWillBeRawPtr<SourceBuffer>);
+ void add(SourceBuffer*);
void remove(SourceBuffer*);
bool contains(SourceBuffer* buffer) { return m_list.find(buffer) != kNotFound; }
void clear();
@@ -74,7 +73,7 @@ private:
ExecutionContext* m_executionContext;
GenericEventQueue* m_asyncEventQueue;
- WillBeHeapVector<RefPtrWillBeMember<SourceBuffer> > m_list;
+ HeapVector<Member<SourceBuffer> > m_list;
};
} // namespace WebCore
« no previous file with comments | « Source/modules/mediasource/SourceBuffer.cpp ('k') | Source/modules/mediasource/SourceBufferList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698