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 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 13 matching lines...) Expand all Loading... |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
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/speech/DOMWindowSpeechSynthesis.h" | 31 #include "modules/speech/DOMWindowSpeechSynthesis.h" |
32 | 32 |
33 #include "bindings/core/v8/ScriptState.h" | 33 #include "bindings/core/v8/ScriptState.h" |
| 34 #include "core/dom/ExecutionContext.h" |
34 #include "core/frame/LocalDOMWindow.h" | 35 #include "core/frame/LocalDOMWindow.h" |
35 #include "core/frame/LocalFrame.h" | 36 #include "core/frame/LocalFrame.h" |
36 #include "platform/wtf/PassRefPtr.h" | 37 #include "platform/wtf/PassRefPtr.h" |
37 | 38 |
38 namespace blink { | 39 namespace blink { |
39 | 40 |
40 DOMWindowSpeechSynthesis::DOMWindowSpeechSynthesis(LocalDOMWindow& window) | 41 DOMWindowSpeechSynthesis::DOMWindowSpeechSynthesis(LocalDOMWindow& window) |
41 : Supplement<LocalDOMWindow>(window) {} | 42 : Supplement<LocalDOMWindow>(window) {} |
42 | 43 |
43 const char* DOMWindowSpeechSynthesis::SupplementName() { | 44 const char* DOMWindowSpeechSynthesis::SupplementName() { |
(...skipping 16 matching lines...) Expand all Loading... |
60 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis( | 61 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis( |
61 ScriptState* script_state, | 62 ScriptState* script_state, |
62 LocalDOMWindow& window) { | 63 LocalDOMWindow& window) { |
63 return DOMWindowSpeechSynthesis::From(window).speechSynthesis(script_state); | 64 return DOMWindowSpeechSynthesis::From(window).speechSynthesis(script_state); |
64 } | 65 } |
65 | 66 |
66 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis( | 67 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis( |
67 ScriptState* script_state) { | 68 ScriptState* script_state) { |
68 if (!speech_synthesis_) { | 69 if (!speech_synthesis_) { |
69 speech_synthesis_ = | 70 speech_synthesis_ = |
70 SpeechSynthesis::Create(script_state->GetExecutionContext()); | 71 SpeechSynthesis::Create(ExecutionContext::From(script_state)); |
71 } | 72 } |
72 return speech_synthesis_; | 73 return speech_synthesis_; |
73 } | 74 } |
74 | 75 |
75 DEFINE_TRACE(DOMWindowSpeechSynthesis) { | 76 DEFINE_TRACE(DOMWindowSpeechSynthesis) { |
76 visitor->Trace(speech_synthesis_); | 77 visitor->Trace(speech_synthesis_); |
77 Supplement<LocalDOMWindow>::Trace(visitor); | 78 Supplement<LocalDOMWindow>::Trace(visitor); |
78 } | 79 } |
79 | 80 |
80 } // namespace blink | 81 } // namespace blink |
OLD | NEW |