Chromium Code Reviews| Index: third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h |
| diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h b/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h |
| index a7ab84147b152911bbaa6a7bd8268373cde98a62..41a4f3347010b05275a1d52216c56aa7de1993f3 100644 |
| --- a/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h |
| +++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h |
| @@ -44,7 +44,7 @@ |
| namespace blink { |
| -class PLATFORM_EXPORT MediaStreamSource final : public RefCounted<MediaStreamSource> { |
| +class PLATFORM_EXPORT MediaStreamSource final : public GarbageCollectedFinalized<MediaStreamSource> { |
| public: |
| class PLATFORM_EXPORT Observer { |
|
sof
2015/09/30 06:26:35
If the Observers are on the heap, shouldn't this b
peria
2015/09/30 07:50:05
Done.
|
| public: |
| @@ -68,7 +68,7 @@ public: |
| ReadyStateEnded = 2 |
| }; |
| - static PassRefPtr<MediaStreamSource> create(const String& id, Type, const String& name, bool remote, bool readonly, ReadyState = ReadyStateLive, bool requiresConsumer = false); |
| + static MediaStreamSource* create(const String& id, Type, const String& name, bool remote, bool readonly, ReadyState = ReadyStateLive, bool requiresConsumer = false); |
| const String& id() const { return m_id; } |
| Type type() const { return m_type; } |
| @@ -96,6 +96,8 @@ public: |
| bool removeAudioConsumer(AudioDestinationConsumer*); |
| const HeapHashSet<Member<AudioDestinationConsumer>>& audioConsumers() { return m_audioConsumers; } |
| + DECLARE_TRACE(); |
| + |
| private: |
| MediaStreamSource(const String& id, Type, const String& name, bool remote, bool readonly, ReadyState, bool requiresConsumer); |
| @@ -108,12 +110,12 @@ private: |
| bool m_requiresConsumer; |
| Vector<Observer*> m_observers; |
|
sof
2015/09/30 06:26:35
Are these bare pointers referring to heap objects?
haraken
2015/09/30 07:18:20
The GC plugin should be able to catch this error.
Yuta Kitamura
2015/09/30 07:25:09
In the current code, Observer isn't a heap-managed
haraken
2015/09/30 07:35:32
Would it be possible to catch the following case?
peria
2015/09/30 07:50:05
Done.
Just a note to work for this Vector<>.
|
| Mutex m_audioConsumersLock; |
| - PersistentHeapHashSet<Member<AudioDestinationConsumer>> m_audioConsumers; |
| + HeapHashSet<Member<AudioDestinationConsumer>> m_audioConsumers; |
| OwnPtr<ExtraData> m_extraData; |
| WebMediaConstraints m_constraints; |
| }; |
| -typedef Vector<RefPtr<MediaStreamSource>> MediaStreamSourceVector; |
| +typedef HeapVector<Member<MediaStreamSource>> MediaStreamSourceVector; |
| } // namespace blink |