 Chromium Code Reviews
 Chromium Code Reviews Issue 139803012:
  Move speech module over to Oilpan.  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/blink.git@master
    
  
    Issue 139803012:
  Move speech module over to Oilpan.  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW | 
|---|---|
| 1 /* | 1 /* | 
| 2 * Copyright (C) 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2013 Apple 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. 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 | 
| (...skipping 10 matching lines...) Expand all Loading... | |
| 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 "config.h" | 26 #include "config.h" | 
| 27 #include "modules/speech/SpeechSynthesisUtterance.h" | 27 #include "modules/speech/SpeechSynthesisUtterance.h" | 
| 28 | 28 | 
| 29 namespace WebCore { | 29 namespace WebCore { | 
| 30 | 30 | 
| 31 PassRefPtr<SpeechSynthesisUtterance> SpeechSynthesisUtterance::create(ExecutionC ontext* context, const String& text) | 31 DEFINE_GC_INFO(SpeechSynthesisUtterance); | 
| 32 | |
| 33 PassRefPtrWillBeRawPtr<SpeechSynthesisUtterance> SpeechSynthesisUtterance::creat e(ExecutionContext* context, const String& text) | |
| 32 { | 34 { | 
| 33 return adoptRef(new SpeechSynthesisUtterance(context, text)); | 35 return adoptRefWillBeNoop(new SpeechSynthesisUtterance(context, text)); | 
| 
zerny-chromium
2014/02/12 11:45:19
adoptRefCountedWillBeGarbageCollected
 | |
| 34 } | 36 } | 
| 35 | 37 | 
| 36 SpeechSynthesisUtterance::SpeechSynthesisUtterance(ExecutionContext* context, co nst String& text) | 38 SpeechSynthesisUtterance::SpeechSynthesisUtterance(ExecutionContext* context, co nst String& text) | 
| 37 : ContextLifecycleObserver(context) | 39 : ContextLifecycleObserver(context) | 
| 38 , m_platformUtterance(PlatformSpeechSynthesisUtterance::create(this)) | 40 , m_platformUtterance(PlatformSpeechSynthesisUtterance::create(this)) | 
| 39 { | 41 { | 
| 40 ScriptWrappable::init(this); | 42 ScriptWrappable::init(this); | 
| 41 m_platformUtterance->setText(text); | 43 m_platformUtterance->setText(text); | 
| 42 } | 44 } | 
| 43 | 45 | 
| (...skipping 20 matching lines...) Expand all Loading... | |
| 64 void SpeechSynthesisUtterance::setVoice(SpeechSynthesisVoice* voice) | 66 void SpeechSynthesisUtterance::setVoice(SpeechSynthesisVoice* voice) | 
| 65 { | 67 { | 
| 66 // Cache our own version of the SpeechSynthesisVoice so that we don't have t o do some lookup | 68 // Cache our own version of the SpeechSynthesisVoice so that we don't have t o do some lookup | 
| 67 // to go from the platform voice back to the speech synthesis voice in the r ead property. | 69 // to go from the platform voice back to the speech synthesis voice in the r ead property. | 
| 68 m_voice = voice; | 70 m_voice = voice; | 
| 69 | 71 | 
| 70 if (voice) | 72 if (voice) | 
| 71 m_platformUtterance->setVoice(voice->platformVoice()); | 73 m_platformUtterance->setVoice(voice->platformVoice()); | 
| 72 } | 74 } | 
| 73 | 75 | 
| 76 void SpeechSynthesisUtterance::trace(Visitor* visitor) | |
| 77 { | |
| 78 visitor->trace(m_voice); | |
| 79 } | |
| 80 | |
| 74 } // namespace WebCore | 81 } // namespace WebCore | 
| OLD | NEW |