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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h

Issue 1421373007: Remove unwanted eager finalization of some mediastream objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « third_party/WebKit/Source/modules/mediastream/MediaStream.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Ericsson AB. All rights reserved. 3 * Copyright (C) 2011 Ericsson AB. 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 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 // EventTarget 82 // EventTarget
83 const AtomicString& interfaceName() const override; 83 const AtomicString& interfaceName() const override;
84 ExecutionContext* executionContext() const override; 84 ExecutionContext* executionContext() const override;
85 85
86 // ActiveDOMObject 86 // ActiveDOMObject
87 void stop() override; 87 void stop() override;
88 88
89 PassOwnPtr<AudioSourceProvider> createWebAudioSource(); 89 PassOwnPtr<AudioSourceProvider> createWebAudioSource();
90 90
91 // Oilpan: need to eagerly unregister as observer.
92 EAGERLY_FINALIZE();
93 DECLARE_VIRTUAL_TRACE(); 91 DECLARE_VIRTUAL_TRACE();
94 92
95 private: 93 private:
96 MediaStreamTrack(ExecutionContext*, MediaStreamComponent*); 94 MediaStreamTrack(ExecutionContext*, MediaStreamComponent*);
97 95
98 // MediaStreamSourceObserver 96 // MediaStreamSourceObserver
99 void sourceChangedState() override; 97 void sourceChangedState() override;
100 98
101 void propagateTrackEnded(); 99 void propagateTrackEnded();
102 100
103 MediaStreamSource::ReadyState m_readyState; 101 MediaStreamSource::ReadyState m_readyState;
104 HeapHashSet<Member<MediaStream>> m_registeredMediaStreams; 102 HeapHashSet<Member<MediaStream>> m_registeredMediaStreams;
105 bool m_isIteratingRegisteredMediaStreams; 103 bool m_isIteratingRegisteredMediaStreams;
106 bool m_stopped; 104 bool m_stopped;
107 Member<MediaStreamComponent> m_component; 105 Member<MediaStreamComponent> m_component;
108 }; 106 };
109 107
110 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector; 108 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector;
111 109
112 } // namespace blink 110 } // namespace blink
113 111
114 #endif // MediaStreamTrack_h 112 #endif // MediaStreamTrack_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/mediastream/MediaStream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698