| 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/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 "core/frame/Deprecation.h" |
| 35 #include "core/frame/UseCounter.h" |
| 34 #include "modules/mediasource/MediaSource.h" | 36 #include "modules/mediasource/MediaSource.h" |
| 35 | 37 |
| 36 namespace blink { | 38 namespace blink { |
| 37 | 39 |
| 38 String URLMediaSource::createObjectURL(ExecutionContext* executionContext, Media
Source* source) | 40 String URLMediaSource::createObjectURL(ExecutionContext* executionContext, Media
Source* source) |
| 39 { | 41 { |
| 40 // Since WebWorkers cannot obtain MediaSource objects, we should be on the m
ain thread. | 42 // Since WebWorkers cannot obtain MediaSource objects, we should be on the m
ain thread. |
| 41 ASSERT(isMainThread()); | 43 ASSERT(isMainThread()); |
| 42 | 44 |
| 45 if (executionContext && executionContext->isServiceWorkerGlobalScope()) |
| 46 Deprecation::countDeprecation(executionContext, UseCounter::URLMethodCre
ateObjectURLServiceWorker); |
| 47 |
| 43 if (!executionContext) | 48 if (!executionContext) |
| 44 return String(); | 49 return String(); |
| 50 |
| 45 return DOMURL::createPublicURL(executionContext, source); | 51 return DOMURL::createPublicURL(executionContext, source); |
| 46 } | 52 } |
| 47 | 53 |
| 48 } // namespace blink | 54 } // namespace blink |
| OLD | NEW |