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

Unified Diff: Source/platform/mediastream/MediaStreamComponent.h

Issue 534473002: Revert of Oilpan: Move MediaStreamSource, MediaStreamComponent and MediaStreamDescriptor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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
Index: Source/platform/mediastream/MediaStreamComponent.h
diff --git a/Source/platform/mediastream/MediaStreamComponent.h b/Source/platform/mediastream/MediaStreamComponent.h
index 3cda7d91120383c6e830a44dcce94d5418a6da57..69f58b29b2e933b0b287c67c9b77afdc9f0bd119 100644
--- a/Source/platform/mediastream/MediaStreamComponent.h
+++ b/Source/platform/mediastream/MediaStreamComponent.h
@@ -33,9 +33,9 @@
#define MediaStreamComponent_h
#include "platform/audio/AudioSourceProvider.h"
-#include "platform/heap/Handle.h"
#include "wtf/PassOwnPtr.h"
#include "wtf/PassRefPtr.h"
+#include "wtf/RefCounted.h"
#include "wtf/ThreadingPrimitives.h"
#include "wtf/text/WTFString.h"
@@ -45,15 +45,15 @@
class MediaStreamSource;
class WebAudioSourceProvider;
-class PLATFORM_EXPORT MediaStreamComponent FINAL : public GarbageCollectedFinalized<MediaStreamComponent> {
+class PLATFORM_EXPORT MediaStreamComponent : public RefCounted<MediaStreamComponent> {
public:
class ExtraData {
public:
virtual ~ExtraData() { }
};
- static MediaStreamComponent* create(MediaStreamSource*);
- static MediaStreamComponent* create(const String& id, MediaStreamSource*);
+ static PassRefPtr<MediaStreamComponent> create(PassRefPtr<MediaStreamSource>);
+ static PassRefPtr<MediaStreamComponent> create(const String& id, PassRefPtr<MediaStreamSource>);
MediaStreamSource* source() const { return m_source.get(); }
@@ -70,10 +70,8 @@
ExtraData* extraData() const { return m_extraData.get(); }
void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = extraData; }
- void trace(Visitor*);
-
private:
- MediaStreamComponent(const String& id, MediaStreamSource*);
+ MediaStreamComponent(const String& id, PassRefPtr<MediaStreamSource>);
#if ENABLE(WEB_AUDIO)
// AudioSourceProviderImpl wraps a WebAudioSourceProvider::provideInput()
@@ -102,14 +100,14 @@
AudioSourceProviderImpl m_sourceProvider;
#endif // ENABLE(WEB_AUDIO)
- Member<MediaStreamSource> m_source;
+ RefPtr<MediaStreamSource> m_source;
String m_id;
bool m_enabled;
bool m_muted;
OwnPtr<ExtraData> m_extraData;
};
-typedef HeapVector<Member<MediaStreamComponent> > MediaStreamComponentVector;
+typedef Vector<RefPtr<MediaStreamComponent> > MediaStreamComponentVector;
} // namespace blink
« no previous file with comments | « Source/platform/exported/WebMediaStreamTrack.cpp ('k') | Source/platform/mediastream/MediaStreamComponent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698