Bug 1074202 - The WebRTC urlbar sharing indicator gets confused if 2 iframes on the same page are using different devices, r=felipe.
authorFlorian Quèze <florian@queze.net>
Wed, 01 Oct 2014 12:39:48 +0200
changeset 208166 6fa1218092a210b3ed51c1e43a5c33741d1ab067
parent 208165 3cc898b3ef5d0faa76ac5092b0d7a9997f9db100
child 208167 7ee1bf648e8cd1ead74c2d0dc3aac1363534ccd7
push id27579
push userkwierso@gmail.com
push dateWed, 01 Oct 2014 23:02:13 +0000
treeherderautoland@f771fd927304 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe
bugs1074202
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1074202 - The WebRTC urlbar sharing indicator gets confused if 2 iframes on the same page are using different devices, r=felipe.
browser/modules/ContentWebRTC.jsm
--- a/browser/modules/ContentWebRTC.jsm
+++ b/browser/modules/ContentWebRTC.jsm
@@ -154,17 +154,17 @@ function updateIndicators() {
   let state = {
     showGlobalIndicator: count > 0,
     showCameraIndicator: false,
     showMicrophoneIndicator: false,
     showScreenSharingIndicator: ""
   };
 
   for (let i = 0; i < count; ++i) {
-    let contentWindow = contentWindowSupportsArray.GetElementAt(i);
+    let contentWindow = contentWindowSupportsArray.GetElementAt(i).top;
     let camera = {}, microphone = {}, screen = {}, window = {}, app = {};
     MediaManagerService.mediaCaptureWindowState(contentWindow, camera,
                                                 microphone, screen, window, app);
     let tabState = {camera: camera.value, microphone: microphone.value};
     if (camera.value)
       state.showCameraIndicator = true;
     if (microphone.value)
       state.showMicrophoneIndicator = true;