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

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

Issue 1857143002: Oilpan: Remove RefCountedGarbageCollectedEventTargetWithInlineData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 21 matching lines...) Expand all
32 #include "modules/ModulesExport.h" 32 #include "modules/ModulesExport.h"
33 #include "modules/mediastream/MediaStreamTrack.h" 33 #include "modules/mediastream/MediaStreamTrack.h"
34 #include "platform/Timer.h" 34 #include "platform/Timer.h"
35 #include "platform/mediastream/MediaStreamDescriptor.h" 35 #include "platform/mediastream/MediaStreamDescriptor.h"
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 EventTargetWithInlineData
43 , public URLRegistrable 43 , public URLRegistrable
44 , public MediaStreamDescriptorClient 44 , public MediaStreamDescriptorClient
45 , public ContextLifecycleObserver { 45 , public ContextLifecycleObserver {
46 REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(MediaStream); 46 REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(MediaStream);
47 USING_GARBAGE_COLLECTED_MIXIN(MediaStream); 47 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&) ;
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 HeapVector<Member<Event>> m_scheduledEvents; 114 HeapVector<Member<Event>> m_scheduledEvents;
115 }; 115 };
116 116
117 typedef HeapVector<Member<MediaStream>> MediaStreamVector; 117 typedef HeapVector<Member<MediaStream>> MediaStreamVector;
118 118
119 MediaStream* toMediaStream(MediaStreamDescriptor*); 119 MediaStream* toMediaStream(MediaStreamDescriptor*);
120 120
121 } // namespace blink 121 } // namespace blink
122 122
123 #endif // MediaStream_h 123 #endif // MediaStream_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698