Skip to content

Commit 9d12dd0

Browse files
fippofippo
committed
Add adapter artifacts
1 parent 3798855 commit 9d12dd0

File tree

4 files changed

+108
-24
lines changed

4 files changed

+108
-24
lines changed

‎release/adapter.js

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2702,6 +2702,7 @@ module.exports = function(dependencies, opts) {
27022702
edgeShim.shimGetUserMedia(window);
27032703
edgeShim.shimPeerConnection(window);
27042704
edgeShim.shimReplaceTrack(window);
2705+
edgeShim.shimGetDisplayMedia(window);
27052706

27062707
// the edge shim implements the full RTCIceCandidate object.
27072708

@@ -3629,7 +3630,8 @@ module.exports = {
36293630
},
36303631

36313632
shimGetDisplayMedia: function(window, getSourceId) {
3632-
if ('getDisplayMedia' in window.navigator) {
3633+
if (!window.navigator || !window.navigator.mediaDevices ||
3634+
'getDisplayMedia' in window.navigator.mediaDevices) {
36333635
return;
36343636
}
36353637
// getSourceId is a function that returns a promise resolving with
@@ -3639,7 +3641,7 @@ module.exports = {
36393641
'a function');
36403642
return;
36413643
}
3642-
navigator.getDisplayMedia = function(constraints) {
3644+
window.navigator.mediaDevices.getDisplayMedia = function(constraints) {
36433645
return getSourceId(constraints)
36443646
.then(function(sourceId) {
36453647
var widthSpecified = constraints.video && constraints.video.width;
@@ -3659,9 +3661,14 @@ module.exports = {
36593661
if (heightSpecified) {
36603662
constraints.video.mandatory.maxHeight = heightSpecified;
36613663
}
3662-
return navigator.mediaDevices.getUserMedia(constraints);
3664+
return window.navigator.mediaDevices.getUserMedia(constraints);
36633665
});
36643666
};
3667+
window.navigator.getDisplayМedia = function(constraints) {
3668+
utils.deprecated('navigator.getDisplayMedia',
3669+
'navigator.mediaDevices.getDisplayMedia');
3670+
return window.navigator.mediaDevices.getDisplayMedia(constraints);
3671+
};
36653672
}
36663673
};
36673674

@@ -4293,6 +4300,22 @@ module.exports = {
42934300
window.RTCRtpSender.prototype.replaceTrack =
42944301
window.RTCRtpSender.prototype.setTrack;
42954302
}
4303+
},
4304+
shimGetDisplayMedia: function(window, preferredMediaSource) {
4305+
if (!('getDisplayMedia' in window.navigator) ||
4306+
!window.navigator.mediaDevices ||
4307+
'getDisplayMedia' in window.navigator.mediaDevices) {
4308+
return;
4309+
}
4310+
var origGetDisplayMedia = window.navigator.getDisplayMedia;
4311+
window.navigator.mediaDevices.getDisplayMedia = function(constraints) {
4312+
return origGetDisplayMedia(constraints);
4313+
};
4314+
window.navigator.getDisplayMedia = function(constraints) {
4315+
utils.deprecated('navigator.getDisplayMedia',
4316+
'navigator.mediaDevices.getDisplayMedia');
4317+
return origGetDisplayMedia(constraints);
4318+
};
42964319
}
42974320
};
42984321

@@ -4674,10 +4697,11 @@ module.exports = {
46744697
},
46754698

46764699
shimGetDisplayMedia: function(window, preferredMediaSource) {
4677-
if ('getDisplayMedia' in window.navigator) {
4700+
if (!window.navigator || !window.navigator.mediaDevices ||
4701+
'getDisplayMedia' in window.navigator.mediaDevices) {
46784702
return;
46794703
}
4680-
navigator.getDisplayMedia = function(constraints) {
4704+
window.navigator.mediaDevices.getDisplayMedia = function(constraints) {
46814705
if (!(constraints && constraints.video)) {
46824706
var err = new DOMException('getDisplayMedia without video ' +
46834707
'constraints is undefined');
@@ -4691,7 +4715,12 @@ module.exports = {
46914715
} else {
46924716
constraints.video.mediaSource = preferredMediaSource;
46934717
}
4694-
return navigator.mediaDevices.getUserMedia(constraints);
4718+
return window.navigator.mediaDevices.getUserMedia(constraints);
4719+
};
4720+
window.navigator.getDisplayМedia = function(constraints) {
4721+
utils.deprecated('navigator.getDisplayMedia',
4722+
'navigator.mediaDevices.getDisplayMedia');
4723+
return window.navigator.mediaDevices.getDisplayMedia(constraints);
46954724
};
46964725
}
46974726
};

‎release/adapter_no_edge.js

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,7 @@ module.exports = function(dependencies, opts) {
850850
edgeShim.shimGetUserMedia(window);
851851
edgeShim.shimPeerConnection(window);
852852
edgeShim.shimReplaceTrack(window);
853+
edgeShim.shimGetDisplayMedia(window);
853854

854855
// the edge shim implements the full RTCIceCandidate object.
855856

@@ -1777,7 +1778,8 @@ module.exports = {
17771778
},
17781779

17791780
shimGetDisplayMedia: function(window, getSourceId) {
1780-
if ('getDisplayMedia' in window.navigator) {
1781+
if (!window.navigator || !window.navigator.mediaDevices ||
1782+
'getDisplayMedia' in window.navigator.mediaDevices) {
17811783
return;
17821784
}
17831785
// getSourceId is a function that returns a promise resolving with
@@ -1787,7 +1789,7 @@ module.exports = {
17871789
'a function');
17881790
return;
17891791
}
1790-
navigator.getDisplayMedia = function(constraints) {
1792+
window.navigator.mediaDevices.getDisplayMedia = function(constraints) {
17911793
return getSourceId(constraints)
17921794
.then(function(sourceId) {
17931795
var widthSpecified = constraints.video && constraints.video.width;
@@ -1807,9 +1809,14 @@ module.exports = {
18071809
if (heightSpecified) {
18081810
constraints.video.mandatory.maxHeight = heightSpecified;
18091811
}
1810-
return navigator.mediaDevices.getUserMedia(constraints);
1812+
return window.navigator.mediaDevices.getUserMedia(constraints);
18111813
});
18121814
};
1815+
window.navigator.getDisplayМedia = function(constraints) {
1816+
utils.deprecated('navigator.getDisplayMedia',
1817+
'navigator.mediaDevices.getDisplayMedia');
1818+
return window.navigator.mediaDevices.getDisplayMedia(constraints);
1819+
};
18131820
}
18141821
};
18151822

@@ -2645,10 +2652,11 @@ module.exports = {
26452652
},
26462653

26472654
shimGetDisplayMedia: function(window, preferredMediaSource) {
2648-
if ('getDisplayMedia' in window.navigator) {
2655+
if (!window.navigator || !window.navigator.mediaDevices ||
2656+
'getDisplayMedia' in window.navigator.mediaDevices) {
26492657
return;
26502658
}
2651-
navigator.getDisplayMedia = function(constraints) {
2659+
window.navigator.mediaDevices.getDisplayMedia = function(constraints) {
26522660
if (!(constraints && constraints.video)) {
26532661
var err = new DOMException('getDisplayMedia without video ' +
26542662
'constraints is undefined');
@@ -2662,7 +2670,12 @@ module.exports = {
26622670
} else {
26632671
constraints.video.mediaSource = preferredMediaSource;
26642672
}
2665-
return navigator.mediaDevices.getUserMedia(constraints);
2673+
return window.navigator.mediaDevices.getUserMedia(constraints);
2674+
};
2675+
window.navigator.getDisplayМedia = function(constraints) {
2676+
utils.deprecated('navigator.getDisplayMedia',
2677+
'navigator.mediaDevices.getDisplayMedia');
2678+
return window.navigator.mediaDevices.getDisplayMedia(constraints);
26662679
};
26672680
}
26682681
};

‎release/adapter_no_edge_no_global.js

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,7 @@ module.exports = function(dependencies, opts) {
850850
edgeShim.shimGetUserMedia(window);
851851
edgeShim.shimPeerConnection(window);
852852
edgeShim.shimReplaceTrack(window);
853+
edgeShim.shimGetDisplayMedia(window);
853854

854855
// the edge shim implements the full RTCIceCandidate object.
855856

@@ -1777,7 +1778,8 @@ module.exports = {
17771778
},
17781779

17791780
shimGetDisplayMedia: function(window, getSourceId) {
1780-
if ('getDisplayMedia' in window.navigator) {
1781+
if (!window.navigator || !window.navigator.mediaDevices ||
1782+
'getDisplayMedia' in window.navigator.mediaDevices) {
17811783
return;
17821784
}
17831785
// getSourceId is a function that returns a promise resolving with
@@ -1787,7 +1789,7 @@ module.exports = {
17871789
'a function');
17881790
return;
17891791
}
1790-
navigator.getDisplayMedia = function(constraints) {
1792+
window.navigator.mediaDevices.getDisplayMedia = function(constraints) {
17911793
return getSourceId(constraints)
17921794
.then(function(sourceId) {
17931795
var widthSpecified = constraints.video && constraints.video.width;
@@ -1807,9 +1809,14 @@ module.exports = {
18071809
if (heightSpecified) {
18081810
constraints.video.mandatory.maxHeight = heightSpecified;
18091811
}
1810-
return navigator.mediaDevices.getUserMedia(constraints);
1812+
return window.navigator.mediaDevices.getUserMedia(constraints);
18111813
});
18121814
};
1815+
window.navigator.getDisplayМedia = function(constraints) {
1816+
utils.deprecated('navigator.getDisplayMedia',
1817+
'navigator.mediaDevices.getDisplayMedia');
1818+
return window.navigator.mediaDevices.getDisplayMedia(constraints);
1819+
};
18131820
}
18141821
};
18151822

@@ -2645,10 +2652,11 @@ module.exports = {
26452652
},
26462653

26472654
shimGetDisplayMedia: function(window, preferredMediaSource) {
2648-
if ('getDisplayMedia' in window.navigator) {
2655+
if (!window.navigator || !window.navigator.mediaDevices ||
2656+
'getDisplayMedia' in window.navigator.mediaDevices) {
26492657
return;
26502658
}
2651-
navigator.getDisplayMedia = function(constraints) {
2659+
window.navigator.mediaDevices.getDisplayMedia = function(constraints) {
26522660
if (!(constraints && constraints.video)) {
26532661
var err = new DOMException('getDisplayMedia without video ' +
26542662
'constraints is undefined');
@@ -2662,7 +2670,12 @@ module.exports = {
26622670
} else {
26632671
constraints.video.mediaSource = preferredMediaSource;
26642672
}
2665-
return navigator.mediaDevices.getUserMedia(constraints);
2673+
return window.navigator.mediaDevices.getUserMedia(constraints);
2674+
};
2675+
window.navigator.getDisplayМedia = function(constraints) {
2676+
utils.deprecated('navigator.getDisplayMedia',
2677+
'navigator.mediaDevices.getDisplayMedia');
2678+
return window.navigator.mediaDevices.getDisplayMedia(constraints);
26662679
};
26672680
}
26682681
};

‎release/adapter_no_global.js

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2702,6 +2702,7 @@ module.exports = function(dependencies, opts) {
27022702
edgeShim.shimGetUserMedia(window);
27032703
edgeShim.shimPeerConnection(window);
27042704
edgeShim.shimReplaceTrack(window);
2705+
edgeShim.shimGetDisplayMedia(window);
27052706

27062707
// the edge shim implements the full RTCIceCandidate object.
27072708

@@ -3629,7 +3630,8 @@ module.exports = {
36293630
},
36303631

36313632
shimGetDisplayMedia: function(window, getSourceId) {
3632-
if ('getDisplayMedia' in window.navigator) {
3633+
if (!window.navigator || !window.navigator.mediaDevices ||
3634+
'getDisplayMedia' in window.navigator.mediaDevices) {
36333635
return;
36343636
}
36353637
// getSourceId is a function that returns a promise resolving with
@@ -3639,7 +3641,7 @@ module.exports = {
36393641
'a function');
36403642
return;
36413643
}
3642-
navigator.getDisplayMedia = function(constraints) {
3644+
window.navigator.mediaDevices.getDisplayMedia = function(constraints) {
36433645
return getSourceId(constraints)
36443646
.then(function(sourceId) {
36453647
var widthSpecified = constraints.video && constraints.video.width;
@@ -3659,9 +3661,14 @@ module.exports = {
36593661
if (heightSpecified) {
36603662
constraints.video.mandatory.maxHeight = heightSpecified;
36613663
}
3662-
return navigator.mediaDevices.getUserMedia(constraints);
3664+
return window.navigator.mediaDevices.getUserMedia(constraints);
36633665
});
36643666
};
3667+
window.navigator.getDisplayМedia = function(constraints) {
3668+
utils.deprecated('navigator.getDisplayMedia',
3669+
'navigator.mediaDevices.getDisplayMedia');
3670+
return window.navigator.mediaDevices.getDisplayMedia(constraints);
3671+
};
36653672
}
36663673
};
36673674

@@ -4293,6 +4300,22 @@ module.exports = {
42934300
window.RTCRtpSender.prototype.replaceTrack =
42944301
window.RTCRtpSender.prototype.setTrack;
42954302
}
4303+
},
4304+
shimGetDisplayMedia: function(window, preferredMediaSource) {
4305+
if (!('getDisplayMedia' in window.navigator) ||
4306+
!window.navigator.mediaDevices ||
4307+
'getDisplayMedia' in window.navigator.mediaDevices) {
4308+
return;
4309+
}
4310+
var origGetDisplayMedia = window.navigator.getDisplayMedia;
4311+
window.navigator.mediaDevices.getDisplayMedia = function(constraints) {
4312+
return origGetDisplayMedia(constraints);
4313+
};
4314+
window.navigator.getDisplayMedia = function(constraints) {
4315+
utils.deprecated('navigator.getDisplayMedia',
4316+
'navigator.mediaDevices.getDisplayMedia');
4317+
return origGetDisplayMedia(constraints);
4318+
};
42964319
}
42974320
};
42984321

@@ -4674,10 +4697,11 @@ module.exports = {
46744697
},
46754698

46764699
shimGetDisplayMedia: function(window, preferredMediaSource) {
4677-
if ('getDisplayMedia' in window.navigator) {
4700+
if (!window.navigator || !window.navigator.mediaDevices ||
4701+
'getDisplayMedia' in window.navigator.mediaDevices) {
46784702
return;
46794703
}
4680-
navigator.getDisplayMedia = function(constraints) {
4704+
window.navigator.mediaDevices.getDisplayMedia = function(constraints) {
46814705
if (!(constraints && constraints.video)) {
46824706
var err = new DOMException('getDisplayMedia without video ' +
46834707
'constraints is undefined');
@@ -4691,7 +4715,12 @@ module.exports = {
46914715
} else {
46924716
constraints.video.mediaSource = preferredMediaSource;
46934717
}
4694-
return navigator.mediaDevices.getUserMedia(constraints);
4718+
return window.navigator.mediaDevices.getUserMedia(constraints);
4719+
};
4720+
window.navigator.getDisplayМedia = function(constraints) {
4721+
utils.deprecated('navigator.getDisplayMedia',
4722+
'navigator.mediaDevices.getDisplayMedia');
4723+
return window.navigator.mediaDevices.getDisplayMedia(constraints);
46954724
};
46964725
}
46974726
};

0 commit comments

Comments
 (0)