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

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

Issue 139803012: Move speech module over to Oilpan. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Switch SpeechRecognitionResult over to WillBeHeapVector also 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
Index: Source/modules/speech/SpeechRecognition.h
diff --git a/Source/modules/speech/SpeechRecognition.h b/Source/modules/speech/SpeechRecognition.h
index 821f38b40b2e6ea4be08fe90768154955b81d7b0..1a8413fd4afc9a075282bdbde0b3e8dc772976c6 100644
--- a/Source/modules/speech/SpeechRecognition.h
+++ b/Source/modules/speech/SpeechRecognition.h
@@ -29,7 +29,9 @@
#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"
@@ -41,18 +43,17 @@ class ExceptionState;
class ExecutionContext;
class SpeechRecognitionController;
class SpeechRecognitionError;
-class SpeechRecognitionResult;
-class SpeechRecognitionResultList;
-class SpeechRecognition FINAL : public RefCounted<SpeechRecognition>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData {
- REFCOUNTED_EVENT_TARGET(SpeechRecognition);
+class SpeechRecognition FINAL : public RefCountedWillBeRefCountedGarbageCollected<SpeechRecognition>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData {
+ DECLARE_GC_INFO;
+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<SpeechRecognition>);
public:
- static PassRefPtr<SpeechRecognition> create(ExecutionContext*);
+ static PassRefPtrWillBeRawPtr<SpeechRecognition> create(ExecutionContext*);
virtual ~SpeechRecognition();
// Attributes.
- PassRefPtr<SpeechGrammarList> grammars() { return m_grammars; }
- void setGrammars(PassRefPtr<SpeechGrammarList> grammars) { m_grammars = grammars; }
+ SpeechGrammarList* grammars() { return m_grammars.get(); }
+ void setGrammars(PassRefPtrWillBeRawPtr<SpeechGrammarList> grammars) { m_grammars = grammars; }
String lang() { return m_lang; }
void setLang(const String& lang) { m_lang = lang; }
bool continuous() { return m_continuous; }
@@ -99,12 +100,14 @@ public:
DEFINE_ATTRIBUTE_EVENT_LISTENER(start);
DEFINE_ATTRIBUTE_EVENT_LISTENER(end);
+ void trace(Visitor*);
+
private:
friend class RefCounted<SpeechRecognition>;
explicit SpeechRecognition(ExecutionContext*);
- RefPtr<SpeechGrammarList> m_grammars;
+ RefPtrWillBeMember<SpeechGrammarList> m_grammars;
String m_lang;
bool m_continuous;
bool m_interimResults;
@@ -114,7 +117,7 @@ private:
bool m_stoppedByActiveDOMObject;
bool m_started;
bool m_stopping;
- Vector<RefPtr<SpeechRecognitionResult> > m_finalResults;
+ WillBeHeapVector<RefPtr<SpeechRecognitionResult> > m_finalResults;
haraken 2014/02/12 11:12:54 This should be WillBeHeapVector<RefPtrWillBeMember
zerny-chromium 2014/02/12 11:45:19 This should just stay as a non-heap vector until t
sof 2014/02/12 16:18:13 Changed back to a Vector<>
};
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698