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

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

Issue 403013002: Rename WebCore to blink in Modules (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 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 15 matching lines...) Expand all
26 #ifndef MediaStream_h 26 #ifndef MediaStream_h
27 #define MediaStream_h 27 #define MediaStream_h
28 28
29 #include "core/dom/ContextLifecycleObserver.h" 29 #include "core/dom/ContextLifecycleObserver.h"
30 #include "core/html/URLRegistry.h" 30 #include "core/html/URLRegistry.h"
31 #include "modules/EventTargetModules.h" 31 #include "modules/EventTargetModules.h"
32 #include "modules/mediastream/MediaStreamTrack.h" 32 #include "modules/mediastream/MediaStreamTrack.h"
33 #include "platform/Timer.h" 33 #include "platform/Timer.h"
34 #include "platform/mediastream/MediaStreamDescriptor.h" 34 #include "platform/mediastream/MediaStreamDescriptor.h"
35 35
36 namespace WebCore { 36 namespace blink {
37 37
38 class ExceptionState; 38 class ExceptionState;
39 39
40 class MediaStream FINAL 40 class MediaStream FINAL
41 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStre am> 41 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStre am>
42 , public URLRegistrable 42 , public URLRegistrable
43 , public MediaStreamDescriptorClient 43 , public MediaStreamDescriptorClient
44 , public EventTargetWithInlineData 44 , public EventTargetWithInlineData
45 , public ContextLifecycleObserver { 45 , public ContextLifecycleObserver {
46 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWi llBeGarbageCollectedFinalized<MediaStream>); 46 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWi llBeGarbageCollectedFinalized<MediaStream>);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 MediaStreamTrackVector m_audioTracks; 108 MediaStreamTrackVector m_audioTracks;
109 MediaStreamTrackVector m_videoTracks; 109 MediaStreamTrackVector m_videoTracks;
110 RefPtr<MediaStreamDescriptor> m_descriptor; 110 RefPtr<MediaStreamDescriptor> m_descriptor;
111 111
112 Timer<MediaStream> m_scheduledEventTimer; 112 Timer<MediaStream> m_scheduledEventTimer;
113 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents; 113 WillBeHeapVector<RefPtrWillBeMember<Event> > m_scheduledEvents;
114 }; 114 };
115 115
116 typedef HeapVector<Member<MediaStream> > MediaStreamVector; 116 typedef HeapVector<Member<MediaStream> > MediaStreamVector;
117 117
118 } // namespace WebCore 118 } // namespace blink
119 119
120 #endif // MediaStream_h 120 #endif // MediaStream_h
OLDNEW
« no previous file with comments | « Source/modules/mediastream/MediaDevicesRequest.cpp ('k') | Source/modules/mediastream/MediaStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698