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

Unified Diff: Source/modules/speech/SpeechRecognition.h

Issue 163493003: Revert of Move speech module over to Oilpan. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/speech/SpeechGrammarList.idl ('k') | Source/modules/speech/SpeechRecognition.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/speech/SpeechRecognition.h
diff --git a/Source/modules/speech/SpeechRecognition.h b/Source/modules/speech/SpeechRecognition.h
index e279baf6a62717ef6951df4e7e96e5238425e15b..821f38b40b2e6ea4be08fe90768154955b81d7b0 100644
--- a/Source/modules/speech/SpeechRecognition.h
+++ b/Source/modules/speech/SpeechRecognition.h
@@ -29,9 +29,7 @@
#include "bindings/v8/ScriptWrappable.h"
#include "core/dom/ActiveDOMObject.h"
#include "core/events/EventTarget.h"
-#include "heap/Handle.h"
#include "modules/speech/SpeechGrammarList.h"
-#include "modules/speech/SpeechRecognitionResult.h"
#include "wtf/Compiler.h"
#include "wtf/PassRefPtr.h"
#include "wtf/RefCounted.h"
@@ -43,17 +41,18 @@
class ExecutionContext;
class SpeechRecognitionController;
class SpeechRecognitionError;
+class SpeechRecognitionResult;
+class SpeechRecognitionResultList;
-class SpeechRecognition FINAL : public RefCountedWillBeRefCountedGarbageCollected<SpeechRecognition>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData {
- DECLARE_GC_INFO;
- DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<SpeechRecognition>);
+class SpeechRecognition FINAL : public RefCounted<SpeechRecognition>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData {
+ REFCOUNTED_EVENT_TARGET(SpeechRecognition);
public:
- static PassRefPtrWillBeRawPtr<SpeechRecognition> create(ExecutionContext*);
+ static PassRefPtr<SpeechRecognition> create(ExecutionContext*);
virtual ~SpeechRecognition();
// Attributes.
- SpeechGrammarList* grammars() { return m_grammars.get(); }
- void setGrammars(PassRefPtrWillBeRawPtr<SpeechGrammarList> grammars) { m_grammars = grammars; }
+ PassRefPtr<SpeechGrammarList> grammars() { return m_grammars; }
+ void setGrammars(PassRefPtr<SpeechGrammarList> grammars) { m_grammars = grammars; }
String lang() { return m_lang; }
void setLang(const String& lang) { m_lang = lang; }
bool continuous() { return m_continuous; }
@@ -100,14 +99,12 @@
DEFINE_ATTRIBUTE_EVENT_LISTENER(start);
DEFINE_ATTRIBUTE_EVENT_LISTENER(end);
- void trace(Visitor*);
-
private:
friend class RefCounted<SpeechRecognition>;
explicit SpeechRecognition(ExecutionContext*);
- RefPtrWillBeMember<SpeechGrammarList> m_grammars;
+ RefPtr<SpeechGrammarList> m_grammars;
String m_lang;
bool m_continuous;
bool m_interimResults;
« no previous file with comments | « Source/modules/speech/SpeechGrammarList.idl ('k') | Source/modules/speech/SpeechRecognition.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698