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

Side by Side Diff: third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.h

Issue 1363143003: [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes in PS8 Created 5 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Ericsson AB. All rights reserved. 2 * Copyright (C) 2011 Ericsson AB. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 22 matching lines...) Expand all
33 #define MediaStreamDescriptor_h 33 #define MediaStreamDescriptor_h
34 34
35 #include "platform/mediastream/MediaStreamComponent.h" 35 #include "platform/mediastream/MediaStreamComponent.h"
36 #include "platform/mediastream/MediaStreamSource.h" 36 #include "platform/mediastream/MediaStreamSource.h"
37 #include "wtf/PassOwnPtr.h" 37 #include "wtf/PassOwnPtr.h"
38 #include "wtf/RefCounted.h" 38 #include "wtf/RefCounted.h"
39 #include "wtf/Vector.h" 39 #include "wtf/Vector.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 class PLATFORM_EXPORT MediaStreamDescriptorClient { 43 class PLATFORM_EXPORT MediaStreamDescriptorClient : public GarbageCollectedMixin {
44 public: 44 public:
45 virtual ~MediaStreamDescriptorClient() { } 45 virtual ~MediaStreamDescriptorClient() { }
46 46
47 virtual void streamEnded() = 0; 47 virtual void streamEnded() = 0;
48 virtual void addRemoteTrack(MediaStreamComponent*) = 0; 48 virtual void addRemoteTrack(MediaStreamComponent*) = 0;
49 virtual void removeRemoteTrack(MediaStreamComponent*) = 0; 49 virtual void removeRemoteTrack(MediaStreamComponent*) = 0;
50 DEFINE_INLINE_VIRTUAL_TRACE() { }
50 }; 51 };
51 52
52 class PLATFORM_EXPORT MediaStreamDescriptor final : public RefCounted<MediaStrea mDescriptor> { 53 class PLATFORM_EXPORT MediaStreamDescriptor final : public GarbageCollectedFinal ized<MediaStreamDescriptor> {
53 public: 54 public:
54 class ExtraData { 55 class ExtraData {
55 public: 56 public:
56 virtual ~ExtraData() { } 57 virtual ~ExtraData() { }
57 }; 58 };
58 59
59 // Only used for AudioDestinationNode. 60 // Only used for AudioDestinationNode.
60 static PassRefPtr<MediaStreamDescriptor> create(const MediaStreamSourceVecto r& audioSources, const MediaStreamSourceVector& videoSources); 61 static MediaStreamDescriptor* create(const MediaStreamSourceVector& audioSou rces, const MediaStreamSourceVector& videoSources);
61 62
62 static PassRefPtr<MediaStreamDescriptor> create(const MediaStreamComponentVe ctor& audioComponents, const MediaStreamComponentVector& videoComponents); 63 static MediaStreamDescriptor* create(const MediaStreamComponentVector& audio Components, const MediaStreamComponentVector& videoComponents);
63 64
64 static PassRefPtr<MediaStreamDescriptor> create(const String& id, const Medi aStreamComponentVector& audioComponents, const MediaStreamComponentVector& video Components); 65 static MediaStreamDescriptor* create(const String& id, const MediaStreamComp onentVector& audioComponents, const MediaStreamComponentVector& videoComponents) ;
65 66
66 MediaStreamDescriptorClient* client() const { return m_client; } 67 MediaStreamDescriptorClient* client() const { return m_client; }
67 void setClient(MediaStreamDescriptorClient* client) { m_client = client; } 68 void setClient(MediaStreamDescriptorClient* client) { m_client = client; }
68 69
69 String id() const { return m_id; } 70 String id() const { return m_id; }
70 71
71 unsigned numberOfAudioComponents() const { return m_audioComponents.size(); } 72 unsigned numberOfAudioComponents() const { return m_audioComponents.size(); }
72 MediaStreamComponent* audioComponent(unsigned index) const { return m_audioC omponents[index].get(); } 73 MediaStreamComponent* audioComponent(unsigned index) const { return m_audioC omponents[index].get(); }
73 74
74 unsigned numberOfVideoComponents() const { return m_videoComponents.size(); } 75 unsigned numberOfVideoComponents() const { return m_videoComponents.size(); }
75 MediaStreamComponent* videoComponent(unsigned index) const { return m_videoC omponents[index].get(); } 76 MediaStreamComponent* videoComponent(unsigned index) const { return m_videoC omponents[index].get(); }
76 77
77 void addComponent(PassRefPtr<MediaStreamComponent>); 78 void addComponent(MediaStreamComponent*);
78 void removeComponent(PassRefPtr<MediaStreamComponent>); 79 void removeComponent(MediaStreamComponent*);
79 80
80 void addRemoteTrack(MediaStreamComponent*); 81 void addRemoteTrack(MediaStreamComponent*);
81 void removeRemoteTrack(MediaStreamComponent*); 82 void removeRemoteTrack(MediaStreamComponent*);
82 83
83 bool active() const { return m_active; } 84 bool active() const { return m_active; }
84 void setActive(bool active) { m_active = active; } 85 void setActive(bool active) { m_active = active; }
85 86
86 bool ended() const { return m_ended; } 87 bool ended() const { return m_ended; }
87 void setEnded() { m_ended = true; } 88 void setEnded() { m_ended = true; }
88 89
89 ExtraData* extraData() const { return m_extraData.get(); } 90 ExtraData* extraData() const { return m_extraData.get(); }
90 void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = extraData ; } 91 void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = extraData ; }
91 92
93 // |m_extraData| may hold pointers to GC objects, and it may touch them in d estruction.
94 // So this class is eagerly finalized to finalize |m_extraData| promptly.
95 EAGERLY_FINALIZE();
96 DECLARE_TRACE();
97
92 private: 98 private:
93 MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audio Sources, const MediaStreamSourceVector& videoSources); 99 MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audio Sources, const MediaStreamSourceVector& videoSources);
94 MediaStreamDescriptor(const String& id, const MediaStreamComponentVector& au dioComponents, const MediaStreamComponentVector& videoComponents); 100 MediaStreamDescriptor(const String& id, const MediaStreamComponentVector& au dioComponents, const MediaStreamComponentVector& videoComponents);
95 101
96 MediaStreamDescriptorClient* m_client; 102 Member<MediaStreamDescriptorClient> m_client;
97 String m_id; 103 String m_id;
98 Vector<RefPtr<MediaStreamComponent>> m_audioComponents; 104 HeapVector<Member<MediaStreamComponent>> m_audioComponents;
99 Vector<RefPtr<MediaStreamComponent>> m_videoComponents; 105 HeapVector<Member<MediaStreamComponent>> m_videoComponents;
100 bool m_active; 106 bool m_active;
101 bool m_ended; 107 bool m_ended;
102 108
103 OwnPtr<ExtraData> m_extraData; 109 OwnPtr<ExtraData> m_extraData;
104 }; 110 };
105 111
106 typedef Vector<RefPtr<MediaStreamDescriptor>> MediaStreamDescriptorVector; 112 typedef HeapVector<Member<MediaStreamDescriptor>> MediaStreamDescriptorVector;
107 113
108 } // namespace blink 114 } // namespace blink
109 115
110 #endif // MediaStreamDescriptor_h 116 #endif // MediaStreamDescriptor_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698