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

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

Issue 330463002: Revert of Enable Oilpan by default in modules/speech/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 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 f30e2b8302d7bc003c5b4fc827877305f731b515..9bc5a793f1930046223df0c76ea0c0d4c567217a 100644
--- a/Source/modules/speech/SpeechRecognition.h
+++ b/Source/modules/speech/SpeechRecognition.h
@@ -33,6 +33,8 @@
#include "modules/speech/SpeechRecognitionResult.h"
#include "platform/heap/Handle.h"
#include "wtf/Compiler.h"
+#include "wtf/PassRefPtr.h"
+#include "wtf/RefCounted.h"
#include "wtf/text/WTFString.h"
namespace WebCore {
@@ -42,16 +44,16 @@
class SpeechRecognitionController;
class SpeechRecognitionError;
-class SpeechRecognition FINAL : public RefCountedGarbageCollected<SpeechRecognition>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData {
- DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedGarbageCollected<SpeechRecognition>);
+class SpeechRecognition FINAL : public RefCountedWillBeRefCountedGarbageCollected<SpeechRecognition>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData {
+ REFCOUNTED_EVENT_TARGET(SpeechRecognition);
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechRecognition);
public:
- static SpeechRecognition* create(ExecutionContext*);
+ static PassRefPtrWillBeRawPtr<SpeechRecognition> create(ExecutionContext*);
virtual ~SpeechRecognition();
// Attributes.
SpeechGrammarList* grammars() { return m_grammars.get(); }
- void setGrammars(SpeechGrammarList* grammars) { m_grammars = grammars; }
+ 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; }
@@ -73,8 +75,8 @@
void didEndSpeech();
void didEndSound();
void didEndAudio();
- void didReceiveResults(const HeapVector<Member<SpeechRecognitionResult> >& newFinalResults, const HeapVector<Member<SpeechRecognitionResult> >& currentInterimResults);
- void didReceiveNoMatch(SpeechRecognitionResult*);
+ void didReceiveResults(const WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> >& newFinalResults, const WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> >& currentInterimResults);
+ void didReceiveNoMatch(PassRefPtrWillBeRawPtr<SpeechRecognitionResult>);
void didReceiveError(PassRefPtrWillBeRawPtr<SpeechRecognitionError>);
void didStart();
void didEnd();
@@ -102,9 +104,11 @@
virtual void trace(Visitor*) OVERRIDE;
private:
+ friend class RefCounted<SpeechRecognition>;
+
explicit SpeechRecognition(ExecutionContext*);
- Member<SpeechGrammarList> m_grammars;
+ RefPtrWillBeMember<SpeechGrammarList> m_grammars;
String m_lang;
bool m_continuous;
bool m_interimResults;
@@ -114,7 +118,7 @@
bool m_stoppedByActiveDOMObject;
bool m_started;
bool m_stopping;
- HeapVector<Member<SpeechRecognitionResult> > m_finalResults;
+ WillBeHeapVector<RefPtrWillBeMember<SpeechRecognitionResult> > m_finalResults;
};
} // namespace WebCore
« 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