| Index: Source/modules/speech/SpeechSynthesisUtterance.h
|
| diff --git a/Source/modules/speech/SpeechSynthesisUtterance.h b/Source/modules/speech/SpeechSynthesisUtterance.h
|
| index 850ee9ba4914646dbdb7989ed0d870607187134e..f381ccbb0308bb9253d2a1feefee38f38d0f483d 100644
|
| --- a/Source/modules/speech/SpeechSynthesisUtterance.h
|
| +++ b/Source/modules/speech/SpeechSynthesisUtterance.h
|
| @@ -29,7 +29,6 @@
|
| #include "bindings/v8/ScriptWrappable.h"
|
| #include "core/dom/ContextLifecycleObserver.h"
|
| #include "core/events/EventTarget.h"
|
| -#include "heap/Handle.h"
|
| #include "modules/speech/SpeechSynthesisVoice.h"
|
| #include "platform/speech/PlatformSpeechSynthesisUtterance.h"
|
| #include "wtf/PassRefPtr.h"
|
| @@ -37,11 +36,10 @@
|
|
|
| namespace WebCore {
|
|
|
| -class SpeechSynthesisUtterance FINAL : public RefCountedWillBeRefCountedGarbageCollected<SpeechSynthesisUtterance>, public PlatformSpeechSynthesisUtteranceClient, public ScriptWrappable, public ContextLifecycleObserver, public EventTargetWithInlineData {
|
| - DECLARE_GC_INFO;
|
| - DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<SpeechSynthesisUtterance>);
|
| +class SpeechSynthesisUtterance FINAL : public PlatformSpeechSynthesisUtteranceClient, public ScriptWrappable, public RefCounted<SpeechSynthesisUtterance>, public ContextLifecycleObserver, public EventTargetWithInlineData {
|
| + REFCOUNTED_EVENT_TARGET(SpeechSynthesisUtterance);
|
| public:
|
| - static PassRefPtrWillBeRawPtr<SpeechSynthesisUtterance> create(ExecutionContext*, const String&);
|
| + static PassRefPtr<SpeechSynthesisUtterance> create(ExecutionContext*, const String&);
|
|
|
| virtual ~SpeechSynthesisUtterance();
|
|
|
| @@ -78,12 +76,10 @@
|
|
|
| PlatformSpeechSynthesisUtterance* platformUtterance() const { return m_platformUtterance.get(); }
|
|
|
| - void trace(Visitor*);
|
| -
|
| private:
|
| SpeechSynthesisUtterance(ExecutionContext*, const String&);
|
| RefPtr<PlatformSpeechSynthesisUtterance> m_platformUtterance;
|
| - RefPtrWillBeMember<SpeechSynthesisVoice> m_voice;
|
| + RefPtr<SpeechSynthesisVoice> m_voice;
|
|
|
| // EventTarget
|
| virtual const AtomicString& interfaceName() const OVERRIDE;
|
|
|