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

Side by Side Diff: Source/modules/speech/SpeechSynthesisUtterance.h

Issue 26558004: Revert 158219 "Move dom/*Event* to events to match the DOM vs. E..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1651/
Patch Set: Created 7 years, 2 months 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 | Annotate | Revision Log
« no previous file with comments | « Source/modules/speech/SpeechSynthesisEvent.h ('k') | Source/modules/webaudio/AudioContext.h » ('j') | 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
(...skipping 10 matching lines...) Expand all
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 #ifndef SpeechSynthesisUtterance_h 26 #ifndef SpeechSynthesisUtterance_h
27 #define SpeechSynthesisUtterance_h 27 #define SpeechSynthesisUtterance_h
28 28
29 #include "bindings/v8/ScriptWrappable.h" 29 #include "bindings/v8/ScriptWrappable.h"
30 #include "core/dom/ContextLifecycleObserver.h" 30 #include "core/dom/ContextLifecycleObserver.h"
31 #include "core/events/EventTarget.h" 31 #include "core/dom/EventTarget.h"
32 #include "core/platform/PlatformSpeechSynthesisUtterance.h" 32 #include "core/platform/PlatformSpeechSynthesisUtterance.h"
33 #include "modules/speech/SpeechSynthesisVoice.h" 33 #include "modules/speech/SpeechSynthesisVoice.h"
34 #include "wtf/PassRefPtr.h" 34 #include "wtf/PassRefPtr.h"
35 #include "wtf/RefCounted.h" 35 #include "wtf/RefCounted.h"
36 36
37 namespace WebCore { 37 namespace WebCore {
38 38
39 class SpeechSynthesisUtterance : public PlatformSpeechSynthesisUtteranceClient, public ScriptWrappable, public RefCounted<SpeechSynthesisUtterance>, public Cont extLifecycleObserver, public EventTarget { 39 class SpeechSynthesisUtterance : public PlatformSpeechSynthesisUtteranceClient, public ScriptWrappable, public RefCounted<SpeechSynthesisUtterance>, public Cont extLifecycleObserver, public EventTarget {
40 public: 40 public:
41 static PassRefPtr<SpeechSynthesisUtterance> create(ScriptExecutionContext*, const String&); 41 static PassRefPtr<SpeechSynthesisUtterance> create(ScriptExecutionContext*, const String&);
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 virtual const AtomicString& interfaceName() const OVERRIDE; 89 virtual const AtomicString& interfaceName() const OVERRIDE;
90 virtual void refEventTarget() OVERRIDE { ref(); } 90 virtual void refEventTarget() OVERRIDE { ref(); }
91 virtual void derefEventTarget() OVERRIDE { deref(); } 91 virtual void derefEventTarget() OVERRIDE { deref(); }
92 virtual EventTargetData* eventTargetData() OVERRIDE { return &m_eventTargetD ata; } 92 virtual EventTargetData* eventTargetData() OVERRIDE { return &m_eventTargetD ata; }
93 virtual EventTargetData* ensureEventTargetData() OVERRIDE { return &m_eventT argetData; } 93 virtual EventTargetData* ensureEventTargetData() OVERRIDE { return &m_eventT argetData; }
94 }; 94 };
95 95
96 } // namespace WebCore 96 } // namespace WebCore
97 97
98 #endif // SpeechSynthesisUtterance_h 98 #endif // SpeechSynthesisUtterance_h
OLDNEW
« no previous file with comments | « Source/modules/speech/SpeechSynthesisEvent.h ('k') | Source/modules/webaudio/AudioContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698