aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2020-03-06 00:06:15 -0500
committerJosh Matthews <josh@joshmatthews.net>2020-03-06 00:06:15 -0500
commita29f4a9afee9c67c45aaf0011ce2c5eb7007ed35 (patch)
treedbc871edee1d4586e2fcb113c103b9657b5fbed6 /components/script/dom
parentea8aed1ba927012d992a3d3c9880858e0282f5f9 (diff)
downloadservo-a29f4a9afee9c67c45aaf0011ce2c5eb7007ed35.tar.gz
servo-a29f4a9afee9c67c45aaf0011ce2c5eb7007ed35.zip
Revert "Auto merge of #25898 - jdm:rustup, r=asajeffrey"
This reverts commit ea8aed1ba927012d992a3d3c9880858e0282f5f9, reversing changes made to 3749eb53971b688b855d6b1850f41b4c346cd2da.
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/baseaudiocontext.rs2
-rw-r--r--components/script/dom/broadcastchannel.rs4
-rw-r--r--components/script/dom/messageport.rs2
-rw-r--r--components/script/dom/rtcpeerconnection.rs16
-rw-r--r--components/script/dom/xrsession.rs18
5 files changed, 21 insertions, 21 deletions
diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs
index 14c6bc94e1c..c84d62f6dc3 100644
--- a/components/script/dom/baseaudiocontext.rs
+++ b/components/script/dom/baseaudiocontext.rs
@@ -331,7 +331,7 @@ impl BaseAudioContextMethods for BaseAudioContext {
self.listener.or_init(|| AudioListener::new(&window, self))
}
- // https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-onstatechange
+ /// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-onstatechange
event_handler!(statechange, GetOnstatechange, SetOnstatechange);
/// https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-createoscillator
diff --git a/components/script/dom/broadcastchannel.rs b/components/script/dom/broadcastchannel.rs
index f7d75d8c101..4a1e35d2ad8 100644
--- a/components/script/dom/broadcastchannel.rs
+++ b/components/script/dom/broadcastchannel.rs
@@ -98,9 +98,9 @@ impl BroadcastChannelMethods for BroadcastChannel {
self.closed.set(true);
}
- // <https://html.spec.whatwg.org/multipage/#handler-broadcastchannel-onmessageerror>
+ /// <https://html.spec.whatwg.org/multipage/#handler-broadcastchannel-onmessageerror>
event_handler!(messageerror, GetOnmessageerror, SetOnmessageerror);
- // <https://html.spec.whatwg.org/multipage/#handler-broadcastchannel-onmessage>
+ /// <https://html.spec.whatwg.org/multipage/#handler-broadcastchannel-onmessage>
event_handler!(message, GetOnmessage, SetOnmessage);
}
diff --git a/components/script/dom/messageport.rs b/components/script/dom/messageport.rs
index ee2f54323a6..9cbf7152f01 100644
--- a/components/script/dom/messageport.rs
+++ b/components/script/dom/messageport.rs
@@ -338,6 +338,6 @@ impl MessagePortMethods for MessagePort {
self.global().start_message_port(self.message_port_id());
}
- // <https://html.spec.whatwg.org/multipage/#handler-messageport-onmessageerror>
+ /// <https://html.spec.whatwg.org/multipage/#handler-messageport-onmessageerror>
event_handler!(messageerror, GetOnmessageerror, SetOnmessageerror);
}
diff --git a/components/script/dom/rtcpeerconnection.rs b/components/script/dom/rtcpeerconnection.rs
index e6b45d93676..ae246cae5b4 100644
--- a/components/script/dom/rtcpeerconnection.rs
+++ b/components/script/dom/rtcpeerconnection.rs
@@ -55,8 +55,8 @@ pub struct RTCPeerConnection {
#[ignore_malloc_size_of = "defined in servo-media"]
controller: DomRefCell<Option<WebRtcController>>,
closed: Cell<bool>,
- // Helps track state changes between the time createOffer/createAnswer
- // is called and resolved
+ /// Helps track state changes between the time createOffer/createAnswer
+ /// is called and resolved
offer_answer_generation: Cell<u32>,
#[ignore_malloc_size_of = "promises are hard"]
offer_promises: DomRefCell<Vec<Rc<Promise>>>,
@@ -419,34 +419,34 @@ impl RTCPeerConnection {
}
impl RTCPeerConnectionMethods for RTCPeerConnection {
- // https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-icecandidate
+ /// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-icecandidate
event_handler!(icecandidate, GetOnicecandidate, SetOnicecandidate);
- // https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-ontrack
+ /// https://www.w3.org/TR/webrtc/#dom-rtcpeerconnection-ontrack
event_handler!(track, GetOntrack, SetOntrack);
- // https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-iceconnectionstatechange
+ /// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-iceconnectionstatechange
event_handler!(
iceconnectionstatechange,
GetOniceconnectionstatechange,
SetOniceconnectionstatechange
);
- // https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-icegatheringstatechange
+ /// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-icegatheringstatechange
event_handler!(
icegatheringstatechange,
GetOnicegatheringstatechange,
SetOnicegatheringstatechange
);
- // https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-onnegotiationneeded
+ /// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-onnegotiationneeded
event_handler!(
negotiationneeded,
GetOnnegotiationneeded,
SetOnnegotiationneeded
);
- // https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-signalingstatechange
+ /// https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnection-signalingstatechange
event_handler!(
signalingstatechange,
GetOnsignalingstatechange,
diff --git a/components/script/dom/xrsession.rs b/components/script/dom/xrsession.rs
index 58ac64a1bd7..ec51c910a17 100644
--- a/components/script/dom/xrsession.rs
+++ b/components/script/dom/xrsession.rs
@@ -465,35 +465,35 @@ impl XRSession {
}
impl XRSessionMethods for XRSession {
- // https://immersive-web.github.io/webxr/#eventdef-xrsession-end
+ /// https://immersive-web.github.io/webxr/#eventdef-xrsession-end
event_handler!(end, GetOnend, SetOnend);
- // https://immersive-web.github.io/webxr/#eventdef-xrsession-select
+ /// https://immersive-web.github.io/webxr/#eventdef-xrsession-select
event_handler!(select, GetOnselect, SetOnselect);
- // https://immersive-web.github.io/webxr/#eventdef-xrsession-selectstart
+ /// https://immersive-web.github.io/webxr/#eventdef-xrsession-selectstart
event_handler!(selectstart, GetOnselectstart, SetOnselectstart);
- // https://immersive-web.github.io/webxr/#eventdef-xrsession-selectend
+ /// https://immersive-web.github.io/webxr/#eventdef-xrsession-selectend
event_handler!(selectend, GetOnselectend, SetOnselectend);
- // https://immersive-web.github.io/webxr/#eventdef-xrsession-squeeze
+ /// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeeze
event_handler!(squeeze, GetOnsqueeze, SetOnsqueeze);
- // https://immersive-web.github.io/webxr/#eventdef-xrsession-squeezestart
+ /// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeezestart
event_handler!(squeezestart, GetOnsqueezestart, SetOnsqueezestart);
- // https://immersive-web.github.io/webxr/#eventdef-xrsession-squeezeend
+ /// https://immersive-web.github.io/webxr/#eventdef-xrsession-squeezeend
event_handler!(squeezeend, GetOnsqueezeend, SetOnsqueezeend);
- // https://immersive-web.github.io/webxr/#eventdef-xrsession-visibilitychange
+ /// https://immersive-web.github.io/webxr/#eventdef-xrsession-visibilitychange
event_handler!(
visibilitychange,
GetOnvisibilitychange,
SetOnvisibilitychange
);
- // https://immersive-web.github.io/webxr/#eventdef-xrsession-inputsourceschange
+ /// https://immersive-web.github.io/webxr/#eventdef-xrsession-inputsourceschange
event_handler!(
inputsourceschange,
GetOninputsourceschange,