Merge m-c to autoland, a=merge

iaxat · Jul 11, 2016 · 319e5bf · 319e5bf
2 parents 75ff249 + 95d2d34
commit 319e5bf
Show file tree

Hide file tree

Showing 127 changed files with 3,714 additions and 5,538 deletions.
diff --git a/b2g/components/moz.build b/b2g/components/moz.build
@@ -29,7 +29,7 @@ EXTRA_COMPONENTS += [
     'WebappsUpdateTimer.js',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+if CONFIG['OS_TARGET'] != 'Android':
     EXTRA_COMPONENTS += [
       'CommandLine.js',
       'OopCommandLine.js',

diff --git a/browser/config/mozconfigs/linux64/nightly-asan b/browser/config/mozconfigs/linux64/nightly-asan
@@ -18,7 +18,4 @@ export MOZ_PACKAGE_JSSHELL=1
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan
 
-#upload symbols
-MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
-
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/extensions/loop/chrome/content/panels/js/roomViews.js b/browser/extensions/loop/chrome/content/panels/js/roomViews.js
@@ -342,7 +342,7 @@ loop.roomViews = function (mozL10n) {
                 localPosterUrl: this.props.localPosterUrl, 
                 localSrcMediaElement: this.state.localSrcMediaElement, 
                 localVideoMuted: this.state.videoMuted, 
-                matchMedia: this.state.matchMedia || window.matchMedia.bind(window), 
+                matchMedia: this.state.matchMedia || window.matchMedia, 
                 remotePosterUrl: this.props.remotePosterUrl, 
                 remoteSrcMediaElement: this.state.remoteSrcMediaElement, 
                 renderRemoteVideo: this.shouldRenderRemoteVideo(), 

diff --git a/browser/extensions/loop/chrome/content/shared/js/otSdkDriver.js b/browser/extensions/loop/chrome/content/shared/js/otSdkDriver.js
@@ -315,6 +315,8 @@ loop.OTSdkDriver = function () {
       delete this._mockPublisherEl;
       delete this._publisherChannel;
       delete this._subscriberChannel;
+      delete this._screenSubscriber;
+      delete this._subscriber;
       this.connections = {};}, 
 
 
@@ -494,7 +496,8 @@ loop.OTSdkDriver = function () {
         case "Publisher.streamDestroyed":
           this._metrics.sendStreams--;
           break;
-        case "Session.streamCreated":
+        case "Session.av.streamCreated":
+        case "Session.screen.streamCreated":
           this._metrics.recvStreams++;
           break;
         case "Session.streamDestroyed":
@@ -548,7 +551,7 @@ loop.OTSdkDriver = function () {
 
       // There's no audio for screen shares so we don't need to worry about mute.
       this._mockScreenShareEl = document.createElement("div");
-      this.session.subscribe(stream, this._mockScreenShareEl, 
+      this._screenSubscriber = this.session.subscribe(stream, this._mockScreenShareEl, 
       this._getCopyPublisherConfig, 
       this._onScreenShareSubscribeCompleted.bind(this));}, 
 
@@ -560,8 +563,6 @@ loop.OTSdkDriver = function () {
      * https://tokbox.com/opentok/libraries/client/js/reference/StreamEvent.html
      */
     _onRemoteStreamCreated: function _onRemoteStreamCreated(event) {
-      this._notifyMetricsEvent("Session.streamCreated");
-
       if (event.stream[STREAM_PROPERTIES.HAS_VIDEO]) {
         this.dispatcher.dispatch(new sharedActions.VideoDimensionsChanged({ 
           isLocal: false, 
@@ -571,6 +572,7 @@ loop.OTSdkDriver = function () {
 
 
       if (event.stream.videoType === "screen") {
+        this._notifyMetricsEvent("Session.screen.streamCreated");
         this._handleRemoteScreenShareCreated(event.stream);
         return;}
 
@@ -586,7 +588,9 @@ loop.OTSdkDriver = function () {
       // the UI (bug 1171896).
       this._mockSubscribeEl = document.createElement("div");
 
-      this.subscriber = this.session.subscribe(event.stream, 
+      this._notifyMetricsEvent("Session.av.streamCreated");
+
+      this._subscriber = this.session.subscribe(event.stream, 
       this._mockSubscribeEl, this._getCopyPublisherConfig, 
       this._onSubscribeCompleted.bind(this));}, 
 
@@ -868,6 +872,7 @@ loop.OTSdkDriver = function () {
 
         delete this._subscriberChannel;
         delete this._mockSubscribeEl;
+        delete this._subscriber;
         return;}
 
 
@@ -876,7 +881,8 @@ loop.OTSdkDriver = function () {
       this.dispatcher.dispatch(new sharedActions.ReceivingScreenShare({ 
         receiving: false }));
 
-      delete this._mockScreenShareEl;}, 
+      delete this._mockScreenShareEl;
+      delete this._screenSubscriber;}, 
 
 
     /**
@@ -977,7 +983,9 @@ loop.OTSdkDriver = function () {
      */
     _onOTException: function _onOTException(event) {
       var baseException = "sdk.exception.";
-      if (event.target && event.target === this.screenshare) {
+      if (event.target && 
+      event.target === this.screenshare || 
+      event.target === this._screenSubscriber) {
         baseException += "screen.";}
 
 
@@ -987,7 +995,7 @@ loop.OTSdkDriver = function () {
           this.dispatcher.dispatch(new sharedActions.ConnectionFailure({ 
             reason: FAILURE_DETAILS.ICE_FAILED }));
 
-          this._notifyMetricsEvent(baseException + event.code);
+          this._notifyMetricsEvent(baseException + event.code + "." + event.message);
           break;
         case OT.ExceptionCodes.TERMS_OF_SERVICE_FAILURE:
           this.dispatcher.dispatch(new sharedActions.ConnectionFailure({ 
@@ -1005,7 +1013,7 @@ loop.OTSdkDriver = function () {
 
           break;
         default:
-          this._notifyMetricsEvent(baseException + event.code);
+          this._notifyMetricsEvent(baseException + event.code + "." + event.message);
           break;}},