Source/modules/speech/SpeechSynthesis.h - Issue 315133004: Enable Oilpan by default in modules/speech/

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

Issue 315133004: Enable Oilpan by default in modules/speech/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Remove unused Dictionary support for SpeechRecognitionError + fix Speech*Event create() types. 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/SpeechRecognitionResultList.idl ('k') | Source/modules/speech/SpeechSynthesis.cpp » ('j') | Source/modules/speech/SpeechSynthesisUtterance.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/speech/SpeechSynthesis.h

diff --git a/Source/modules/speech/SpeechSynthesis.h b/Source/modules/speech/SpeechSynthesis.h

index eba89fb2549869aa6ffdd786bd749d65af50832d..ce8e049857ad3818de6111bd9aff179a2c82fb54 100644

--- a/Source/modules/speech/SpeechSynthesis.h

+++ b/Source/modules/speech/SpeechSynthesis.h

@@ -34,21 +34,18 @@

#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 RefCountedWillBeRefCountedGarbageCollected<SpeechSynthesis>, public PlatformSpeechSynthesizerClient, public ScriptWrappable, public ContextLifecycleObserver, public EventTargetWithInlineData {

- REFCOUNTED_EVENT_TARGET(SpeechSynthesis);

+class SpeechSynthesis FINAL : public RefCountedGarbageCollected<SpeechSynthesis>, public PlatformSpeechSynthesizerClient, public ScriptWrappable, public ContextLifecycleObserver, public EventTargetWithInlineData {

+ DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedGarbageCollected<SpeechSynthesis>);

WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SpeechSynthesis);

public:

- static PassRefPtrWillBeRawPtr<SpeechSynthesis> create(ExecutionContext*);

+ static SpeechSynthesis* create(ExecutionContext*);

bool pending() const;

bool speaking() const;

@@ -59,7 +56,7 @@ public:

void pause();

void resume();

- const WillBeHeapVector<RefPtrWillBeMember<SpeechSynthesisVoice> >& getVoices();

+ const HeapVector<Member<SpeechSynthesisVoice> >& getVoices();

// Used in testing to use a mock platform synthesizer

void setPlatformSynthesizer(PassOwnPtr<PlatformSpeechSynthesizer>);

@@ -90,8 +87,8 @@ private:

SpeechSynthesisUtterance* currentSpeechUtterance() const;

OwnPtr<PlatformSpeechSynthesizer> m_platformSpeechSynthesizer;

haraken 2014/06/06 01:11:16 PlatformSpeechSynthesizer would be another target

- WillBeHeapVector<RefPtrWillBeMember<SpeechSynthesisVoice> > m_voiceList;

- Deque<RefPtrWillBeMember<SpeechSynthesisUtterance> > m_utteranceQueue;

+ HeapVector<Member<SpeechSynthesisVoice> > m_voiceList;

+ HeapDeque<Member<SpeechSynthesisUtterance> > m_utteranceQueue;

bool m_isPaused;

// EventTarget