| 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 19 matching lines...) Expand all Loading... |
| 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 "core/frame/Frame.h" |
| 36 #include "wtf/PassRefPtr.h" | 36 #include "wtf/PassRefPtr.h" |
| 37 | 37 |
| 38 namespace WebCore { | 38 namespace WebCore { |
| 39 | 39 |
| 40 DOMWindowSpeechSynthesis::DOMWindowSpeechSynthesis(DOMWindow* window) | 40 DOMWindowSpeechSynthesis::DOMWindowSpeechSynthesis(DOMWindow& window) |
| 41 : DOMWindowProperty(window->frame()) | 41 : DOMWindowProperty(window.frame()) |
| 42 { | 42 { |
| 43 } | 43 } |
| 44 | 44 |
| 45 DOMWindowSpeechSynthesis::~DOMWindowSpeechSynthesis() | 45 DOMWindowSpeechSynthesis::~DOMWindowSpeechSynthesis() |
| 46 { | 46 { |
| 47 } | 47 } |
| 48 | 48 |
| 49 const char* DOMWindowSpeechSynthesis::supplementName() | 49 const char* DOMWindowSpeechSynthesis::supplementName() |
| 50 { | 50 { |
| 51 return "DOMWindowSpeechSynthesis"; | 51 return "DOMWindowSpeechSynthesis"; |
| 52 } | 52 } |
| 53 | 53 |
| 54 // static | 54 // static |
| 55 DOMWindowSpeechSynthesis* DOMWindowSpeechSynthesis::from(DOMWindow* window) | 55 DOMWindowSpeechSynthesis& DOMWindowSpeechSynthesis::from(DOMWindow& window) |
| 56 { | 56 { |
| 57 DOMWindowSpeechSynthesis* supplement = static_cast<DOMWindowSpeechSynthesis*
>(Supplement<DOMWindow>::from(window, supplementName())); | 57 DOMWindowSpeechSynthesis* supplement = static_cast<DOMWindowSpeechSynthesis*
>(Supplement<DOMWindow>::from(window, supplementName())); |
| 58 if (!supplement) { | 58 if (!supplement) { |
| 59 supplement = new DOMWindowSpeechSynthesis(window); | 59 supplement = new DOMWindowSpeechSynthesis(window); |
| 60 provideTo(window, supplementName(), adoptPtr(supplement)); | 60 provideTo(window, supplementName(), adoptPtr(supplement)); |
| 61 } | 61 } |
| 62 return supplement; | 62 return *supplement; |
| 63 } | 63 } |
| 64 | 64 |
| 65 // static | 65 // static |
| 66 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis(DOMWindow* window) | 66 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis(DOMWindow& window) |
| 67 { | 67 { |
| 68 return DOMWindowSpeechSynthesis::from(window)->speechSynthesis(); | 68 return DOMWindowSpeechSynthesis::from(window).speechSynthesis(); |
| 69 } | 69 } |
| 70 | 70 |
| 71 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis() | 71 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis() |
| 72 { | 72 { |
| 73 if (!m_speechSynthesis && frame()) | 73 if (!m_speechSynthesis && frame()) |
| 74 m_speechSynthesis = SpeechSynthesis::create(frame()->domWindow()->execut
ionContext()); | 74 m_speechSynthesis = SpeechSynthesis::create(frame()->domWindow()->execut
ionContext()); |
| 75 return m_speechSynthesis.get(); | 75 return m_speechSynthesis.get(); |
| 76 } | 76 } |
| 77 | 77 |
| 78 } // namespace WebCore | 78 } // namespace WebCore |
| OLD | NEW |