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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/URLMediaStream.cpp

Issue 2815313002: Reland of Move ScriptState::GetExecutionContext (Part 5) (Closed)
Patch Set: Created 3 years, 8 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/mediastream/URLMediaStream.h" 31 #include "modules/mediastream/URLMediaStream.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/mediastream/MediaStream.h" 37 #include "modules/mediastream/MediaStream.h"
37 38
38 namespace blink { 39 namespace blink {
39 40
40 String URLMediaStream::createObjectURL(ScriptState* script_state, 41 String URLMediaStream::createObjectURL(ScriptState* script_state,
41 MediaStream* stream) { 42 MediaStream* stream) {
42 // Since WebWorkers cannot obtain Stream objects, we should be on the main 43 // Since WebWorkers cannot obtain Stream objects, we should be on the main
43 // thread. 44 // 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(stream); 48 DCHECK(stream);
48 49
49 UseCounter::Count(execution_context, UseCounter::kCreateObjectURLMediaStream); 50 UseCounter::Count(execution_context, UseCounter::kCreateObjectURLMediaStream);
50 return DOMURL::CreatePublicURL(execution_context, stream); 51 return DOMURL::CreatePublicURL(execution_context, stream);
51 } 52 }
52 53
53 } // namespace blink 54 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698