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

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

Issue 2265873003: binding: Moves hasPendingActivity from ActiveScriptWrappable to ScriptWrappable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments. Created 4 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 unified diff | Download patch
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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 MediaStreamComponent* component() { return m_component; } 87 MediaStreamComponent* component() { return m_component; }
88 bool ended() const; 88 bool ended() const;
89 89
90 void registerMediaStream(MediaStream*); 90 void registerMediaStream(MediaStream*);
91 void unregisterMediaStream(MediaStream*); 91 void unregisterMediaStream(MediaStream*);
92 92
93 // EventTarget 93 // EventTarget
94 const AtomicString& interfaceName() const override; 94 const AtomicString& interfaceName() const override;
95 ExecutionContext* getExecutionContext() const override; 95 ExecutionContext* getExecutionContext() const override;
96 96
97 // ActiveScriptWrappable 97 // ScriptWrappable
98 bool hasPendingActivity() const final; 98 bool hasPendingActivity() const final;
99 99
100 // ActiveDOMObject 100 // ActiveDOMObject
101 void stop() override; 101 void stop() override;
102 102
103 std::unique_ptr<AudioSourceProvider> createWebAudioSource(); 103 std::unique_ptr<AudioSourceProvider> createWebAudioSource();
104 104
105 DECLARE_VIRTUAL_TRACE(); 105 DECLARE_VIRTUAL_TRACE();
106 106
107 private: 107 private:
(...skipping 12 matching lines...) Expand all
120 bool m_stopped; 120 bool m_stopped;
121 Member<MediaStreamComponent> m_component; 121 Member<MediaStreamComponent> m_component;
122 WebMediaConstraints m_constraints; 122 WebMediaConstraints m_constraints;
123 }; 123 };
124 124
125 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector; 125 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector;
126 126
127 } // namespace blink 127 } // namespace blink
128 128
129 #endif // MediaStreamTrack_h 129 #endif // MediaStreamTrack_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698