Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Side by Side Diff: third_party/WebKit/Source/platform/speech/PlatformSpeechSynthesizer.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2013 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 12 matching lines...) Expand all
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef PlatformSpeechSynthesizer_h 26 #ifndef PlatformSpeechSynthesizer_h
27 #define PlatformSpeechSynthesizer_h 27 #define PlatformSpeechSynthesizer_h
28 28
29 #include "platform/PlatformExport.h" 29 #include "platform/PlatformExport.h"
30 #include "platform/heap/Handle.h" 30 #include "platform/heap/Handle.h"
31 #include "platform/speech/PlatformSpeechSynthesisVoice.h" 31 #include "platform/speech/PlatformSpeechSynthesisVoice.h"
32 #include "wtf/Vector.h" 32 #include "wtf/Vector.h"
33 #include <memory>
33 34
34 namespace blink { 35 namespace blink {
35 36
36 enum SpeechBoundary { 37 enum SpeechBoundary {
37 SpeechWordBoundary, 38 SpeechWordBoundary,
38 SpeechSentenceBoundary 39 SpeechSentenceBoundary
39 }; 40 };
40 41
41 class PlatformSpeechSynthesisUtterance; 42 class PlatformSpeechSynthesisUtterance;
42 class WebSpeechSynthesizer; 43 class WebSpeechSynthesizer;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 protected: 88 protected:
88 explicit PlatformSpeechSynthesizer(PlatformSpeechSynthesizerClient*); 89 explicit PlatformSpeechSynthesizer(PlatformSpeechSynthesizerClient*);
89 90
90 virtual void initializeVoiceList(); 91 virtual void initializeVoiceList();
91 92
92 Vector<RefPtr<PlatformSpeechSynthesisVoice>> m_voiceList; 93 Vector<RefPtr<PlatformSpeechSynthesisVoice>> m_voiceList;
93 94
94 private: 95 private:
95 Member<PlatformSpeechSynthesizerClient> m_speechSynthesizerClient; 96 Member<PlatformSpeechSynthesizerClient> m_speechSynthesizerClient;
96 97
97 OwnPtr<WebSpeechSynthesizer> m_webSpeechSynthesizer; 98 std::unique_ptr<WebSpeechSynthesizer> m_webSpeechSynthesizer;
98 Member<WebSpeechSynthesizerClientImpl> m_webSpeechSynthesizerClient; 99 Member<WebSpeechSynthesizerClientImpl> m_webSpeechSynthesizerClient;
99 }; 100 };
100 101
101 } // namespace blink 102 } // namespace blink
102 103
103 #endif // PlatformSpeechSynthesizer_h 104 #endif // PlatformSpeechSynthesizer_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698