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

Side by Side Diff: Source/modules/mediastream/MediaStreamTrackSourcesRequest.cpp

Issue 54053006: Move weborigin/ under platform/ so that it may someday call platform APIs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Stale refernence to weboriginexport in .gpyi Created 7 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 27
28 #include "modules/mediastream/MediaStreamTrackSourcesRequest.h" 28 #include "modules/mediastream/MediaStreamTrackSourcesRequest.h"
29 29
30 #include "core/dom/ExecutionContext.h" 30 #include "core/dom/ExecutionContext.h"
31 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h" 31 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h"
32 #include "platform/weborigin/SecurityOrigin.h"
32 #include "public/platform/WebSourceInfo.h" 33 #include "public/platform/WebSourceInfo.h"
33 #include "weborigin/SecurityOrigin.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 PassRefPtr<MediaStreamTrackSourcesRequest> MediaStreamTrackSourcesRequest::creat e(ExecutionContext* context, PassRefPtr<MediaStreamTrackSourcesCallback> callbac k) 37 PassRefPtr<MediaStreamTrackSourcesRequest> MediaStreamTrackSourcesRequest::creat e(ExecutionContext* context, PassRefPtr<MediaStreamTrackSourcesCallback> callbac k)
38 { 38 {
39 return adoptRef(new MediaStreamTrackSourcesRequest(context, callback)); 39 return adoptRef(new MediaStreamTrackSourcesRequest(context, callback));
40 } 40 }
41 41
42 MediaStreamTrackSourcesRequest::MediaStreamTrackSourcesRequest(ExecutionContext* context, PassRefPtr<MediaStreamTrackSourcesCallback> callback) 42 MediaStreamTrackSourcesRequest::MediaStreamTrackSourcesRequest(ExecutionContext* context, PassRefPtr<MediaStreamTrackSourcesCallback> callback)
43 : m_callback(callback) 43 : m_callback(callback)
(...skipping 18 matching lines...) Expand all
62 } 62 }
63 63
64 void MediaStreamTrackSourcesRequest::scheduledEventTimerFired(Timer<MediaStreamT rackSourcesRequest>*) 64 void MediaStreamTrackSourcesRequest::scheduledEventTimerFired(Timer<MediaStreamT rackSourcesRequest>*)
65 { 65 {
66 m_callback->handleEvent(m_sourceInfos); 66 m_callback->handleEvent(m_sourceInfos);
67 m_callback.clear(); 67 m_callback.clear();
68 m_protect.release(); 68 m_protect.release();
69 } 69 }
70 70
71 } // namespace WebCore 71 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/mediastream/MediaStreamRegistry.cpp ('k') | Source/modules/notifications/Notification.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698