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

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 void setStartTime(double startTime) { m_platformUtterance->setStartTime(star tTime); } 65 void setStartTime(double startTime) { m_platformUtterance->setStartTime(star tTime); }
66 66
67 DEFINE_ATTRIBUTE_EVENT_LISTENER(start); 67 DEFINE_ATTRIBUTE_EVENT_LISTENER(start);
68 DEFINE_ATTRIBUTE_EVENT_LISTENER(end); 68 DEFINE_ATTRIBUTE_EVENT_LISTENER(end);
69 DEFINE_ATTRIBUTE_EVENT_LISTENER(error); 69 DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
70 DEFINE_ATTRIBUTE_EVENT_LISTENER(pause); 70 DEFINE_ATTRIBUTE_EVENT_LISTENER(pause);
71 DEFINE_ATTRIBUTE_EVENT_LISTENER(resume); 71 DEFINE_ATTRIBUTE_EVENT_LISTENER(resume);
72 DEFINE_ATTRIBUTE_EVENT_LISTENER(mark); 72 DEFINE_ATTRIBUTE_EVENT_LISTENER(mark);
73 DEFINE_ATTRIBUTE_EVENT_LISTENER(boundary); 73 DEFINE_ATTRIBUTE_EVENT_LISTENER(boundary);
74 74
75 ExecutionContext* executionContext() const override; 75 ExecutionContext* getExecutionContext() const override;
76 76
77 PlatformSpeechSynthesisUtterance* platformUtterance() const { return m_platf ormUtterance; } 77 PlatformSpeechSynthesisUtterance* platformUtterance() const { return m_platf ormUtterance; }
78 78
79 DECLARE_VIRTUAL_TRACE(); 79 DECLARE_VIRTUAL_TRACE();
80 80
81 private: 81 private:
82 SpeechSynthesisUtterance(ExecutionContext*, const String&); 82 SpeechSynthesisUtterance(ExecutionContext*, const String&);
83 83
84 // EventTarget 84 // EventTarget
85 const AtomicString& interfaceName() const override; 85 const AtomicString& interfaceName() const override;
86 86
87 Member<PlatformSpeechSynthesisUtterance> m_platformUtterance; 87 Member<PlatformSpeechSynthesisUtterance> m_platformUtterance;
88 Member<SpeechSynthesisVoice> m_voice; 88 Member<SpeechSynthesisVoice> m_voice;
89 }; 89 };
90 90
91 } // namespace blink 91 } // namespace blink
92 92
93 #endif // SpeechSynthesisUtterance_h 93 #endif // SpeechSynthesisUtterance_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698