Merge b2g-inbound to m-c. a=merge

2024-09-13 09:24:08 -07:00 · 2015-07-01 16:34:22 -04:00 · 2015-07-01 16:34:22 -04:00 · 043994bff4
commit 043994bff4
parent 810f47096a cc8e3ff8ad
20 changed files with 45 additions and 24 deletions
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@ -6,6 +6,8 @@

 "use strict";

+window.performance.mark('gecko-settings-loadstart');
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
--- a/b2g/chrome/content/shell.html
+++ b/b2g/chrome/content/shell.html
@ -16,7 +16,10 @@
 #ifdef FXOS_SIMULATOR
  <link rel="stylesheet" href="desktop.css" type="text/css">
 #endif
-
+  <script type="text/javascript">
+  <!-- Add raptor performance marker -->
+  window.performance.mark('gecko-shell-html-load');
+  </script>
  <script type="application/javascript;version=1.8"
          src="chrome://b2g/content/settings.js"> </script>
  <script type="application/javascript;version=1.8"
--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@ -4,6 +4,8 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */

+window.performance.mark('gecko-shell-loadstart');
+
 Cu.import('resource://gre/modules/ContactService.jsm');
 Cu.import('resource://gre/modules/DataStoreChangeNotifier.jsm');
 Cu.import('resource://gre/modules/AlarmService.jsm');
@ -75,6 +77,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "SafeBrowsing",
              "resource://gre/modules/SafeBrowsing.jsm");
 #endif

+window.performance.measure('gecko-shell-jsm-loaded', 'gecko-shell-loadstart');
+
 function getContentWindow() {
  return shell.contentBrowser.contentWindow;
 }
@ -228,6 +232,7 @@ var shell = {
  },

  bootstrap: function() {
+    window.performance.mark('gecko-shell-bootstrap');
    let startManifestURL =
      Cc['@mozilla.org/commandlinehandler/general-startup;1?type=b2gbootstrap']
        .getService(Ci.nsISupports).wrappedJSObject.startManifestURL;
@ -242,6 +247,7 @@ var shell = {
  },

  start: function shell_start() {
+    window.performance.mark('gecko-shell-start');
    this._started = true;

    // This forces the initialization of the cookie service before we hit the
@ -372,6 +378,8 @@ var shell = {
    this.contentBrowser.src = homeURL;
    this.isHomeLoaded = false;

+    window.performance.mark('gecko-shell-system-frame-set');
+
    ppmm.addMessageListener("content-handler", this);
    ppmm.addMessageListener("dial-handler", this);
    ppmm.addMessageListener("sms-handler", this);
@ -647,6 +655,7 @@ var shell = {
  },

  notifyContentStart: function shell_notifyContentStart() {
+    window.performance.mark('gecko-shell-notify-content-start');
    this.contentBrowser.removeEventListener('mozbrowserloadstart', this, true);
    this.contentBrowser.removeEventListener('mozbrowserlocationchange', this, true);

--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@ -15,7 +15,7 @@
  <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@ -15,7 +15,7 @@
  <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@ -19,7 +19,7 @@
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="87a2d8ab9248540910e56921654367b78a587095"/>
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@ -17,7 +17,7 @@
  </project>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="49192a4e48d080e44a0d66f059e6897f07cf67f8"/>
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@ -15,7 +15,7 @@
  <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@ -15,7 +15,7 @@
  <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@ -19,7 +19,7 @@
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
  <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="87a2d8ab9248540910e56921654367b78a587095"/>
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@ -15,7 +15,7 @@
  <project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@ -1,9 +1,9 @@
 {
    "git": {
-        "git_revision": "26b853b7cf94ea9e9ac6f20c55db462bd213a959", 
+        "git_revision": "858764a56982eb558259ccc689bbee855f090085", 
        "remote": "https://git.mozilla.org/releases/gaia.git", 
        "branch": ""
    }, 
-    "revision": "f7729852bdfb3f7051829e28463868a151c8ae62", 
+    "revision": "d43e6298ab2fc2d3033dac41d38138f9117ab9d3", 
    "repo_path": "integration/gaia-central"
 }
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@ -17,7 +17,7 @@
  </project>
  <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
  <project name="moztt" path="external/moztt" remote="b2g" revision="46da1a05ac04157669685246d70ac59d48699c9e"/>
  <project name="apitrace" path="external/apitrace" remote="apitrace" revision="49192a4e48d080e44a0d66f059e6897f07cf67f8"/>
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@ -15,7 +15,7 @@
  <project name="platform_build" path="build" remote="b2g" revision="61e82f99bb8bc78d52b5717e9a2481ec7267fa33">
    <copyfile dest="Makefile" src="core/root.mk"/>
  </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="26b853b7cf94ea9e9ac6f20c55db462bd213a959"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="858764a56982eb558259ccc689bbee855f090085"/>
  <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
  <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="3477513bcd385571aa01c0d074849e35bd5e2376"/>
  <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
--- a/testing/docker/b2g-build/Dockerfile
+++ b/testing/docker/b2g-build/Dockerfile
@ -6,7 +6,18 @@ COPY releng.repo /etc/yum.repos.d/releng.repo
 RUN yum install -y epel-release && \
  yum update -y && \
  yum makecache && \
-  yum install -y \
+  yum install -y  wget
+
+# Install updated curl libraries
+RUN cd /tmp && \
+  wget https://s3-us-west-2.amazonaws.com/test-caching/libcurl-7.29.0-19.el6.x86_64.rpm && \
+  wget https://s3-us-west-2.amazonaws.com/test-caching/libcurl-devel-7.29.0-19.el6.x86_64.rpm && \
+  wget https://s3-us-west-2.amazonaws.com/test-caching/curl-7.29.0-19.el6.x86_64.rpm && \
+  yum install -y libcurl-7.29.0-19.el6.x86_64.rpm libcurl-devel-7.29.0-19.el6.x86_64.rpm curl-7.29.0-19.el6.x86_64.rpm && \
+  rm -f libcurl-7.29.0-19.el6.x86_64.rpm libcurl-devel-7.29.0-19.el6.x86_64.rpm curl-7.29.0-19.el6.x86_64.rpm && \
+  cd -
+
+RUN yum install -y \
  # From Building B2G docs
  # cmake \
  # cmake: is disabled intentionally to work around: bug 1141417
@ -17,8 +28,6 @@ RUN yum install -y epel-release && \
  bison \
  bzip2 \
  ccache \
-  curl \
-  curl-devel \
  dbus-devel \
  dbus-glib-devel \
  dbus-glib-devel \
@ -41,7 +50,6 @@ RUN yum install -y epel-release && \
  libX11-devel.i686 \
  libXrandr.i686 \
  libXt-devel \
-  libcurl-devel \
  libnotify-devel \
  libstdc++-static \
  libstdc++-static \
@ -72,7 +80,6 @@ RUN yum install -y epel-release && \
  unzip \
  uuid \
  vim \
-  wget \
  wireless-tools-devel \
  xorg-x11-server-Xvfb \
  xorg-x11-server-utils \
--- a/testing/docker/b2g-build/VERSION
+++ b/testing/docker/b2g-build/VERSION
@ -1 +1 @@
-0.2.8
+0.2.9
--- a/testing/docker/builder/Dockerfile
+++ b/testing/docker/builder/Dockerfile
@ -1,4 +1,4 @@
-FROM          quay.io/mozilla/b2g-build:0.2.8
+FROM          quay.io/mozilla/b2g-build:0.2.9
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>

 ENV PYTHONPATH /tools/tools/lib/python:$PYTHONPATH
@ -21,7 +21,7 @@ RUN git config --global user.email "mozilla@example.com" && \
    git config --global user.name "mozilla"

 # VCS Tools
-RUN npm install -g taskcluster-vcs@2.3.5
+RUN npm install -g taskcluster-vcs@2.3.6

 # TODO enable worker
 # TODO volume mount permissions will be an issue
--- a/testing/docker/builder/VERSION
+++ b/testing/docker/builder/VERSION
@ -1 +1 @@
-0.5.5
+0.5.6
--- a/testing/docker/phone-builder/Dockerfile
+++ b/testing/docker/phone-builder/Dockerfile
@ -1,4 +1,4 @@
-FROM          quay.io/mozilla/builder:0.5.5
+FROM          taskcluster/builder:0.5.6
 MAINTAINER    Wander Lairson Costa <wcosta@mozilla.com>

 ENV           SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE /home/worker/socorro.token
--- a/testing/docker/phone-builder/VERSION
+++ b/testing/docker/phone-builder/VERSION
@ -1 +1 @@
-0.0.15
+0.0.16
 @ -1 +1 @@
 .2.8
 .2.9
 @ -1 +1 @@
 .5.5
 .5.6
 @ -1 +1 @@
 .0.15
 .0.16