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

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

Issue 635233004: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
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 16 matching lines...) Expand all
27 #define SpeechSynthesisUtterance_h 27 #define SpeechSynthesisUtterance_h
28 28
29 #include "core/dom/ContextLifecycleObserver.h" 29 #include "core/dom/ContextLifecycleObserver.h"
30 #include "modules/EventTargetModules.h" 30 #include "modules/EventTargetModules.h"
31 #include "modules/speech/SpeechSynthesisVoice.h" 31 #include "modules/speech/SpeechSynthesisVoice.h"
32 #include "platform/heap/Handle.h" 32 #include "platform/heap/Handle.h"
33 #include "platform/speech/PlatformSpeechSynthesisUtterance.h" 33 #include "platform/speech/PlatformSpeechSynthesisUtterance.h"
34 34
35 namespace blink { 35 namespace blink {
36 36
37 class SpeechSynthesisUtterance FINAL : public RefCountedGarbageCollectedWillBeGa rbageCollectedFinalized<SpeechSynthesisUtterance>, public PlatformSpeechSynthesi sUtteranceClient, public ContextLifecycleObserver, public EventTargetWithInlineD ata { 37 class SpeechSynthesisUtterance final : public RefCountedGarbageCollectedWillBeGa rbageCollectedFinalized<SpeechSynthesisUtterance>, public PlatformSpeechSynthesi sUtteranceClient, public ContextLifecycleObserver, public EventTargetWithInlineD ata {
38 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<S peechSynthesisUtterance>); 38 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<S peechSynthesisUtterance>);
39 DEFINE_WRAPPERTYPEINFO(); 39 DEFINE_WRAPPERTYPEINFO();
40 USING_GARBAGE_COLLECTED_MIXIN(SpeechSynthesisUtterance); 40 USING_GARBAGE_COLLECTED_MIXIN(SpeechSynthesisUtterance);
41 public: 41 public:
42 static SpeechSynthesisUtterance* create(ExecutionContext*, const String&); 42 static SpeechSynthesisUtterance* create(ExecutionContext*, const String&);
43 43
44 virtual ~SpeechSynthesisUtterance(); 44 virtual ~SpeechSynthesisUtterance();
45 45
46 const String& text() const { return m_platformUtterance->text(); } 46 const String& text() const { return m_platformUtterance->text(); }
47 void setText(const String& text) { m_platformUtterance->setText(text); } 47 void setText(const String& text) { m_platformUtterance->setText(text); }
(...skipping 17 matching lines...) Expand all
65 void setStartTime(double startTime) { m_platformUtterance->setStartTime(star tTime); } 65 void setStartTime(double startTime) { m_platformUtterance->setStartTime(star tTime); }
66 66
67 DEFINE_ATTRIBUTE_EVENT_LISTENER(start); 67 DEFINE_ATTRIBUTE_EVENT_LISTENER(start);
68 DEFINE_ATTRIBUTE_EVENT_LISTENER(end); 68 DEFINE_ATTRIBUTE_EVENT_LISTENER(end);
69 DEFINE_ATTRIBUTE_EVENT_LISTENER(error); 69 DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
70 DEFINE_ATTRIBUTE_EVENT_LISTENER(pause); 70 DEFINE_ATTRIBUTE_EVENT_LISTENER(pause);
71 DEFINE_ATTRIBUTE_EVENT_LISTENER(resume); 71 DEFINE_ATTRIBUTE_EVENT_LISTENER(resume);
72 DEFINE_ATTRIBUTE_EVENT_LISTENER(mark); 72 DEFINE_ATTRIBUTE_EVENT_LISTENER(mark);
73 DEFINE_ATTRIBUTE_EVENT_LISTENER(boundary); 73 DEFINE_ATTRIBUTE_EVENT_LISTENER(boundary);
74 74
75 virtual ExecutionContext* executionContext() const OVERRIDE; 75 virtual ExecutionContext* executionContext() const override;
76 76
77 PlatformSpeechSynthesisUtterance* platformUtterance() const { return m_platf ormUtterance; } 77 PlatformSpeechSynthesisUtterance* platformUtterance() const { return m_platf ormUtterance; }
78 78
79 virtual void trace(Visitor*) OVERRIDE; 79 virtual void trace(Visitor*) override;
80 80
81 private: 81 private:
82 SpeechSynthesisUtterance(ExecutionContext*, const String&); 82 SpeechSynthesisUtterance(ExecutionContext*, const String&);
83 83
84 // EventTarget 84 // EventTarget
85 virtual const AtomicString& interfaceName() const OVERRIDE; 85 virtual const AtomicString& interfaceName() const override;
86 86
87 Member<PlatformSpeechSynthesisUtterance> m_platformUtterance; 87 Member<PlatformSpeechSynthesisUtterance> m_platformUtterance;
88 Member<SpeechSynthesisVoice> m_voice; 88 Member<SpeechSynthesisVoice> m_voice;
89 }; 89 };
90 90
91 } // namespace blink 91 } // namespace blink
92 92
93 #endif // SpeechSynthesisUtterance_h 93 #endif // SpeechSynthesisUtterance_h
OLDNEW
« no previous file with comments | « Source/modules/speech/SpeechSynthesisEvent.h ('k') | Source/modules/speech/SpeechSynthesisVoice.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698