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

Side by Side Diff: third_party/WebKit/Source/modules/mediasource/URLMediaSource.cpp

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 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 14 matching lines...) Expand all
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 "modules/mediasource/URLMediaSource.h" 31 #include "modules/mediasource/URLMediaSource.h"
32 32
33 #include "core/dom/DOMURL.h" 33 #include "core/dom/DOMURL.h"
34 #include "modules/mediasource/MediaSource.h" 34 #include "modules/mediasource/MediaSource.h"
35 #include "wtf/MainThread.h"
36 35
37 namespace blink { 36 namespace blink {
38 37
39 String URLMediaSource::createObjectURL(ExecutionContext* executionContext, Media Source* source) 38 String URLMediaSource::createObjectURL(ExecutionContext* executionContext, Media Source* source)
40 { 39 {
41 // Since WebWorkers cannot obtain MediaSource objects, we should be on the m ain thread. 40 // Since WebWorkers cannot obtain MediaSource objects, we should be on the m ain thread.
42 ASSERT(isMainThread()); 41 ASSERT(isMainThread());
43 42
44 if (!executionContext) 43 if (!executionContext)
45 return String(); 44 return String();
46 return DOMURL::createPublicURL(executionContext, source); 45 return DOMURL::createPublicURL(executionContext, source);
47 } 46 }
48 47
49 } // namespace blink 48 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698