Index: Source/modules/speech/SpeechSynthesis.h |
diff --git a/Source/modules/speech/SpeechSynthesis.h b/Source/modules/speech/SpeechSynthesis.h |
index ce8e049857ad3818de6111bd9aff179a2c82fb54..eba89fb2549869aa6ffdd786bd749d65af50832d 100644 |
--- a/Source/modules/speech/SpeechSynthesis.h |
+++ b/Source/modules/speech/SpeechSynthesis.h |
@@ -34,18 +34,21 @@ |
#include "platform/heap/Handle.h" |
#include "platform/speech/PlatformSpeechSynthesisUtterance.h" |
#include "platform/speech/PlatformSpeechSynthesizer.h" |
+#include "wtf/Deque.h" |
#include "wtf/PassRefPtr.h" |
+#include "wtf/RefCounted.h" |
+#include "wtf/RefPtr.h" |
namespace WebCore { |
class ExceptionState; |
class PlatformSpeechSynthesizerClient; |
-class SpeechSynthesis FINAL : public RefCountedGarbageCollected<SpeechSynthesis>, public PlatformSpeechSynthesizerClient, public ScriptWrappable, public ContextLifecycleObserver, public EventTargetWithInlineData { |
- DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedGarbageCollected<SpeechSynthesis>); |
+class SpeechSynthesis FINAL : public RefCountedWillBeRefCountedGarbageCollected<SpeechSynthesis>, public PlatformSpeechSynthesizerClient, public ScriptWrappable, public ContextLifecycleObserver, public EventTargetWithInlineData { |
+ REFCOUNTED_EVENT_TARGET(SpeechSynthesis); |
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechSynthesis); |
public: |
- static SpeechSynthesis* create(ExecutionContext*); |
+ static PassRefPtrWillBeRawPtr<SpeechSynthesis> create(ExecutionContext*); |
bool pending() const; |
bool speaking() const; |
@@ -56,7 +59,7 @@ |
void pause(); |
void resume(); |
- const HeapVector<Member<SpeechSynthesisVoice> >& getVoices(); |
+ const WillBeHeapVector<RefPtrWillBeMember<SpeechSynthesisVoice> >& getVoices(); |
// Used in testing to use a mock platform synthesizer |
void setPlatformSynthesizer(PassOwnPtr<PlatformSpeechSynthesizer>); |
@@ -87,8 +90,8 @@ |
SpeechSynthesisUtterance* currentSpeechUtterance() const; |
OwnPtr<PlatformSpeechSynthesizer> m_platformSpeechSynthesizer; |
- HeapVector<Member<SpeechSynthesisVoice> > m_voiceList; |
- HeapDeque<Member<SpeechSynthesisUtterance> > m_utteranceQueue; |
+ WillBeHeapVector<RefPtrWillBeMember<SpeechSynthesisVoice> > m_voiceList; |
+ Deque<RefPtrWillBeMember<SpeechSynthesisUtterance> > m_utteranceQueue; |
bool m_isPaused; |
// EventTarget |