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

Side by Side Diff: third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.h

Issue 2618613006: Remove ContextClient from DOMWindowSpeechSynthesis (Closed)
Patch Set: temp Created 3 years, 11 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 Inc. All rights reserved. 2 * Copyright (C) 2013 Apple 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
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 DOMWindowSpeechSynthesis_h 26 #ifndef DOMWindowSpeechSynthesis_h
27 #define DOMWindowSpeechSynthesis_h 27 #define DOMWindowSpeechSynthesis_h
28 28
29 #include "core/dom/ContextLifecycleObserver.h"
30 #include "core/frame/LocalDOMWindow.h" 29 #include "core/frame/LocalDOMWindow.h"
31 #include "modules/ModulesExport.h" 30 #include "modules/ModulesExport.h"
32 #include "modules/speech/SpeechSynthesis.h" 31 #include "modules/speech/SpeechSynthesis.h"
33 #include "platform/Supplementable.h" 32 #include "platform/Supplementable.h"
34 #include "platform/heap/Handle.h" 33 #include "platform/heap/Handle.h"
35 34
36 namespace blink { 35 namespace blink {
37 36
38 class DOMWindow; 37 class ScriptState;
39 38
40 class MODULES_EXPORT DOMWindowSpeechSynthesis final 39 class MODULES_EXPORT DOMWindowSpeechSynthesis final
41 : public GarbageCollected<DOMWindowSpeechSynthesis>, 40 : public GarbageCollected<DOMWindowSpeechSynthesis>,
42 public Supplement<LocalDOMWindow>, 41 public Supplement<LocalDOMWindow> {
43 public ContextClient {
44 USING_GARBAGE_COLLECTED_MIXIN(DOMWindowSpeechSynthesis); 42 USING_GARBAGE_COLLECTED_MIXIN(DOMWindowSpeechSynthesis);
45 43
46 public: 44 public:
47 static SpeechSynthesis* speechSynthesis(DOMWindow&); 45 static SpeechSynthesis* speechSynthesis(ScriptState*, DOMWindow&);
48 static DOMWindowSpeechSynthesis& from(LocalDOMWindow&); 46 static DOMWindowSpeechSynthesis& from(LocalDOMWindow&);
49 47
50 DECLARE_TRACE(); 48 DECLARE_TRACE();
51 49
52 private: 50 private:
53 explicit DOMWindowSpeechSynthesis(LocalDOMWindow&); 51 explicit DOMWindowSpeechSynthesis(LocalDOMWindow&);
54 52
55 SpeechSynthesis* speechSynthesis(); 53 SpeechSynthesis* speechSynthesis(ScriptState*);
56 static const char* supplementName(); 54 static const char* supplementName();
57 55
58 Member<SpeechSynthesis> m_speechSynthesis; 56 Member<SpeechSynthesis> m_speechSynthesis;
59 }; 57 };
60 58
61 } // namespace blink 59 } // namespace blink
62 60
63 #endif // DOMWindowSpeechSynthesis_h 61 #endif // DOMWindowSpeechSynthesis_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698