Merge fx-team to m-c. a=merge

browser/devtools/framework/toolbox.js

@@ -411,15 +411,13 @@ Toolbox.prototype = {
 
       // Lazily connect to the profiler here and don't wait for it to complete,
       // used to intercept console.profile calls before the performance tools are open.
-      let profilerReady = this.initPerformance();
+      let performanceFrontConnection = this.initPerformance();
 
-      // However, while testing, we must wait for the performance connection to
-      // finish, as most tests shut down without waiting for a toolbox
-      // destruction event, resulting in the shared profiler connection being
-      // opened and closed outside of the test that originally opened the
-      // toolbox.
+      // If in testing environment, wait for performance connection to finish,
+      // so we don't have to explicitly wait for this in tests; ideally, all tests
+      // will handle this on their own, but each have their own tear down function.
       if (DevToolsUtils.testing) {
-        yield profilerReady;
+        yield performanceFrontConnection;
       }
 
       this.emit("ready");
@@ -1986,17 +1984,21 @@ Toolbox.prototype = {
       return;
     }
 
-    if (this.performance) {
-      yield this.performance.open();
-      return this.performance;
+    if (this._performanceFrontConnection) {
+      return this._performanceFrontConnection.promise;
     }
 
-    this._performance = getPerformanceFront(this.target);
+    this._performanceFrontConnection = promise.defer();
+
+    this._performance = getPerformanceFront(this._target);
+
     yield this.performance.open();
+
     // Emit an event when connected, but don't wait on startup for this.
     this.emit("profiler-connected");
 
-    return this.performance;
+    this._performanceFrontConnection.resolve(this.performance);
+    return this._performanceFrontConnection.promise;
   }),
 
   /**
@@ -2008,6 +2010,11 @@ Toolbox.prototype = {
     if (!this.performance) {
       return;
     }
+    // If still connecting to performance actor, allow the
+    // actor to resolve its connection before attempting to destroy.
+    if (this._performanceFrontConnection) {
+      yield this._performanceFrontConnection.promise;
+    }
     yield this.performance.destroy();
     this._performance = null;
   }),

browser/devtools/performance/test/head.js

@@ -222,6 +222,10 @@ function initPerformance(aUrl, tool="performance", targetOps={}) {
     merge(target, targetOps);
 
     let toolbox = yield gDevTools.showToolbox(target, tool);
+
+    // Wait for the performance tool to be spun up
+    yield toolbox.initPerformance();
+
     let panel = toolbox.getCurrentPanel();
     return { target, panel, toolbox };
   });

browser/modules/ContentWebRTC.jsm

@@ -26,6 +26,17 @@ this.ContentWebRTC = {
     Services.obs.addObserver(handlePCRequest, "PeerConnection:request", false);
     Services.obs.addObserver(updateIndicators, "recording-device-events", false);
     Services.obs.addObserver(removeBrowserSpecificIndicator, "recording-window-ended", false);
+
+    if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT)
+      Services.obs.addObserver(processShutdown, "content-child-shutdown", false);
+  },
+
+  uninit: function() {
+    Services.obs.removeObserver(handleRequest, "getUserMedia:request");
+    Services.obs.removeObserver(updateIndicators, "recording-device-events");
+    Services.obs.removeObserver(removeBrowserSpecificIndicator, "recording-window-ended");
+    Services.obs.removeObserver(processShutdown, "content-child-shutdown");
+    this._initialized = false;
   },
 
   // Called only for 'unload' to remove pending gUM prompts in reloaded frames.
@@ -316,3 +327,7 @@ function getMessageManagerForWindow(aContentWindow) {
     return null;
   }
 }
+
+function processShutdown() {
+  ContentWebRTC.uninit();
+}

browser/modules/webrtcUI.jsm

@@ -26,6 +26,7 @@ this.webrtcUI = {
                  .getService(Ci.nsIMessageBroadcaster);
     ppmm.addMessageListener("webrtc:UpdatingIndicators", this);
     ppmm.addMessageListener("webrtc:UpdateGlobalIndicators", this);
+    ppmm.addMessageListener("child-process-shutdown", this);
 
     let mm = Cc["@mozilla.org/globalmessagemanager;1"]
                .getService(Ci.nsIMessageListenerManager);
@@ -53,10 +54,47 @@ this.webrtcUI = {
     mm.removeMessageListener("webrtc:UpdateBrowserIndicators", this);
   },
 
-  showGlobalIndicator: false,
-  showCameraIndicator: false,
-  showMicrophoneIndicator: false,
-  showScreenSharingIndicator: "", // either "Application", "Screen", "Window" or "Browser"
+  processIndicators: new Map(),
+
+  get showGlobalIndicator() {
+    for (let [, indicators] of this.processIndicators) {
+      if (indicators.showGlobalIndicator)
+        return true;
+    }
+    return false;
+  },
+
+  get showCameraIndicator() {
+    for (let [, indicators] of this.processIndicators) {
+      if (indicators.showCameraIndicator)
+        return true;
+    }
+    return false;
+  },
+
+  get showMicrophoneIndicator() {
+    for (let [, indicators] of this.processIndicators) {
+      if (indicators.showMicrophoneIndicator)
+        return true;
+    }
+    return false;
+  },
+
+  get showScreenSharingIndicator() {
+    let list = [""];
+    for (let [, indicators] of this.processIndicators) {
+      if (indicators.showScreenSharingIndicator)
+        list.push(indicators.showScreenSharingIndicator);
+    }
+
+    let precedence =
+      ["Screen", "Window", "Application", "Browser", ""];
+
+    list.sort((a, b) => { return precedence.indexOf(a) -
+                                 precedence.indexOf(b); });
+
+    return list[0];
+  },
 
   _streams: [],
   // The boolean parameters indicate which streams should be included in the result.
@@ -179,12 +217,16 @@ this.webrtcUI = {
         webrtcUI._streams = [];
         break;
       case "webrtc:UpdateGlobalIndicators":
-        updateIndicators(aMessage.data)
+        updateIndicators(aMessage.data, aMessage.target);
         break;
       case "webrtc:UpdateBrowserIndicators":
         webrtcUI._streams.push({browser: aMessage.target, state: aMessage.data});
         updateBrowserSpecificIndicator(aMessage.target, aMessage.data);
         break;
+      case "child-process-shutdown":
+        webrtcUI.processIndicators.delete(aMessage.target);
+        updateIndicators(null, null);
+        break;
     }
   }
 };
@@ -741,11 +783,22 @@ function maybeAddMenuIndicator(window) {
 
 var gIndicatorWindow = null;
 
-function updateIndicators(data) {
-  webrtcUI.showGlobalIndicator = data.showGlobalIndicator;
-  webrtcUI.showCameraIndicator = data.showCameraIndicator;
-  webrtcUI.showMicrophoneIndicator = data.showMicrophoneIndicator;
-  webrtcUI.showScreenSharingIndicator = data.showScreenSharingIndicator;
+function updateIndicators(data, target) {
+  if (data) {
+    // the global indicators specific to this process
+    let indicators;
+    if (webrtcUI.processIndicators.has(target)) {
+      indicators = webrtcUI.processIndicators.get(target);
+    } else {
+      indicators = {};
+      webrtcUI.processIndicators.set(target, indicators);
+    }
+
+    indicators.showGlobalIndicator = data.showGlobalIndicator;
+    indicators.showCameraIndicator = data.showCameraIndicator;
+    indicators.showMicrophoneIndicator = data.showMicrophoneIndicator;
+    indicators.showScreenSharingIndicator = data.showScreenSharingIndicator;
+  }
 
   let browserWindowEnum = Services.wm.getEnumerator("navigator:browser");
   while (browserWindowEnum.hasMoreElements()) {

build/mobile/robocop/Makefile.in

@@ -11,8 +11,6 @@ ANDROID_EXTRA_JARS += \
   $(srcdir)/robotium-solo-4.3.1.jar \
   $(NULL)
 
-ANDROID_ASSETS_DIR := $(TESTPATH)/assets
-
 _JAVA_HARNESS := \
   Actions.java \
   Assert.java \

build/mobile/robocop/moz.build

@@ -7,6 +7,9 @@
 DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
 
 base = '/mobile/android/tests/browser/robocop/'
+
+ANDROID_ASSETS_DIRS += [base + 'assets']
+
 TEST_HARNESS_FILES.testing.mochitest += [
     base + 'robocop.ini',
     base + 'robocop_autophone.ini',

config/makefiles/java-build.mk

@@ -16,9 +16,9 @@ endif #} JAVAFILES
 
 
 ifdef ANDROID_APK_NAME #{
-android_res_dirs := $(addprefix $(srcdir)/,$(or $(ANDROID_RES_DIRS),res))
+android_res_dirs := $(or $(ANDROID_RES_DIRS),$(srcdir)/res)
 _ANDROID_RES_FLAG := $(addprefix -S ,$(android_res_dirs))
-_ANDROID_ASSETS_FLAG := $(addprefix -A ,$(ANDROID_ASSETS_DIR))
+_ANDROID_ASSETS_FLAG := $(if $(ANDROID_ASSETS_DIRS),$(addprefix -A ,$(ANDROID_ASSETS_DIRS)))
 android_manifest := $(or $(ANDROID_MANIFEST_FILE),AndroidManifest.xml)
 
 GENERATED_DIRS += classes
@@ -45,7 +45,7 @@ $(ANDROID_APK_NAME).ap_: .aapt.deps ;
 # resource files one subdirectory below the parent resource directory.
 android_res_files := $(wildcard $(addsuffix /*,$(wildcard $(addsuffix /*,$(android_res_dirs)))))
 
-.aapt.deps: $(android_manifest) $(android_res_files) $(wildcard $(ANDROID_ASSETS_DIR))
+.aapt.deps: $(android_manifest) $(android_res_files) $(wildcard $(ANDROID_ASSETS_DIRS))
 	@$(TOUCH) $@
 	$(AAPT) package -f -M $< -I $(ANDROID_SDK)/android.jar $(_ANDROID_RES_FLAG) $(_ANDROID_ASSETS_FLAG) \
 		-J ${@D} \

mobile/android/app/assets/example_asset.txt

@@ -0,0 +1 @@
+This is an example asset.

mobile/android/base/Makefile.in

@@ -420,6 +420,7 @@ $(1): $$(call mkdir_deps,$(filter-out ./,$(dir $(3) $(4) $(5)))) $(2)
 		$(if $(MOZ_ANDROID_MAX_SDK_VERSION),--max-res-version $(MOZ_ANDROID_MAX_SDK_VERSION),) \
 		--auto-add-overlay \
 		$$(addprefix -S ,$$(ANDROID_RES_DIRS)) \
+		$$(addprefix -A ,$$(ANDROID_ASSETS_DIRS)) \
 		$(if $(extra_res_dirs),$$(addprefix -S ,$$(extra_res_dirs)),) \
 		$(if $(extra_packages),--extra-packages $$(extra_packages),) \
 		--custom-package org.mozilla.gecko \

mobile/android/base/moz.build

@@ -579,7 +579,7 @@ gbjar.extra_jars += [
 ]
 if CONFIG['MOZ_CRASHREPORTER']:
     gbjar.sources += [ 'CrashReporter.java' ]
-    ANDROID_RES_DIRS += [ SRCDIR + '/crashreporter/res' ]
+    ANDROID_RES_DIRS += [ 'crashreporter/res' ]
 
 if CONFIG['MOZ_ANDROID_SHARE_OVERLAY']:
     gbjar.sources += [
@@ -754,9 +754,9 @@ if CONFIG['MOZ_INSTALL_TRACKING']:
 
 # Putting branding earlier allows branders to override default resources.
 ANDROID_RES_DIRS += [
-    TOPSRCDIR + '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
-    SRCDIR + '/resources',
-    OBJDIR + '/res',
+    '/' + CONFIG['MOZ_BRANDING_DIRECTORY'] + '/res',
+    'resources',
+    '!res',
 ]
 
 ANDROID_GENERATED_RESFILES += [
@@ -764,6 +764,10 @@ ANDROID_GENERATED_RESFILES += [
     'res/values/strings.xml',
 ]
 
+ANDROID_ASSETS_DIRS += [
+    '/mobile/android/app/assets',
+]
+
 # We do not expose MOZ_INSTALL_TRACKING_ADJUST_SDK_APP_TOKEN here because that
 # would leak the value to build logs.  Instead we expose the token quietly where
 # appropriate in Makefile.in.