Chromium Code Reviews| Index: Source/modules/speech/SpeechSynthesis.h |
| diff --git a/Source/modules/speech/SpeechSynthesis.h b/Source/modules/speech/SpeechSynthesis.h |
| index 8116b099e2ab8230c25497337d70f59a693b6dc5..6ad91a25e7bc4e4cea3ed14767b89d81af05e508 100644 |
| --- a/Source/modules/speech/SpeechSynthesis.h |
| +++ b/Source/modules/speech/SpeechSynthesis.h |
| @@ -34,7 +34,6 @@ |
| #include "platform/heap/Handle.h" |
| #include "platform/speech/PlatformSpeechSynthesisUtterance.h" |
| #include "platform/speech/PlatformSpeechSynthesizer.h" |
| -#include "wtf/PassRefPtr.h" |
| namespace WebCore { |
| @@ -43,7 +42,7 @@ class PlatformSpeechSynthesizerClient; |
| class SpeechSynthesis FINAL : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<SpeechSynthesis>, public PlatformSpeechSynthesizerClient, public ScriptWrappable, public ContextLifecycleObserver, public EventTargetWithInlineData { |
| DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<SpeechSynthesis>); |
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechSynthesis); |
|
haraken
2014/06/17 09:18:50
I'm a bit confused with this. You didn't drop WILL
sof
2014/06/17 09:26:08
PlatformSpeechSynthesizerClient is on the heap alw
haraken
2014/06/17 09:30:23
Makes sense. If either of mixins is on the heap al
|
| + USING_GARBAGE_COLLECTED_MIXIN(SpeechSynthesis); |
| public: |
| static SpeechSynthesis* create(ExecutionContext*); |
| @@ -59,7 +58,7 @@ public: |
| const HeapVector<Member<SpeechSynthesisVoice> >& getVoices(); |
| // Used in testing to use a mock platform synthesizer |
| - void setPlatformSynthesizer(PassOwnPtr<PlatformSpeechSynthesizer>); |
| + void setPlatformSynthesizer(PlatformSpeechSynthesizer*); |
| DEFINE_ATTRIBUTE_EVENT_LISTENER(voiceschanged); |
| @@ -72,12 +71,12 @@ private: |
| // PlatformSpeechSynthesizerClient override methods. |
| virtual void voicesDidChange() OVERRIDE; |
| - virtual void didStartSpeaking(PassRefPtr<PlatformSpeechSynthesisUtterance>) OVERRIDE; |
| - virtual void didPauseSpeaking(PassRefPtr<PlatformSpeechSynthesisUtterance>) OVERRIDE; |
| - virtual void didResumeSpeaking(PassRefPtr<PlatformSpeechSynthesisUtterance>) OVERRIDE; |
| - virtual void didFinishSpeaking(PassRefPtr<PlatformSpeechSynthesisUtterance>) OVERRIDE; |
| - virtual void speakingErrorOccurred(PassRefPtr<PlatformSpeechSynthesisUtterance>) OVERRIDE; |
| - virtual void boundaryEventOccurred(PassRefPtr<PlatformSpeechSynthesisUtterance>, SpeechBoundary, unsigned charIndex) OVERRIDE; |
| + virtual void didStartSpeaking(PlatformSpeechSynthesisUtterance*) OVERRIDE; |
| + virtual void didPauseSpeaking(PlatformSpeechSynthesisUtterance*) OVERRIDE; |
| + virtual void didResumeSpeaking(PlatformSpeechSynthesisUtterance*) OVERRIDE; |
| + virtual void didFinishSpeaking(PlatformSpeechSynthesisUtterance*) OVERRIDE; |
| + virtual void speakingErrorOccurred(PlatformSpeechSynthesisUtterance*) OVERRIDE; |
| + virtual void boundaryEventOccurred(PlatformSpeechSynthesisUtterance*, SpeechBoundary, unsigned charIndex) OVERRIDE; |
| void startSpeakingImmediately(); |
| void handleSpeakingCompleted(SpeechSynthesisUtterance*, bool errorOccurred); |
| @@ -86,7 +85,7 @@ private: |
| // Returns the utterance at the front of the queue. |
| SpeechSynthesisUtterance* currentSpeechUtterance() const; |
| - OwnPtr<PlatformSpeechSynthesizer> m_platformSpeechSynthesizer; |
| + Member<PlatformSpeechSynthesizer> m_platformSpeechSynthesizer; |
| HeapVector<Member<SpeechSynthesisVoice> > m_voiceList; |
| HeapDeque<Member<SpeechSynthesisUtterance> > m_utteranceQueue; |
| bool m_isPaused; |