Source/modules/speech/SpeechSynthesis.h - Issue 139803012: Move speech module over to Oilpan.

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: More namespace tweaks for clang 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

« Source/modules/speech/SpeechRecognitionResultList.cpp ('K') | « Source/modules/speech/SpeechRecognitionResultList.idl ('k') | Source/modules/speech/SpeechSynthesis.cpp » ('j') | Source/modules/speech/SpeechSynthesis.cpp » ('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 d1aa9b73245862b6f7911b92b2d9ec2d3595296b..acd7a523192d9067456dc7fb15a8c88a4c44c43b 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 Vector<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;

+ Vector<RefPtrWillBeMember<SpeechSynthesisVoice> > m_voiceList;

haraken 2014/02/12 05:18:45 WillBeHeapVector<RefPtrWillBeMember<>>.

sof 2014/02/12 10:17:09 Done.

+ RawPtrWillBeMember<SpeechSynthesisUtterance> m_currentSpeechUtterance;

+ Deque<RefPtrWillBeMember<SpeechSynthesisUtterance> > m_utteranceQueue;

haraken 2014/02/12 05:18:45 We haven't yet supported HeapDeque, so it's OK to

sof 2014/02/12 10:17:09 Done.

bool m_isPaused;

// EventTarget