Commit 7377c09c authored by Harald Alvestrand's avatar Harald Alvestrand Committed by Commit Bot

Remove non-standard attributes from RTCDTMFSender

These attributes have been removed from the spec, or were never standard
in the first place, and have zero usage.

"Intent to remove" thread:
https://groups.google.com/a/chromium.org/forum/#!topic/Blink-dev/kGS73zpPT0I

Bug: 696669
Change-Id: Id999ab29c2a93fc7c36079196a8a924c01450066
Reviewed-on: https://chromium-review.googlesource.com/1110221
Commit-Queue: Harald Alvestrand <hta@chromium.org>
Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570004}
parent dc9251bd
...@@ -14,7 +14,6 @@ promise_test(async function() { ...@@ -14,7 +14,6 @@ promise_test(async function() {
let track = stream.getAudioTracks()[0]; let track = stream.getAudioTracks()[0];
let sender = pc1.addTrack(track); let sender = pc1.addTrack(track);
let dtmf = pc1.createDTMFSender(track); let dtmf = pc1.createDTMFSender(track);
assert_true(dtmf.track == track);
assert_false(dtmf.canInsertDTMF); assert_false(dtmf.canInsertDTMF);
let pc2 = new RTCPeerConnection(); let pc2 = new RTCPeerConnection();
exchangeIceCandidates(pc1, pc2); exchangeIceCandidates(pc1, pc2);
...@@ -45,20 +44,6 @@ promise_test(async function() { ...@@ -45,20 +44,6 @@ promise_test(async function() {
assert_true(dtmf.canInsertDTMF); assert_true(dtmf.canInsertDTMF);
}, 'DTMF sender for an audio track can be created.'); }, 'DTMF sender for an audio track can be created.');
// This test documents an expected side effect.
// Since createDTMFSender should be deprecated, it's not worth
// fixing.
promise_test(async function() {
let pc1 = new RTCPeerConnection();
let streams = await createStreams({audio:true, video:false}, 1);
let stream = streams[0];
let track = stream.getAudioTracks()[0];
let sender = pc1.addTrack(track);
assert_equals(sender.dtmf.track, null);
let dtmf = pc1.createDTMFSender(track);
assert_equals(sender.dtmf.track, track);
}, 'createDTMFSender adds track to dtmf attribute.');
/** /**
* Helper functions. * Helper functions.
*/ */
......
...@@ -5358,11 +5358,8 @@ interface RTCCertificate ...@@ -5358,11 +5358,8 @@ interface RTCCertificate
interface RTCDTMFSender : EventTarget interface RTCDTMFSender : EventTarget
attribute @@toStringTag attribute @@toStringTag
getter canInsertDTMF getter canInsertDTMF
getter duration
getter interToneGap
getter ontonechange getter ontonechange
getter toneBuffer getter toneBuffer
getter track
method constructor method constructor
method insertDTMF method insertDTMF
setter ontonechange setter ontonechange
......
...@@ -57,9 +57,6 @@ RTCDTMFSender* RTCDTMFSender::Create( ...@@ -57,9 +57,6 @@ RTCDTMFSender* RTCDTMFSender::Create(
RTCDTMFSender::RTCDTMFSender(ExecutionContext* context, RTCDTMFSender::RTCDTMFSender(ExecutionContext* context,
std::unique_ptr<WebRTCDTMFSenderHandler> handler) std::unique_ptr<WebRTCDTMFSenderHandler> handler)
: ContextLifecycleObserver(context), : ContextLifecycleObserver(context),
track_(nullptr),
duration_(kDefaultToneDurationMs),
inter_tone_gap_(kDefaultInterToneGapMs),
handler_(std::move(handler)), handler_(std::move(handler)),
stopped_(false), stopped_(false),
scheduled_event_timer_(context->GetTaskRunner(TaskType::kNetworking), scheduled_event_timer_(context->GetTaskRunner(TaskType::kNetworking),
...@@ -81,14 +78,6 @@ bool RTCDTMFSender::canInsertDTMF() const { ...@@ -81,14 +78,6 @@ bool RTCDTMFSender::canInsertDTMF() const {
return handler_->CanInsertDTMF(); return handler_->CanInsertDTMF();
} }
MediaStreamTrack* RTCDTMFSender::track() const {
return track_.Get();
}
void RTCDTMFSender::SetTrack(MediaStreamTrack* track) {
track_ = track;
}
String RTCDTMFSender::toneBuffer() const { String RTCDTMFSender::toneBuffer() const {
return handler_->CurrentToneBuffer(); return handler_->CurrentToneBuffer();
} }
...@@ -133,10 +122,8 @@ void RTCDTMFSender::insertDTMF(const String& tones, ...@@ -133,10 +122,8 @@ void RTCDTMFSender::insertDTMF(const String& tones,
inter_tone_gap = std::max(inter_tone_gap, kMinInterToneGapMs); inter_tone_gap = std::max(inter_tone_gap, kMinInterToneGapMs);
inter_tone_gap = std::min(inter_tone_gap, kMaxInterToneGapMs); inter_tone_gap = std::min(inter_tone_gap, kMaxInterToneGapMs);
duration_ = duration;
inter_tone_gap_ = inter_tone_gap;
// Spec: a-d should be represented in the tone buffer as A-D // Spec: a-d should be represented in the tone buffer as A-D
if (!handler_->InsertDTMF(tones.UpperASCII(), duration_, inter_tone_gap_)) { if (!handler_->InsertDTMF(tones.UpperASCII(), duration, inter_tone_gap)) {
exception_state.ThrowDOMException( exception_state.ThrowDOMException(
DOMExceptionCode::kSyntaxError, DOMExceptionCode::kSyntaxError,
"Could not send provided tones, '" + tones + "'."); "Could not send provided tones, '" + tones + "'.");
...@@ -181,7 +168,6 @@ void RTCDTMFSender::ScheduledEventTimerFired(TimerBase*) { ...@@ -181,7 +168,6 @@ void RTCDTMFSender::ScheduledEventTimerFired(TimerBase*) {
} }
void RTCDTMFSender::Trace(blink::Visitor* visitor) { void RTCDTMFSender::Trace(blink::Visitor* visitor) {
visitor->Trace(track_);
visitor->Trace(scheduled_events_); visitor->Trace(scheduled_events_);
EventTargetWithInlineData::Trace(visitor); EventTargetWithInlineData::Trace(visitor);
ContextLifecycleObserver::Trace(visitor); ContextLifecycleObserver::Trace(visitor);
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
namespace blink { namespace blink {
class ExceptionState; class ExceptionState;
class MediaStreamTrack;
class WebRTCDTMFSenderHandler; class WebRTCDTMFSenderHandler;
class RTCDTMFSender final : public EventTargetWithInlineData, class RTCDTMFSender final : public EventTargetWithInlineData,
...@@ -51,11 +50,7 @@ class RTCDTMFSender final : public EventTargetWithInlineData, ...@@ -51,11 +50,7 @@ class RTCDTMFSender final : public EventTargetWithInlineData,
~RTCDTMFSender() override; ~RTCDTMFSender() override;
bool canInsertDTMF() const; bool canInsertDTMF() const;
MediaStreamTrack* track() const;
void SetTrack(MediaStreamTrack*);
String toneBuffer() const; String toneBuffer() const;
int duration() const { return duration_; }
int interToneGap() const { return inter_tone_gap_; }
void insertDTMF(const String& tones, ExceptionState&); void insertDTMF(const String& tones, ExceptionState&);
void insertDTMF(const String& tones, int duration, ExceptionState&); void insertDTMF(const String& tones, int duration, ExceptionState&);
...@@ -86,10 +81,6 @@ class RTCDTMFSender final : public EventTargetWithInlineData, ...@@ -86,10 +81,6 @@ class RTCDTMFSender final : public EventTargetWithInlineData,
// WebRTCDTMFSenderHandlerClient // WebRTCDTMFSenderHandlerClient
void DidPlayTone(const WebString&) override; void DidPlayTone(const WebString&) override;
Member<MediaStreamTrack> track_;
int duration_;
int inter_tone_gap_;
std::unique_ptr<WebRTCDTMFSenderHandler> handler_; std::unique_ptr<WebRTCDTMFSenderHandler> handler_;
bool stopped_; bool stopped_;
......
...@@ -23,14 +23,11 @@ ...@@ -23,14 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
interface RTCDTMFSender : EventTarget { // http://w3c.github.io/webrtc-pc/#rtcdtmfsender
readonly attribute boolean canInsertDTMF;
[Measure] readonly attribute MediaStreamTrack track;
readonly attribute DOMString toneBuffer;
[Measure] readonly attribute long duration;
[Measure] readonly attribute long interToneGap;
interface RTCDTMFSender : EventTarget {
[RaisesException] void insertDTMF(DOMString tones, optional long duration, optional long interToneGap); [RaisesException] void insertDTMF(DOMString tones, optional long duration, optional long interToneGap);
attribute EventHandler ontonechange; attribute EventHandler ontonechange;
readonly attribute boolean canInsertDTMF;
readonly attribute DOMString toneBuffer;
}; };
...@@ -1632,7 +1632,6 @@ RTCDTMFSender* RTCPeerConnection::createDTMFSender( ...@@ -1632,7 +1632,6 @@ RTCDTMFSender* RTCPeerConnection::createDTMFSender(
"Unable to create DTMF sender for track"); "Unable to create DTMF sender for track");
return nullptr; return nullptr;
} }
dtmf_sender->SetTrack(track);
return dtmf_sender; return dtmf_sender;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment