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

Side by Side Diff: third_party/WebKit/Source/modules/speech/SpeechRecognition.h

Issue 2567913002: Rename ActiveDOMObject to SuspendableObject (Closed)
Patch Set: 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
OLDNEW
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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * * Redistributions of source code must retain the above copyright 7 * * 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 * * Redistributions in binary form must reproduce the above copyright 9 * * 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 THE COPYRIGHT HOLDERS ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``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 THE COPYRIGHT OWNER OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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 #ifndef SpeechRecognition_h 26 #ifndef SpeechRecognition_h
27 #define SpeechRecognition_h 27 #define SpeechRecognition_h
28 28
29 #include "bindings/core/v8/ActiveScriptWrappable.h" 29 #include "bindings/core/v8/ActiveScriptWrappable.h"
30 #include "core/dom/ActiveDOMObject.h" 30 #include "core/dom/SuspendableObject.h"
31 #include "modules/EventTargetModules.h" 31 #include "modules/EventTargetModules.h"
32 #include "modules/ModulesExport.h" 32 #include "modules/ModulesExport.h"
33 #include "modules/speech/SpeechGrammarList.h" 33 #include "modules/speech/SpeechGrammarList.h"
34 #include "modules/speech/SpeechRecognitionResult.h" 34 #include "modules/speech/SpeechRecognitionResult.h"
35 #include "platform/heap/Handle.h" 35 #include "platform/heap/Handle.h"
36 #include "public/platform/WebPrivatePtr.h" 36 #include "public/platform/WebPrivatePtr.h"
37 #include "wtf/Compiler.h" 37 #include "wtf/Compiler.h"
38 #include "wtf/text/WTFString.h" 38 #include "wtf/text/WTFString.h"
39 39
40 namespace blink { 40 namespace blink {
41 41
42 class ExceptionState; 42 class ExceptionState;
43 class ExecutionContext; 43 class ExecutionContext;
44 class MediaStreamTrack; 44 class MediaStreamTrack;
45 class Page; 45 class Page;
46 class SpeechRecognitionController; 46 class SpeechRecognitionController;
47 class SpeechRecognitionError; 47 class SpeechRecognitionError;
48 48
49 class MODULES_EXPORT SpeechRecognition final : public EventTargetWithInlineData, 49 class MODULES_EXPORT SpeechRecognition final : public EventTargetWithInlineData,
50 public ActiveScriptWrappable, 50 public ActiveScriptWrappable,
51 public ActiveDOMObject { 51 public SuspendableObject {
52 USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognition); 52 USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognition);
53 DEFINE_WRAPPERTYPEINFO(); 53 DEFINE_WRAPPERTYPEINFO();
54 54
55 public: 55 public:
56 static SpeechRecognition* create(ExecutionContext*); 56 static SpeechRecognition* create(ExecutionContext*);
57 ~SpeechRecognition() override; 57 ~SpeechRecognition() override;
58 58
59 // SpeechRecognition.idl implemementation. 59 // SpeechRecognition.idl implemementation.
60 // Attributes. 60 // Attributes.
61 SpeechGrammarList* grammars() { return m_grammars; } 61 SpeechGrammarList* grammars() { return m_grammars; }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 void didStart(); 97 void didStart();
98 void didEnd(); 98 void didEnd();
99 99
100 // EventTarget 100 // EventTarget
101 const AtomicString& interfaceName() const override; 101 const AtomicString& interfaceName() const override;
102 ExecutionContext* getExecutionContext() const override; 102 ExecutionContext* getExecutionContext() const override;
103 103
104 // ScriptWrappable 104 // ScriptWrappable
105 bool hasPendingActivity() const final; 105 bool hasPendingActivity() const final;
106 106
107 // ActiveDOMObject 107 // SuspendableObject
108 void contextDestroyed() override; 108 void contextDestroyed() override;
109 109
110 DEFINE_ATTRIBUTE_EVENT_LISTENER(audiostart); 110 DEFINE_ATTRIBUTE_EVENT_LISTENER(audiostart);
111 DEFINE_ATTRIBUTE_EVENT_LISTENER(soundstart); 111 DEFINE_ATTRIBUTE_EVENT_LISTENER(soundstart);
112 DEFINE_ATTRIBUTE_EVENT_LISTENER(speechstart); 112 DEFINE_ATTRIBUTE_EVENT_LISTENER(speechstart);
113 DEFINE_ATTRIBUTE_EVENT_LISTENER(speechend); 113 DEFINE_ATTRIBUTE_EVENT_LISTENER(speechend);
114 DEFINE_ATTRIBUTE_EVENT_LISTENER(soundend); 114 DEFINE_ATTRIBUTE_EVENT_LISTENER(soundend);
115 DEFINE_ATTRIBUTE_EVENT_LISTENER(audioend); 115 DEFINE_ATTRIBUTE_EVENT_LISTENER(audioend);
116 DEFINE_ATTRIBUTE_EVENT_LISTENER(result); 116 DEFINE_ATTRIBUTE_EVENT_LISTENER(result);
117 DEFINE_ATTRIBUTE_EVENT_LISTENER(nomatch); 117 DEFINE_ATTRIBUTE_EVENT_LISTENER(nomatch);
(...skipping 15 matching lines...) Expand all
133 133
134 Member<SpeechRecognitionController> m_controller; 134 Member<SpeechRecognitionController> m_controller;
135 bool m_started; 135 bool m_started;
136 bool m_stopping; 136 bool m_stopping;
137 HeapVector<Member<SpeechRecognitionResult>> m_finalResults; 137 HeapVector<Member<SpeechRecognitionResult>> m_finalResults;
138 }; 138 };
139 139
140 } // namespace blink 140 } // namespace blink
141 141
142 #endif // SpeechRecognition_h 142 #endif // SpeechRecognition_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698