Merge central to inbound

browser/app/profile/extensions/uriloader@pdf.js/test/browser_pdfjs_main.js

@@ -15,12 +15,16 @@ function test() {
     registerCleanupFunction(function() {
       aAddon.userDisabled = true;
     });
-  });
 
+    continueTest();
+  });
+}
+
+function continueTest() {
   var tab = gBrowser.addTab(TESTROOT + "file_pdfjs_test.pdf");
   var newTabBrowser = gBrowser.getBrowserForTab(tab);
-  newTabBrowser.addEventListener("load", function () {
-    newTabBrowser.removeEventListener("load", arguments.callee, true);
+  newTabBrowser.addEventListener("load", function onLoad() {
+    newTabBrowser.removeEventListener("load", onLoad, true);
 
     var hasViewer = newTabBrowser.contentDocument.querySelector('div#viewer');
     var hasPDFJS = 'PDFJS' in newTabBrowser.contentWindow.wrappedJSObject;

dom/base/Webapps.jsm

@@ -405,7 +405,7 @@ DOMApplicationManifest = function(aManifest, aOrigin) {
   else if (this._manifest.locales) {
     // try with the language part of the locale ("en" for en-GB) only
     let lang = locale.split('-')[0];
-    if (land != locale && this._manifest.locales[lang])
+    if (lang != locale && this._manifest.locales[lang])
       this._localeRoot = this._manifest.locales[lang];
   }
 }

gfx/cairo/README

@@ -176,6 +176,8 @@ quartz-mark-dirty.patch: Add a quartz implementation of mark_dirty_rectangle (bu
 
 expose-snapshot.patch: Make functions to add snapshots public, as well as allow creating null surfaces publically. (bug 715658)
 
+fix-build-with-Werror=return-type.patch: Fix builds with -Werror=return-type (bug 737909)
+
 ==== pixman patches ====
 
 pixman-android-cpu-detect.patch: Add CPU detection support for Android, where we can't reliably access /proc/self/auxv.

gfx/cairo/cairo/src/cairo-quartz-surface.c

@@ -441,6 +441,7 @@ _cairo_quartz_cairo_operator_to_quartz_composite (cairo_operator_t op)
 	case CAIRO_OPERATOR_HSL_LUMINOSITY:
         default:
 	    assert (0);
+	    return kPrivateCGCompositeClear;
     }
 }
 

gfx/cairo/fix-build-with-Werror=return-type.patch

@@ -0,0 +1,21 @@
+diff --git a/gfx/cairo/cairo/src/cairo-quartz-surface.c b/gfx/cairo/cairo/src/cairo-quartz-surface.c
+--- a/gfx/cairo/cairo/src/cairo-quartz-surface.c
++++ b/gfx/cairo/cairo/src/cairo-quartz-surface.c
+@@ -436,16 +436,17 @@ _cairo_quartz_cairo_operator_to_quartz_c
+ 	case CAIRO_OPERATOR_DIFFERENCE:
+ 	case CAIRO_OPERATOR_EXCLUSION:
+ 	case CAIRO_OPERATOR_HSL_HUE:
+ 	case CAIRO_OPERATOR_HSL_SATURATION:
+ 	case CAIRO_OPERATOR_HSL_COLOR:
+ 	case CAIRO_OPERATOR_HSL_LUMINOSITY:
+         default:
+ 	    assert (0);
++	    return kPrivateCGCompositeClear;
+     }
+ }
+ 
+ static cairo_int_status_t
+ _cairo_quartz_surface_set_cairo_operator (cairo_quartz_surface_t *surface, cairo_operator_t op)
+ {
+     ND((stderr, "%p _cairo_quartz_surface_set_cairo_operator %d\n", surface, op));
+ 

toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage.js

@@ -52,8 +52,8 @@ add_test(function test_aboutURI_bookmarked()
 
 add_test(function test_privateBrowsing_bookmarked()
 {
-  if (!"@mozilla.org/privatebrowsing;1" in Cc) {
-    run_next_next();
+  if (!("@mozilla.org/privatebrowsing;1" in Cc)) {
+    run_next_test();
     return;
   }
 

toolkit/components/places/tests/favicons/test_setAndFetchFaviconForPage_failures.js

@@ -86,7 +86,7 @@ add_test(function test_aboutURI()
 
 add_test(function test_privateBrowsing_nonBookmarkedURI()
 {
-  if (!"@mozilla.org/privatebrowsing;1" in Cc) {
+  if (!("@mozilla.org/privatebrowsing;1" in Cc)) {
     run_next_test();
     return;
   }

tools/profiler/TableTicker.cpp

@@ -390,7 +390,7 @@ class TableTicker: public Sampler {
 
 private:
   // Not implemented on platforms which do not support backtracing
-  static void doBacktrace(ThreadProfile &aProfile, TickSample* aSample);
+  void doBacktrace(ThreadProfile &aProfile, TickSample* aSample);
 
 private:
   // This represent the application's main thread (SAMPLER_INIT)