OLD | NEW |
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" |
30 | 31 |
31 namespace blink { | 32 namespace blink { |
32 | 33 |
33 SpeechGrammarList* SpeechGrammarList::Create() { | 34 SpeechGrammarList* SpeechGrammarList::Create() { |
34 return new SpeechGrammarList; | 35 return new SpeechGrammarList; |
35 } | 36 } |
36 | 37 |
37 SpeechGrammar* SpeechGrammarList::item(unsigned index) const { | 38 SpeechGrammar* SpeechGrammarList::item(unsigned index) const { |
38 if (index >= grammars_.size()) | 39 if (index >= grammars_.size()) |
39 return nullptr; | 40 return nullptr; |
40 | 41 |
41 return grammars_[index]; | 42 return grammars_[index]; |
42 } | 43 } |
43 | 44 |
44 void SpeechGrammarList::addFromUri(ScriptState* script_state, | 45 void SpeechGrammarList::addFromUri(ScriptState* script_state, |
45 const String& src, | 46 const String& src, |
46 double weight) { | 47 double weight) { |
47 Document* document = ToDocument(script_state->GetExecutionContext()); | 48 Document* document = ToDocument(ExecutionContext::From(script_state)); |
48 grammars_.push_back( | 49 grammars_.push_back( |
49 SpeechGrammar::Create(document->CompleteURL(src), weight)); | 50 SpeechGrammar::Create(document->CompleteURL(src), weight)); |
50 } | 51 } |
51 | 52 |
52 void SpeechGrammarList::addFromString(const String& string, double weight) { | 53 void SpeechGrammarList::addFromString(const String& string, double weight) { |
53 String url_string = | 54 String url_string = |
54 String("data:application/xml,") + EncodeWithURLEscapeSequences(string); | 55 String("data:application/xml,") + EncodeWithURLEscapeSequences(string); |
55 grammars_.push_back(SpeechGrammar::Create(KURL(KURL(), url_string), weight)); | 56 grammars_.push_back(SpeechGrammar::Create(KURL(KURL(), url_string), weight)); |
56 } | 57 } |
57 | 58 |
58 SpeechGrammarList::SpeechGrammarList() {} | 59 SpeechGrammarList::SpeechGrammarList() {} |
59 | 60 |
60 DEFINE_TRACE(SpeechGrammarList) { | 61 DEFINE_TRACE(SpeechGrammarList) { |
61 visitor->Trace(grammars_); | 62 visitor->Trace(grammars_); |
62 } | 63 } |
63 | 64 |
64 } // namespace blink | 65 } // namespace blink |
OLD | NEW |