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

Side by Side Diff: Source/core/mediastream/URLMediaStream.cpp

Issue 650063002: Move MediaStream and MediaStreamTrack implementation from modules/mediastream to core/mediastream. Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased. Created 6 years, 2 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
« no previous file with comments | « Source/core/mediastream/URLMediaStream.h ('k') | Source/core/mediastream/URLMediaStream.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 11 matching lines...) Expand all
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "modules/mediastream/URLMediaStream.h" 32 #include "core/mediastream/URLMediaStream.h"
33 33
34 #include "core/dom/DOMURL.h" 34 #include "core/dom/DOMURL.h"
35 #include "modules/mediastream/MediaStream.h" 35 #include "core/mediastream/MediaStream.h"
36 #include "wtf/MainThread.h" 36 #include "wtf/MainThread.h"
37 37
38 namespace blink { 38 namespace blink {
39 39
40 String URLMediaStream::createObjectURL(ExecutionContext* executionContext, Media Stream* stream) 40 String URLMediaStream::createObjectURL(ExecutionContext* executionContext, Media Stream* stream)
41 { 41 {
42 // Since WebWorkers cannot obtain Stream objects, we should be on the main t hread. 42 // Since WebWorkers cannot obtain Stream objects, we should be on the main t hread.
43 ASSERT(isMainThread()); 43 ASSERT(isMainThread());
44 44
45 if (!executionContext || !stream) 45 if (!executionContext || !stream)
46 return String(); 46 return String();
47 return DOMURL::createPublicURL(executionContext, stream); 47 return DOMURL::createPublicURL(executionContext, stream);
48 } 48 }
49 49
50 50
51 } // namespace blink 51 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/mediastream/URLMediaStream.h ('k') | Source/core/mediastream/URLMediaStream.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698