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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaStreamTrackSourcesRequestImpl.cpp

Issue 2264543002: Move createCrossThreadTask to ExecutionContextTask.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests 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) 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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 "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h" 26 #include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h"
27 27
28 #include "core/dom/CrossThreadTask.h"
29 #include "core/dom/ExecutionContext.h" 28 #include "core/dom/ExecutionContext.h"
29 #include "core/dom/ExecutionContextTask.h"
30 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h" 30 #include "modules/mediastream/MediaStreamTrackSourcesCallback.h"
31 #include "platform/weborigin/SecurityOrigin.h" 31 #include "platform/weborigin/SecurityOrigin.h"
32 #include "public/platform/WebSourceInfo.h" 32 #include "public/platform/WebSourceInfo.h"
33 #include "public/platform/WebTraceLocation.h" 33 #include "public/platform/WebTraceLocation.h"
34 #include "wtf/Functional.h" 34 #include "wtf/Functional.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 MediaStreamTrackSourcesRequestImpl* MediaStreamTrackSourcesRequestImpl::create(E xecutionContext& context, MediaStreamTrackSourcesCallback* callback) 38 MediaStreamTrackSourcesRequestImpl* MediaStreamTrackSourcesRequestImpl::create(E xecutionContext& context, MediaStreamTrackSourcesCallback* callback)
39 { 39 {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 DEFINE_TRACE(MediaStreamTrackSourcesRequestImpl) 73 DEFINE_TRACE(MediaStreamTrackSourcesRequestImpl)
74 { 74 {
75 visitor->trace(m_callback); 75 visitor->trace(m_callback);
76 visitor->trace(m_executionContext); 76 visitor->trace(m_executionContext);
77 visitor->trace(m_sourceInfos); 77 visitor->trace(m_sourceInfos);
78 MediaStreamTrackSourcesRequest::trace(visitor); 78 MediaStreamTrackSourcesRequest::trace(visitor);
79 } 79 }
80 80
81 } // namespace blink 81 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698