Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: third_party/WebKit/Source/modules/speech/SpeechSynthesisUtterance.cpp

Issue 2549393005: Remove ContextLifecycleObserver from SpeechSynthesisUtterance (Closed)
Patch Set: temp Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/modules/speech/SpeechSynthesisUtterance.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. 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/SpeechSynthesisUtterance.h" 26 #include "modules/speech/SpeechSynthesisUtterance.h"
27 27
28 #include "core/dom/ExecutionContext.h"
29
28 namespace blink { 30 namespace blink {
29 31
30 SpeechSynthesisUtterance* SpeechSynthesisUtterance::create( 32 SpeechSynthesisUtterance* SpeechSynthesisUtterance::create(
31 ExecutionContext* context, 33 ExecutionContext* context,
32 const String& text) { 34 const String& text) {
33 return new SpeechSynthesisUtterance(context, text); 35 return new SpeechSynthesisUtterance(context, text);
34 } 36 }
35 37
36 SpeechSynthesisUtterance::SpeechSynthesisUtterance(ExecutionContext* context, 38 SpeechSynthesisUtterance::SpeechSynthesisUtterance(ExecutionContext* context,
37 const String& text) 39 const String& text)
38 : ContextLifecycleObserver(context), 40 : m_executionContext(context),
39 m_platformUtterance(PlatformSpeechSynthesisUtterance::create(this)) { 41 m_platformUtterance(PlatformSpeechSynthesisUtterance::create(this)) {
40 m_platformUtterance->setText(text); 42 m_platformUtterance->setText(text);
41 } 43 }
42 44
43 SpeechSynthesisUtterance::~SpeechSynthesisUtterance() {} 45 SpeechSynthesisUtterance::~SpeechSynthesisUtterance() {}
44 46
45 ExecutionContext* SpeechSynthesisUtterance::getExecutionContext() const { 47 ExecutionContext* SpeechSynthesisUtterance::getExecutionContext() const {
46 return ContextLifecycleObserver::getExecutionContext(); 48 return m_executionContext;
47 } 49 }
48 50
49 const AtomicString& SpeechSynthesisUtterance::interfaceName() const { 51 const AtomicString& SpeechSynthesisUtterance::interfaceName() const {
50 return EventTargetNames::SpeechSynthesisUtterance; 52 return EventTargetNames::SpeechSynthesisUtterance;
51 } 53 }
52 54
53 SpeechSynthesisVoice* SpeechSynthesisUtterance::voice() const { 55 SpeechSynthesisVoice* SpeechSynthesisUtterance::voice() const {
54 return m_voice; 56 return m_voice;
55 } 57 }
56 58
57 void SpeechSynthesisUtterance::setVoice(SpeechSynthesisVoice* voice) { 59 void SpeechSynthesisUtterance::setVoice(SpeechSynthesisVoice* voice) {
58 // Cache our own version of the SpeechSynthesisVoice so that we don't have to 60 // Cache our own version of the SpeechSynthesisVoice so that we don't have to
59 // do some lookup to go from the platform voice back to the speech synthesis 61 // do some lookup to go from the platform voice back to the speech synthesis
60 // voice in the read property. 62 // voice in the read property.
61 m_voice = voice; 63 m_voice = voice;
62 64
63 if (voice) 65 if (voice)
64 m_platformUtterance->setVoice(voice->platformVoice()); 66 m_platformUtterance->setVoice(voice->platformVoice());
65 } 67 }
66 68
67 DEFINE_TRACE(SpeechSynthesisUtterance) { 69 DEFINE_TRACE(SpeechSynthesisUtterance) {
70 visitor->trace(m_executionContext);
68 visitor->trace(m_platformUtterance); 71 visitor->trace(m_platformUtterance);
69 visitor->trace(m_voice); 72 visitor->trace(m_voice);
70 EventTargetWithInlineData::trace(visitor); 73 EventTargetWithInlineData::trace(visitor);
71 ContextLifecycleObserver::trace(visitor);
72 } 74 }
73 75
74 } // namespace blink 76 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/speech/SpeechSynthesisUtterance.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698