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

Side by Side Diff: third_party/WebKit/Source/modules/speech/SpeechGrammarList.cpp

Issue 2821443002: Revert of Move ScriptState::GetExecutionContext (Part 5) (Closed)
Patch Set: Revert 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * * Redistributions of source code must retain the above copyright 7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright 9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "modules/speech/SpeechGrammarList.h" 26 #include "modules/speech/SpeechGrammarList.h"
27 27
28 #include "bindings/core/v8/ScriptState.h" 28 #include "bindings/core/v8/ScriptState.h"
29 #include "core/dom/Document.h" 29 #include "core/dom/Document.h"
30 #include "core/dom/ExecutionContext.h"
31 30
32 namespace blink { 31 namespace blink {
33 32
34 SpeechGrammarList* SpeechGrammarList::Create() { 33 SpeechGrammarList* SpeechGrammarList::Create() {
35 return new SpeechGrammarList; 34 return new SpeechGrammarList;
36 } 35 }
37 36
38 SpeechGrammar* SpeechGrammarList::item(unsigned index) const { 37 SpeechGrammar* SpeechGrammarList::item(unsigned index) const {
39 if (index >= grammars_.size()) 38 if (index >= grammars_.size())
40 return nullptr; 39 return nullptr;
41 40
42 return grammars_[index]; 41 return grammars_[index];
43 } 42 }
44 43
45 void SpeechGrammarList::addFromUri(ScriptState* script_state, 44 void SpeechGrammarList::addFromUri(ScriptState* script_state,
46 const String& src, 45 const String& src,
47 double weight) { 46 double weight) {
48 Document* document = ToDocument(ExecutionContext::From(script_state)); 47 Document* document = ToDocument(script_state->GetExecutionContext());
49 grammars_.push_back( 48 grammars_.push_back(
50 SpeechGrammar::Create(document->CompleteURL(src), weight)); 49 SpeechGrammar::Create(document->CompleteURL(src), weight));
51 } 50 }
52 51
53 void SpeechGrammarList::addFromString(const String& string, double weight) { 52 void SpeechGrammarList::addFromString(const String& string, double weight) {
54 String url_string = 53 String url_string =
55 String("data:application/xml,") + EncodeWithURLEscapeSequences(string); 54 String("data:application/xml,") + EncodeWithURLEscapeSequences(string);
56 grammars_.push_back(SpeechGrammar::Create(KURL(KURL(), url_string), weight)); 55 grammars_.push_back(SpeechGrammar::Create(KURL(KURL(), url_string), weight));
57 } 56 }
58 57
59 SpeechGrammarList::SpeechGrammarList() {} 58 SpeechGrammarList::SpeechGrammarList() {}
60 59
61 DEFINE_TRACE(SpeechGrammarList) { 60 DEFINE_TRACE(SpeechGrammarList) {
62 visitor->Trace(grammars_); 61 visitor->Trace(grammars_);
63 } 62 }
64 63
65 } // namespace blink 64 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/speech/SpeechGrammar.cpp ('k') | third_party/WebKit/Source/modules/vr/NavigatorVR.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698