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

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

Issue 139803012: Move speech module over to Oilpan. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make SpeechSynthesisVoice GC-finalized 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/SpeechSynthesis.h
diff --git a/Source/modules/speech/SpeechSynthesis.h b/Source/modules/speech/SpeechSynthesis.h
index d1aa9b73245862b6f7911b92b2d9ec2d3595296b..804c60a2cd2e5d450d5d33751a4d1881e2a493d1 100644
--- a/Source/modules/speech/SpeechSynthesis.h
+++ b/Source/modules/speech/SpeechSynthesis.h
@@ -29,6 +29,7 @@
#include "bindings/v8/ScriptWrappable.h"
#include "core/dom/ContextLifecycleObserver.h"
#include "core/events/EventTarget.h"
+#include "heap/Handle.h"
#include "modules/speech/SpeechSynthesisUtterance.h"
#include "modules/speech/SpeechSynthesisVoice.h"
#include "platform/speech/PlatformSpeechSynthesisUtterance.h"
@@ -42,12 +43,12 @@ namespace WebCore {
class ExceptionState;
class PlatformSpeechSynthesizerClient;
-class SpeechSynthesisVoice;
-class SpeechSynthesis FINAL : public PlatformSpeechSynthesizerClient, public ScriptWrappable, public RefCounted<SpeechSynthesis>, public ContextLifecycleObserver, public EventTargetWithInlineData {
- REFCOUNTED_EVENT_TARGET(SpeechSynthesis);
+class SpeechSynthesis FINAL : public RefCountedWillBeRefCountedGarbageCollected<SpeechSynthesis>, public PlatformSpeechSynthesizerClient, public ScriptWrappable, public ContextLifecycleObserver, public EventTargetWithInlineData {
+ DECLARE_GC_INFO;
+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<SpeechSynthesis>);
public:
- static PassRefPtr<SpeechSynthesis> create(ExecutionContext*);
+ static PassRefPtrWillBeRawPtr<SpeechSynthesis> create(ExecutionContext*);
bool pending() const;
bool speaking() const;
@@ -58,7 +59,7 @@ public:
void pause();
void resume();
- const Vector<RefPtr<SpeechSynthesisVoice> >& getVoices();
+ const WillBeHeapVector<RefPtrWillBeMember<SpeechSynthesisVoice> >& getVoices();
// Used in testing to use a mock platform synthesizer
void setPlatformSynthesizer(PassOwnPtr<PlatformSpeechSynthesizer>);
@@ -67,6 +68,8 @@ public:
virtual ExecutionContext* executionContext() const OVERRIDE;
+ void trace(Visitor*);
+
private:
explicit SpeechSynthesis(ExecutionContext*);
@@ -84,9 +87,9 @@ private:
void fireEvent(const AtomicString& type, SpeechSynthesisUtterance*, unsigned long charIndex, const String& name);
OwnPtr<PlatformSpeechSynthesizer> m_platformSpeechSynthesizer;
- Vector<RefPtr<SpeechSynthesisVoice> > m_voiceList;
- SpeechSynthesisUtterance* m_currentSpeechUtterance;
- Deque<RefPtr<SpeechSynthesisUtterance> > m_utteranceQueue;
+ WillBeHeapVector<RefPtrWillBeMember<SpeechSynthesisVoice> > m_voiceList;
+ RawPtrWillBeMember<SpeechSynthesisUtterance> m_currentSpeechUtterance;
+ Deque<RefPtrWillBeMember<SpeechSynthesisUtterance> > m_utteranceQueue;
bool m_isPaused;
// EventTarget

Powered by Google App Engine
This is Rietveld 408576698