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

Side by Side Diff: Source/modules/mediastream/RTCDTMFSender.cpp

Issue 469773002: Cleanup blink:: prefix usage in Source/core/modules/[mediasource/*.cpp to websockets/*.cpp] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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 26 matching lines...) Expand all
37 #include "public/platform/WebRTCPeerConnectionHandler.h" 37 #include "public/platform/WebRTCPeerConnectionHandler.h"
38 38
39 namespace blink { 39 namespace blink {
40 40
41 static const long minToneDurationMs = 70; 41 static const long minToneDurationMs = 70;
42 static const long defaultToneDurationMs = 100; 42 static const long defaultToneDurationMs = 100;
43 static const long maxToneDurationMs = 6000; 43 static const long maxToneDurationMs = 6000;
44 static const long minInterToneGapMs = 50; 44 static const long minInterToneGapMs = 50;
45 static const long defaultInterToneGapMs = 50; 45 static const long defaultInterToneGapMs = 50;
46 46
47 RTCDTMFSender* RTCDTMFSender::create(ExecutionContext* context, blink::WebRTCPee rConnectionHandler* peerConnectionHandler, MediaStreamTrack* track, ExceptionSta te& exceptionState) 47 RTCDTMFSender* RTCDTMFSender::create(ExecutionContext* context, WebRTCPeerConnec tionHandler* peerConnectionHandler, MediaStreamTrack* track, ExceptionState& exc eptionState)
48 { 48 {
49 OwnPtr<blink::WebRTCDTMFSenderHandler> handler = adoptPtr(peerConnectionHand ler->createDTMFSender(track->component())); 49 OwnPtr<WebRTCDTMFSenderHandler> handler = adoptPtr(peerConnectionHandler->cr eateDTMFSender(track->component()));
50 if (!handler) { 50 if (!handler) {
51 exceptionState.throwDOMException(NotSupportedError, "The MediaStreamTrac k provided is not an element of a MediaStream that's currently in the local stre ams set."); 51 exceptionState.throwDOMException(NotSupportedError, "The MediaStreamTrac k provided is not an element of a MediaStream that's currently in the local stre ams set.");
52 return nullptr; 52 return nullptr;
53 } 53 }
54 54
55 RTCDTMFSender* dtmfSender = adoptRefCountedGarbageCollectedWillBeNoop(new RT CDTMFSender(context, track, handler.release())); 55 RTCDTMFSender* dtmfSender = adoptRefCountedGarbageCollectedWillBeNoop(new RT CDTMFSender(context, track, handler.release()));
56 dtmfSender->suspendIfNeeded(); 56 dtmfSender->suspendIfNeeded();
57 return dtmfSender; 57 return dtmfSender;
58 } 58 }
59 59
60 RTCDTMFSender::RTCDTMFSender(ExecutionContext* context, MediaStreamTrack* track, PassOwnPtr<blink::WebRTCDTMFSenderHandler> handler) 60 RTCDTMFSender::RTCDTMFSender(ExecutionContext* context, MediaStreamTrack* track, PassOwnPtr<WebRTCDTMFSenderHandler> handler)
61 : ActiveDOMObject(context) 61 : ActiveDOMObject(context)
62 , m_track(track) 62 , m_track(track)
63 , m_duration(defaultToneDurationMs) 63 , m_duration(defaultToneDurationMs)
64 , m_interToneGap(defaultInterToneGapMs) 64 , m_interToneGap(defaultInterToneGapMs)
65 , m_handler(handler) 65 , m_handler(handler)
66 , m_stopped(false) 66 , m_stopped(false)
67 , m_scheduledEventTimer(this, &RTCDTMFSender::scheduledEventTimerFired) 67 , m_scheduledEventTimer(this, &RTCDTMFSender::scheduledEventTimerFired)
68 { 68 {
69 ScriptWrappable::init(this); 69 ScriptWrappable::init(this);
70 m_handler->setClient(this); 70 m_handler->setClient(this);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 return; 116 return;
117 } 117 }
118 118
119 m_duration = duration; 119 m_duration = duration;
120 m_interToneGap = interToneGap; 120 m_interToneGap = interToneGap;
121 121
122 if (!m_handler->insertDTMF(tones, m_duration, m_interToneGap)) 122 if (!m_handler->insertDTMF(tones, m_duration, m_interToneGap))
123 exceptionState.throwDOMException(SyntaxError, "Could not send provided t ones, '" + tones + "'."); 123 exceptionState.throwDOMException(SyntaxError, "Could not send provided t ones, '" + tones + "'.");
124 } 124 }
125 125
126 void RTCDTMFSender::didPlayTone(const blink::WebString& tone) 126 void RTCDTMFSender::didPlayTone(const WebString& tone)
127 { 127 {
128 scheduleDispatchEvent(RTCDTMFToneChangeEvent::create(tone)); 128 scheduleDispatchEvent(RTCDTMFToneChangeEvent::create(tone));
129 } 129 }
130 130
131 const AtomicString& RTCDTMFSender::interfaceName() const 131 const AtomicString& RTCDTMFSender::interfaceName() const
132 { 132 {
133 return EventTargetNames::RTCDTMFSender; 133 return EventTargetNames::RTCDTMFSender;
134 } 134 }
135 135
136 ExecutionContext* RTCDTMFSender::executionContext() const 136 ExecutionContext* RTCDTMFSender::executionContext() const
(...skipping 29 matching lines...) Expand all
166 } 166 }
167 167
168 void RTCDTMFSender::trace(Visitor* visitor) 168 void RTCDTMFSender::trace(Visitor* visitor)
169 { 169 {
170 visitor->trace(m_track); 170 visitor->trace(m_track);
171 visitor->trace(m_scheduledEvents); 171 visitor->trace(m_scheduledEvents);
172 EventTargetWithInlineData::trace(visitor); 172 EventTargetWithInlineData::trace(visitor);
173 } 173 }
174 174
175 } // namespace blink 175 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/mediastream/MediaStreamTrackSourcesRequestImpl.cpp ('k') | Source/modules/mediastream/RTCDataChannel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698