Merge f-t to m-c, a=merge
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 18 Jan 2015 08:50:47 -0800
changeset 224444 6446c26b45f9ab8783645e2ba3852a9c46da987b
parent 224440 d7d4d4b9d771b3d82e0c46e761c23110a12c2bc1 (current diff)
parent 224443 b8059c92cd31218e7bb79c2efe7d7ac5988c8c78 (diff)
child 224445 f996db705b48c28d662b7db8606d3eca8a53105f
child 224457 ac5cc826d9d4aac9b4e47d322c3971eeec8eeccc
child 224491 1b19461160c47f61e3c9bbce8273767e5f759d03
push id28129
push userphilringnalda@gmail.com
push dateSun, 18 Jan 2015 16:50:56 +0000
treeherdermozilla-central@6446c26b45f9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone38.0a1
first release with
nightly linux32
6446c26b45f9 / 38.0a1 / 20150119030222 / files
nightly linux64
6446c26b45f9 / 38.0a1 / 20150119030222 / files
nightly mac
6446c26b45f9 / 38.0a1 / 20150119030222 / files
nightly win32
6446c26b45f9 / 38.0a1 / 20150119030222 / files
nightly win64
6446c26b45f9 / 38.0a1 / 20150119030222 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge f-t to m-c, a=merge
--- a/browser/components/places/content/browserPlacesViews.js
+++ b/browser/components/places/content/browserPlacesViews.js
@@ -14,52 +14,62 @@ function PlacesViewBase(aPlace, aOptions
   this.options = aOptions;
   this._controller = new PlacesController(this);
   this._viewElt.controllers.appendController(this._controller);
 }
 
 PlacesViewBase.prototype = {
   // The xul element that holds the entire view.
   _viewElt: null,
-  get viewElt() this._viewElt,
+  get viewElt() {
+    return this._viewElt;
+  },
 
-  get associatedElement() this._viewElt,
+  get associatedElement() {
+    return this._viewElt;
+  },
 
-  get controllers() this._viewElt.controllers,
+  get controllers() {
+    return this._viewElt.controllers;
+  },
 
   // The xul element that represents the root container.
   _rootElt: null,
 
   // Set to true for views that are represented by native widgets (i.e.
   // the native mac menu).
   _nativeView: false,
 
   QueryInterface: XPCOMUtils.generateQI(
     [Components.interfaces.nsINavHistoryResultObserver,
      Components.interfaces.nsISupportsWeakReference]),
 
   _place: "",
-  get place() this._place,
+  get place() {
+    return this._place;
+  },
   set place(val) {
     this._place = val;
 
     let history = PlacesUtils.history;
     let queries = { }, options = { };
     history.queryStringToQueries(val, queries, { }, options);
     if (!queries.value.length)
       queries.value = [history.getNewQuery()];
 
     let result = history.executeQueries(queries.value, queries.value.length,
                                         options.value);
     result.addObserver(this, false);
     return val;
   },
 
   _result: null,
-  get result() this._result,
+  get result() {
+    return this._result;
+  },
   set result(val) {
     if (this._result == val)
       return val;
 
     if (this._result) {
       this._result.removeObserver(this);
       this._resultNode.containerOpen = false;
     }
@@ -81,17 +91,19 @@ PlacesViewBase.prototype = {
       this._resultNode = null;
       delete this._domNodes;
     }
 
     return val;
   },
 
   _options: null,
-  get options() this._options,
+  get options() {
+    return this._options;
+  },
   set options(val) {
     if (!val)
       val = {};
 
     if (!("extraClasses" in val))
       val.extraClasses = {};
     this._options = val;
 
@@ -110,19 +122,23 @@ PlacesViewBase.prototype = {
     let node = this._domNodes.get(aPlacesNode, null);
     if (!node) {
       throw new Error("No DOM node set for aPlacesNode.\nnode.type: " +
                       aPlacesNode.type + ". node.parent: " + aPlacesNode);
     }
     return node;
   },
 
-  get controller() this._controller,
+  get controller() {
+    return this._controller;
+  },
 
-  get selType() "single",
+  get selType() {
+    return "single";
+  },
   selectItems: function() { },
   selectAll: function() { },
 
   get selectedNode() {
     if (this._contextMenuShown) {
       let anchor = this._contextMenuShown.triggerNode;
       if (!anchor)
         return null;
@@ -131,17 +147,19 @@ PlacesViewBase.prototype = {
         return this._rootElt == anchor ? null : anchor._placesNode;
 
       anchor = anchor.parentNode;
       return this._rootElt == anchor ? null : (anchor._placesNode || null);
     }
     return null;
   },
 
-  get hasSelection() this.selectedNode != null,
+  get hasSelection() {
+    return this.selectedNode != null;
+  },
 
   get selectedNodes() {
     let selectedNode = this.selectedNode;
     return selectedNode ? [selectedNode] : [];
   },
 
   get removableSelectionRanges() {
     // On static content the current selectedNode would be the selection's
@@ -149,17 +167,19 @@ PlacesViewBase.prototype = {
     // selection is not explicit.
     if (document.popupNode &&
         (document.popupNode == "menupopup" || !document.popupNode._placesNode))
       return [];
 
     return [this.selectedNodes];
   },
 
-  get draggableSelection() [this._draggedElt],
+  get draggableSelection() {
+    return [this._draggedElt];
+  },
 
   get insertionPoint() {
     // There is no insertion point for history queries, so bail out now and
     // save a lot of work when updating commands.
     let resultNode = this._resultNode;
     if (PlacesUtils.nodeIsQuery(resultNode) &&
         PlacesUtils.asQuery(resultNode).queryOptions.queryType ==
           Ci.nsINavHistoryQueryOptions.QUERY_TYPE_HISTORY)
@@ -747,17 +767,19 @@ PlacesViewBase.prototype = {
     if ("_isRTL" in this)
       return this._isRTL;
 
     return this._isRTL = document.defaultView
                                  .getComputedStyle(this.viewElt, "")
                                  .direction == "rtl";
   },
 
-  get ownerWindow() window,
+  get ownerWindow() {
+    return window;
+  },
 
   /**
    * Adds an "Open All in Tabs" menuitem to the bottom of the popup.
    * @param aPopup
    *        a Places popup.
    */
   _mayAddCommandsItems: function PVB__mayAddCommandsItems(aPopup) {
     // The command items are never added to the root popup.
--- a/build/autoconf/compiler-opts.m4
+++ b/build/autoconf/compiler-opts.m4
@@ -329,17 +329,17 @@ fi
 
 # bionic in Android < 4.1 doesn't support PIE
 # On OSX, the linker defaults to building PIE programs when targetting OSX 10.7+,
 # but not when targetting OSX < 10.7. OSX < 10.7 doesn't support running PIE
 # programs, so as long as support for OSX 10.6 is kept, we can't build PIE.
 # Even after dropping 10.6 support, MOZ_PIE would not be useful since it's the
 # default (and clang says the -pie option is not used).
 # On other Unix systems, some file managers (Nautilus) can't start PIE programs
-if test -n "$gonkdir" -a "$ANDROID_VERSION" -ge 16; then
+if test -n "$gonkdir" && test "$ANDROID_VERSION" -ge 16; then
     MOZ_PIE=1
 else
     MOZ_PIE=
 fi
 
 MOZ_ARG_ENABLE_BOOL(pie,
 [  --enable-pie           Enable Position Independent Executables],
     MOZ_PIE=1,
--- a/configure.in
+++ b/configure.in
@@ -5080,17 +5080,17 @@ if test -n "$MOZ_WEBRTC"; then
     *)
         dnl default to disabled for all others
         MOZ_WEBRTC=
         ;;
     esac
 fi
 
 dnl Temporary until webrtc works on gonk-L
-if test -n "$gonkdir" -a "$ANDROID_VERSION" -ge 21; then
+if test -n "$gonkdir" && test "$ANDROID_VERSION" -ge 21; then
     MOZ_WEBRTC=
 fi
 
 AC_TRY_COMPILE([#include <linux/ethtool.h>],
                [ struct ethtool_cmd cmd; cmd.speed_hi = 0; ],
                MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI=1)
 
 AC_SUBST(MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI)