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

Side by Side Diff: Source/modules/mediastream/MediaStream.h

Issue 1163253003: Clean up macros around DEFINE_EVENT_TARGET_REFCOUNTING (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | Annotate | Revision Log
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 25 matching lines...) Expand all
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class ExceptionState; 39 class ExceptionState;
40 40
41 class MODULES_EXPORT MediaStream final 41 class MODULES_EXPORT MediaStream final
42 : public RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream> 42 : public RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>
43 , public URLRegistrable 43 , public URLRegistrable
44 , public MediaStreamDescriptorClient 44 , public MediaStreamDescriptorClient
45 , public ContextLifecycleObserver { 45 , public ContextLifecycleObserver {
46 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWi llBeGarbageCollectedFinalized<MediaStream>); 46 REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(MediaStream);
47 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStream); 47 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStream);
48 DEFINE_WRAPPERTYPEINFO(); 48 DEFINE_WRAPPERTYPEINFO();
49 public: 49 public:
50 static MediaStream* create(ExecutionContext*); 50 static MediaStream* create(ExecutionContext*);
51 static MediaStream* create(ExecutionContext*, MediaStream*); 51 static MediaStream* create(ExecutionContext*, MediaStream*);
52 static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&) ; 52 static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&) ;
53 static MediaStream* create(ExecutionContext*, PassRefPtr<MediaStreamDescript or>); 53 static MediaStream* create(ExecutionContext*, PassRefPtr<MediaStreamDescript or>);
54 virtual ~MediaStream(); 54 virtual ~MediaStream();
55 55
56 // DEPRECATED 56 // DEPRECATED
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 Timer<MediaStream> m_scheduledEventTimer; 120 Timer<MediaStream> m_scheduledEventTimer;
121 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents; 121 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;
122 }; 122 };
123 123
124 typedef HeapVector<Member<MediaStream>> MediaStreamVector; 124 typedef HeapVector<Member<MediaStream>> MediaStreamVector;
125 125
126 } // namespace blink 126 } // namespace blink
127 127
128 #endif // MediaStream_h 128 #endif // MediaStream_h
OLDNEW
« no previous file with comments | « Source/modules/mediasource/SourceBufferList.h ('k') | Source/modules/mediastream/MediaStreamTrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698