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 14 matching lines...) Expand all Loading... |
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 "config.h" | 31 #include "config.h" |
32 #include "modules/speech/DOMWindowSpeechSynthesis.h" | 32 #include "modules/speech/DOMWindowSpeechSynthesis.h" |
33 | 33 |
34 #include "core/frame/DOMWindow.h" | 34 #include "core/frame/DOMWindow.h" |
| 35 #include "core/frame/Frame.h" |
35 #include "wtf/PassRefPtr.h" | 36 #include "wtf/PassRefPtr.h" |
36 | 37 |
37 namespace WebCore { | 38 namespace WebCore { |
38 | 39 |
39 DOMWindowSpeechSynthesis::DOMWindowSpeechSynthesis(DOMWindow* window) | 40 DOMWindowSpeechSynthesis::DOMWindowSpeechSynthesis(DOMWindow* window) |
40 : DOMWindowProperty(window->frame()) | 41 : DOMWindowProperty(window->frame()) |
41 { | 42 { |
42 } | 43 } |
43 | 44 |
44 DOMWindowSpeechSynthesis::~DOMWindowSpeechSynthesis() | 45 DOMWindowSpeechSynthesis::~DOMWindowSpeechSynthesis() |
(...skipping 18 matching lines...) Expand all Loading... |
63 | 64 |
64 // static | 65 // static |
65 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis(DOMWindow* window) | 66 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis(DOMWindow* window) |
66 { | 67 { |
67 return DOMWindowSpeechSynthesis::from(window)->speechSynthesis(); | 68 return DOMWindowSpeechSynthesis::from(window)->speechSynthesis(); |
68 } | 69 } |
69 | 70 |
70 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis() | 71 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis() |
71 { | 72 { |
72 if (!m_speechSynthesis && frame()) | 73 if (!m_speechSynthesis && frame()) |
73 m_speechSynthesis = SpeechSynthesis::create(); | 74 m_speechSynthesis = SpeechSynthesis::create(frame()->domWindow()->execut
ionContext()); |
74 return m_speechSynthesis.get(); | 75 return m_speechSynthesis.get(); |
75 } | 76 } |
76 | 77 |
77 } // namespace WebCore | 78 } // namespace WebCore |
OLD | NEW |