OLD | NEW |
---|---|
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 13 matching lines...) Expand all Loading... | |
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 "modules/mediastream/URLMediaStream.h" | 31 #include "modules/mediastream/URLMediaStream.h" |
32 | 32 |
33 #include "core/dom/DOMURL.h" | 33 #include "core/dom/DOMURL.h" |
34 #include "core/frame/UseCounter.h" | |
34 #include "modules/mediastream/MediaStream.h" | 35 #include "modules/mediastream/MediaStream.h" |
35 | 36 |
36 namespace blink { | 37 namespace blink { |
37 | 38 |
38 String URLMediaStream::createObjectURL(ExecutionContext* executionContext, Media Stream* stream) | 39 String URLMediaStream::createObjectURL(ExecutionContext* executionContext, Media Stream* stream) |
39 { | 40 { |
40 // Since WebWorkers cannot obtain Stream objects, we should be on the main t hread. | 41 // Since WebWorkers cannot obtain Stream objects, we should be on the main t hread. |
41 DCHECK(isMainThread()); | 42 DCHECK(isMainThread()); |
43 DCHECK(executionContext); | |
hta - Chromium
2016/09/29 13:46:33
Same comment on both executionContext and stream h
foolip
2016/09/29 14:54:45
The stream check was needed at some point when all
| |
44 DCHECK(stream); | |
42 | 45 |
43 if (!executionContext || !stream) | 46 UseCounter::count(executionContext, UseCounter::CreateObjectURLMediaStream); |
44 return String(); | |
45 return DOMURL::createPublicURL(executionContext, stream); | 47 return DOMURL::createPublicURL(executionContext, stream); |
46 } | 48 } |
47 | 49 |
48 | 50 |
49 } // namespace blink | 51 } // namespace blink |
OLD | NEW |