Merge mozilla-central into mozilla-inbound

browser/app/blocklist.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1354308657000">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1354916891000">
   <emItems>
       <emItem  blockID="i58" id="webmaster@buzzzzvideos.info">
                         <versionRange  minVersion="0" maxVersion="*">
@@ -45,6 +45,10 @@
                         <versionRange  minVersion="2.5.0" maxVersion="2.5.0" severity="1">
                     </versionRange>
                   </emItem>
+      <emItem  blockID="i236" id="{EEE6C361-6118-11DC-9C72-001320C79847}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+                    </versionRange>
+                  </emItem>
       <emItem  blockID="i64" id="royal@facebook.com">
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
@@ -61,6 +65,13 @@
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
                   </emItem>
+      <emItem  blockID="i238" id="/^pink@.*\.info$/">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                      <targetApplication  id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
+                              <versionRange  minVersion="19.0a1" maxVersion="*" />
+                          </targetApplication>
+                    </versionRange>
+                  </emItem>
       <emItem  blockID="i174" id="info@thebflix.com">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
                     </versionRange>

configure.in

@@ -1426,6 +1426,13 @@ if test "$GNU_CC"; then
     AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
                   AC_MSG_RESULT([no])
                   LDFLAGS=$_SAVE_LDFLAGS)
+    AC_MSG_CHECKING([for --build-id option to ld])
+    _SAVE_LDFLAGS=$LDFLAGS
+    LDFLAGS="$LDFLAGS -Wl,--build-id"
+    AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+                  AC_MSG_RESULT([no])
+                  LDFLAGS=$_SAVE_LDFLAGS)
+
 
     # Check for -mssse3 on $CC
     AC_MSG_CHECKING([if toolchain supports -mssse3 option])

js/src/configure.in

@@ -1194,6 +1194,13 @@ if test "$GNU_CC"; then
     DSO_PIC_CFLAGS='-fPIC'
     ASFLAGS="$ASFLAGS -fPIC"
 
+    AC_MSG_CHECKING([for --build-id option to ld])
+    _SAVE_LDFLAGS=$LDFLAGS
+    LDFLAGS="$LDFLAGS -Wl,--build-id"
+    AC_TRY_LINK(,,AC_MSG_RESULT([yes]),
+                  AC_MSG_RESULT([no])
+                  LDFLAGS=$_SAVE_LDFLAGS)
+
     # Turn on GNU-specific warnings:
     # -Wall - turn on a lot of warnings
     # -pedantic - this is turned on below

python/mach/mach/logging.py

@@ -112,11 +112,10 @@ class StructuredTerminalFormatter(StructuredHumanFormatter):
 class LoggingManager(object):
     """Holds and controls global logging state.
 
-    A mozbuild application should instantiate one of these and configure it
-    as needed.
+    An application should instantiate one of these and configure it as needed.
 
     This class provides a mechanism to configure the output of logging data
-    both from mozbuild and from the overall logging system (e.g. from other
+    both from mach and from the overall logging system (e.g. from other
     modules).
     """
 
@@ -135,12 +134,12 @@ class LoggingManager(object):
         # complaining about "no handlers could be found for logger XXX."
         self.root_logger.addHandler(logging.NullHandler())
 
-        self.mozbuild_logger = logging.getLogger('mozbuild')
-        self.mozbuild_logger.setLevel(logging.DEBUG)
+        self.mach_logger = logging.getLogger('mach')
+        self.mach_logger.setLevel(logging.DEBUG)
 
         self.structured_filter = ConvertToStructuredFilter()
 
-        self.structured_loggers = [self.mozbuild_logger]
+        self.structured_loggers = [self.mach_logger]
 
         self._terminal = None
 
@@ -227,6 +226,6 @@ class LoggingManager(object):
         """Register a structured logger.
 
         This needs to be called for all structured loggers that don't chain up
-        to the mozbuild logger in order for their output to be captured.
+        to the mach logger in order for their output to be captured.
         """
         self.structured_loggers.append(logger)

toolkit/crashreporter/tools/symbolstore.py

@@ -611,21 +611,17 @@ class Dumper_Linux(Dumper):
         return False
 
     def CopyDebug(self, file, debug_file, guid):
-        import zlib, struct, hashlib
         # We want to strip out the debug info, and add a
         # .gnu_debuglink section to the object, so the debugger can
         # actually load our debug info later.
         file_dbg = file + ".dbg"
-        if subprocess.call([self.objcopy, '--only-keep-debug', file, file_dbg], stdout=sys.stderr) == 0 and \
-           subprocess.call([self.objcopy, '--add-gnu-debuglink=%s' % file_dbg, file], stdout=sys.stderr) == 0:
+        if subprocess.call([self.objcopy, '--only-keep-debug', file, file_dbg]) == 0 and \
+           subprocess.call([self.objcopy, '--add-gnu-debuglink=%s' % file_dbg, file]) == 0:
             rel_path = os.path.join(debug_file,
                                     guid,
                                     debug_file + ".dbg")
             full_path = os.path.normpath(os.path.join(self.symbol_path,
                                                       rel_path))
-            # Temporary debug information
-            print >>sys.stderr, read_output('objdump', '-j', '.gnu_debuglink', '-s', file)
-            print >>sys.stderr, "%s crc: %08x" % (file_dbg, 0xffffffff & zlib.crc32(open(file_dbg).read()))
             shutil.move(file_dbg, full_path)
             # gzip the shipped debug files
             os.system("gzip %s" % full_path)

widget/gonk/Framebuffer.cpp

@@ -133,7 +133,7 @@ Open()
 bool
 GetSize(nsIntSize *aScreenSize) {
     // If the framebuffer has been opened, we should always have the size.
-    if (0 <= sFd || sScreenSize) {
+    if (sScreenSize) {
         *aScreenSize = *sScreenSize;
         return true;
     }

widget/gonk/nsWindow.cpp

@@ -151,8 +151,10 @@ nsWindow::nsWindow()
         }
 
         nsIntSize screenSize;
-        mozilla::DebugOnly<bool> gotFB = Framebuffer::GetSize(&screenSize);
-        MOZ_ASSERT(gotFB);
+        bool gotFB = Framebuffer::GetSize(&screenSize);
+        if (!gotFB) {
+            NS_RUNTIMEABORT("Failed to get size from framebuffer, aborting...");
+        }
         gScreenBounds = nsIntRect(nsIntPoint(0, 0), screenSize);
 
         char propValue[PROPERTY_VALUE_MAX];