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

Side by Side Diff: third_party/WebKit/Source/modules/speech/DOMWindowSpeechSynthesis.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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 // static 62 // static
63 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis(DOMWindow& window) 63 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis(DOMWindow& window)
64 { 64 {
65 return DOMWindowSpeechSynthesis::from(toLocalDOMWindow(window)).speechSynthe sis(); 65 return DOMWindowSpeechSynthesis::from(toLocalDOMWindow(window)).speechSynthe sis();
66 } 66 }
67 67
68 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis() 68 SpeechSynthesis* DOMWindowSpeechSynthesis::speechSynthesis()
69 { 69 {
70 if (!m_speechSynthesis && frame()) 70 if (!m_speechSynthesis && frame())
71 m_speechSynthesis = SpeechSynthesis::create(frame()->domWindow()->execut ionContext()); 71 m_speechSynthesis = SpeechSynthesis::create(frame()->domWindow()->getExe cutionContext());
72 return m_speechSynthesis; 72 return m_speechSynthesis;
73 } 73 }
74 74
75 DEFINE_TRACE(DOMWindowSpeechSynthesis) 75 DEFINE_TRACE(DOMWindowSpeechSynthesis)
76 { 76 {
77 visitor->trace(m_speechSynthesis); 77 visitor->trace(m_speechSynthesis);
78 WillBeHeapSupplement<LocalDOMWindow>::trace(visitor); 78 WillBeHeapSupplement<LocalDOMWindow>::trace(visitor);
79 DOMWindowProperty::trace(visitor); 79 DOMWindowProperty::trace(visitor);
80 } 80 }
81 81
82 } // namespace blink 82 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698