| 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 14 matching lines...) Expand all Loading... |
| 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 "bindings/core/v8/ScriptState.h" | 33 #include "bindings/core/v8/ScriptState.h" |
| 34 #include "core/dom/DOMURL.h" | 34 #include "core/dom/DOMURL.h" |
| 35 #include "core/dom/ExecutionContext.h" |
| 35 #include "core/frame/UseCounter.h" | 36 #include "core/frame/UseCounter.h" |
| 36 #include "modules/mediasource/MediaSource.h" | 37 #include "modules/mediasource/MediaSource.h" |
| 37 | 38 |
| 38 namespace blink { | 39 namespace blink { |
| 39 | 40 |
| 40 String URLMediaSource::createObjectURL(ScriptState* script_state, | 41 String URLMediaSource::createObjectURL(ScriptState* script_state, |
| 41 MediaSource* source) { | 42 MediaSource* source) { |
| 42 // Since WebWorkers cannot obtain MediaSource objects, we should be on the | 43 // Since WebWorkers cannot obtain MediaSource objects, we should be on the |
| 43 // main thread. | 44 // main thread. |
| 44 DCHECK(IsMainThread()); | 45 DCHECK(IsMainThread()); |
| 45 ExecutionContext* execution_context = script_state->GetExecutionContext(); | 46 ExecutionContext* execution_context = ExecutionContext::From(script_state); |
| 46 DCHECK(execution_context); | 47 DCHECK(execution_context); |
| 47 DCHECK(source); | 48 DCHECK(source); |
| 48 | 49 |
| 49 UseCounter::Count(execution_context, UseCounter::kCreateObjectURLMediaSource); | 50 UseCounter::Count(execution_context, UseCounter::kCreateObjectURLMediaSource); |
| 50 return DOMURL::CreatePublicURL(execution_context, source); | 51 return DOMURL::CreatePublicURL(execution_context, source); |
| 51 } | 52 } |
| 52 | 53 |
| 53 } // namespace blink | 54 } // namespace blink |
| OLD | NEW |