Merge mozilla-central to autoland

--HG--
rename : memory/mozjemalloc/jemalloc.c => memory/mozjemalloc/mozjemalloc.cpp

browser/base/content/test/static/browser_all_files_referenced.js

@@ -61,6 +61,9 @@ var whitelist = new Set([
   {file: "chrome://devtools/content/inspector/markup/markup.xhtml",
    isFromDevTools: true},
 
+  // Kept for add-on compatibility, should be removed in bug 851471.
+  {file: "chrome://mozapps/skin/downloads/downloadIcon.png"},
+
   // extensions/pref/autoconfig/src/nsReadConfig.cpp
   {file: "resource://gre/defaults/autoconfig/prefcalls.js"},
 
@@ -111,7 +114,6 @@ var whitelist = new Set([
   // browser/extensions/pdfjs/content/web/viewer.js#7450
   {file: "resource://pdf.js/web/debugger.js"},
 
-
   // Starting from here, files in the whitelist are bugs that need fixing.
   // Bug 1339420
   {file: "chrome://branding/content/icon128.png"},

browser/base/content/urlbarBindings.xml

@@ -2201,7 +2201,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
           delta /= 1000;
 
-          // This code is taken from nsDownloadManager.cpp
+          // This algorithm is the same used by the downloads code.
           let speed = (aProgress - this.notification.lastProgress) / delta;
           if (this.notification.speed)
             speed = speed * 0.9 + this.notification.speed * 0.1;

browser/components/downloads/DownloadsCommon.jsm

@@ -634,17 +634,11 @@ XPCOMUtils.defineLazyGetter(DownloadsCommon, "isWinVistaOrHigher", function() {
 
 /**
  * Retrieves the list of past and completed downloads from the underlying
- * Download Manager data, and provides asynchronous notifications allowing to
+ * Downloads API data, and provides asynchronous notifications allowing to
  * build a consistent view of the available data.
  *
- * This object responds to real-time changes in the underlying Download Manager
- * data.  For example, the deletion of one or more downloads is notified through
- * the nsIObserver interface, while any state or progress change is notified
- * through the nsIDownloadProgressListener interface.
- *
- * Note that using this object does not automatically start the Download Manager
- * service.  Consumers will see an empty list of downloads until the service is
- * actually started.  This is useful to display a neutral progress indicator in
+ * Note that using this object does not automatically initialize the list of
+ * downloads. This is useful to display a neutral progress indicator in
  * the main browser window until the autostart timeout elapses.
  *
  * Note that DownloadsData and PrivateDownloadsData are two equivalent singleton

browser/components/preferences/in-content-old/main.js

@@ -507,15 +507,6 @@ var gMainPane = {
       iconUrlSpec = fph.getURLSpecFromFile(currentDirPref.value);
     } else if (folderListPref.value == 1) {
       // 'Downloads'
-      // In 1.5, this pointed to a folder we created called 'My Downloads'
-      // and was available as an option in the 1.5 drop down. On XP this
-      // was in My Documents, on OSX it was in User Docs. In 2.0, we did
-      // away with the drop down option, although the special label was
-      // still supported for the folder if it existed. Because it was
-      // not exposed it was rarely used.
-      // With 3.0, a new desktop folder - 'Downloads' was introduced for
-      // platforms and versions that don't support a default system downloads
-      // folder. See nsDownloadManager for details.
       downloadFolder.label = bundlePreferences.getString("downloadsFolderName");
       iconUrlSpec = fph.getURLSpecFromFile(await this._indexToFolder(1));
     } else {

browser/components/preferences/in-content/applications.js

@@ -2019,15 +2019,6 @@ var gApplicationsPane = {
       iconUrlSpec = fph.getURLSpecFromFile(currentDirPref.value);
     } else if (folderListPref.value == 1) {
       // 'Downloads'
-      // In 1.5, this pointed to a folder we created called 'My Downloads'
-      // and was available as an option in the 1.5 drop down. On XP this
-      // was in My Documents, on OSX it was in User Docs. In 2.0, we did
-      // away with the drop down option, although the special label was
-      // still supported for the folder if it existed. Because it was
-      // not exposed it was rarely used.
-      // With 3.0, a new desktop folder - 'Downloads' was introduced for
-      // platforms and versions that don't support a default system downloads
-      // folder. See nsDownloadManager for details.
       downloadFolder.label = bundlePreferences.getString("downloadsFolderName");
       iconUrlSpec = fph.getURLSpecFromFile(await this._indexToFolder(1));
     } else {

browser/confvars.sh

@@ -60,7 +60,6 @@ else
   MAR_CHANNEL_ID=firefox-mozilla-central
 fi
 MOZ_PROFILE_MIGRATOR=1
-MOZ_JSDOWNLOADS=1
 
 # Enable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=1

browser/themes/osx/browser.css

@@ -538,7 +538,7 @@ toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-p
 
 #urlbar,
 .searchbar-textbox {
-  font: icon;
+  font-size: 1.25em;
 }
 
 %else

browser/themes/shared/location-search-bar.inc.css

@@ -12,6 +12,7 @@
   box-shadow: 0 1px 4px hsla(0, 0%, 0%, .05);
   padding: 0;
   margin: 0 2px;
+  min-height: 30px;
 }
 
 #urlbar:-moz-lwtheme,

browser/themes/windows/browser.css

@@ -752,7 +752,9 @@ toolbar[brighttext] #close-button {
   #urlbar,
   .searchbar-textbox {
     font-size: 1.15em;
+%ifndef MOZ_PHOTON_THEME
     min-height: 28px;
+%endif
   }
 
   :root {

config/external/icu/common/moz.build

@@ -14,5 +14,15 @@ DEFINES['LOCALE_SNAME'] = 0x5c
 
 LOCAL_INCLUDES += ['/intl/icu/source/i18n']
 
+if CONFIG['GNU_CXX']:
+    CXXFLAGS += [
+        '-Wno-deprecated-declarations',
+        '-Wno-type-limits',
+        '-Wno-unused-but-set-variable',
+        '-Wno-unused-function',
+        '-Wno-sign-compare',
+        '-Wno-maybe-uninitialized',
+    ]
+
 include('../defs.mozbuild')
 include('sources.mozbuild')