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/SpeechGrammar.h" | 26 #include "modules/speech/SpeechGrammar.h" |
27 | 27 |
28 #include "core/dom/Document.h" | 28 #include "core/dom/Document.h" |
| 29 #include "core/dom/ExecutionContext.h" |
29 | 30 |
30 namespace blink { | 31 namespace blink { |
31 | 32 |
32 SpeechGrammar* SpeechGrammar::Create() { | 33 SpeechGrammar* SpeechGrammar::Create() { |
33 return new SpeechGrammar; | 34 return new SpeechGrammar; |
34 } | 35 } |
35 | 36 |
36 SpeechGrammar* SpeechGrammar::Create(const KURL& src, double weight) { | 37 SpeechGrammar* SpeechGrammar::Create(const KURL& src, double weight) { |
37 return new SpeechGrammar(src, weight); | 38 return new SpeechGrammar(src, weight); |
38 } | 39 } |
39 | 40 |
40 void SpeechGrammar::setSrc(ScriptState* script_state, const String& src) { | 41 void SpeechGrammar::setSrc(ScriptState* script_state, const String& src) { |
41 Document* document = ToDocument(script_state->GetExecutionContext()); | 42 Document* document = ToDocument(ExecutionContext::From(script_state)); |
42 src_ = document->CompleteURL(src); | 43 src_ = document->CompleteURL(src); |
43 } | 44 } |
44 | 45 |
45 SpeechGrammar::SpeechGrammar() : weight_(1.0) {} | 46 SpeechGrammar::SpeechGrammar() : weight_(1.0) {} |
46 | 47 |
47 SpeechGrammar::SpeechGrammar(const KURL& src, double weight) | 48 SpeechGrammar::SpeechGrammar(const KURL& src, double weight) |
48 : src_(src), weight_(weight) {} | 49 : src_(src), weight_(weight) {} |
49 | 50 |
50 } // namespace blink | 51 } // namespace blink |
OLD | NEW |