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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/RTCDTMFSender.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 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 int interToneGap() const { return m_interToneGap; } 56 int interToneGap() const { return m_interToneGap; }
57 57
58 void insertDTMF(const String& tones, ExceptionState&); 58 void insertDTMF(const String& tones, ExceptionState&);
59 void insertDTMF(const String& tones, int duration, ExceptionState&); 59 void insertDTMF(const String& tones, int duration, ExceptionState&);
60 void insertDTMF(const String& tones, int duration, int interToneGap, Excepti onState&); 60 void insertDTMF(const String& tones, int duration, int interToneGap, Excepti onState&);
61 61
62 DEFINE_ATTRIBUTE_EVENT_LISTENER(tonechange); 62 DEFINE_ATTRIBUTE_EVENT_LISTENER(tonechange);
63 63
64 // EventTarget 64 // EventTarget
65 const AtomicString& interfaceName() const override; 65 const AtomicString& interfaceName() const override;
66 ExecutionContext* executionContext() const override; 66 ExecutionContext* getExecutionContext() const override;
67 67
68 // ActiveDOMObject 68 // ActiveDOMObject
69 void stop() override; 69 void stop() override;
70 70
71 // Oilpan: need to eagerly finalize m_handler 71 // Oilpan: need to eagerly finalize m_handler
72 EAGERLY_FINALIZE(); 72 EAGERLY_FINALIZE();
73 DECLARE_VIRTUAL_TRACE(); 73 DECLARE_VIRTUAL_TRACE();
74 74
75 private: 75 private:
76 RTCDTMFSender(ExecutionContext*, MediaStreamTrack*, PassOwnPtr<WebRTCDTMFSen derHandler>); 76 RTCDTMFSender(ExecutionContext*, MediaStreamTrack*, PassOwnPtr<WebRTCDTMFSen derHandler>);
(...skipping 12 matching lines...) Expand all
89 89
90 bool m_stopped; 90 bool m_stopped;
91 91
92 Timer<RTCDTMFSender> m_scheduledEventTimer; 92 Timer<RTCDTMFSender> m_scheduledEventTimer;
93 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents; 93 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;
94 }; 94 };
95 95
96 } // namespace blink 96 } // namespace blink
97 97
98 #endif // RTCDTMFSender_h 98 #endif // RTCDTMFSender_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698