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

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

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 25 matching lines...) Expand all
36 : ContextLifecycleObserver(context) 36 : ContextLifecycleObserver(context)
37 , m_platformUtterance(PlatformSpeechSynthesisUtterance::create(this)) 37 , m_platformUtterance(PlatformSpeechSynthesisUtterance::create(this))
38 { 38 {
39 m_platformUtterance->setText(text); 39 m_platformUtterance->setText(text);
40 } 40 }
41 41
42 SpeechSynthesisUtterance::~SpeechSynthesisUtterance() 42 SpeechSynthesisUtterance::~SpeechSynthesisUtterance()
43 { 43 {
44 } 44 }
45 45
46 ExecutionContext* SpeechSynthesisUtterance::executionContext() const 46 ExecutionContext* SpeechSynthesisUtterance::getExecutionContext() const
47 { 47 {
48 return ContextLifecycleObserver::executionContext(); 48 return ContextLifecycleObserver::getExecutionContext();
49 } 49 }
50 50
51 const AtomicString& SpeechSynthesisUtterance::interfaceName() const 51 const AtomicString& SpeechSynthesisUtterance::interfaceName() const
52 { 52 {
53 return EventTargetNames::SpeechSynthesisUtterance; 53 return EventTargetNames::SpeechSynthesisUtterance;
54 } 54 }
55 55
56 SpeechSynthesisVoice* SpeechSynthesisUtterance::voice() const 56 SpeechSynthesisVoice* SpeechSynthesisUtterance::voice() const
57 { 57 {
58 return m_voice; 58 return m_voice;
(...skipping 11 matching lines...) Expand all
70 70
71 DEFINE_TRACE(SpeechSynthesisUtterance) 71 DEFINE_TRACE(SpeechSynthesisUtterance)
72 { 72 {
73 visitor->trace(m_platformUtterance); 73 visitor->trace(m_platformUtterance);
74 visitor->trace(m_voice); 74 visitor->trace(m_voice);
75 RefCountedGarbageCollectedEventTargetWithInlineData<SpeechSynthesisUtterance >::trace(visitor); 75 RefCountedGarbageCollectedEventTargetWithInlineData<SpeechSynthesisUtterance >::trace(visitor);
76 ContextLifecycleObserver::trace(visitor); 76 ContextLifecycleObserver::trace(visitor);
77 } 77 }
78 78
79 } // namespace blink 79 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698