From d0bf8199667d9f248a5e58982056ce5f35198716 Mon Sep 17 00:00:00 2001 From: Phil Ringnalda Date: Sat, 17 Mar 2012 12:01:54 -0700 Subject: [PATCH 1/3] Back out a0fa92215a36 (bug 713132) for breaking --disable-updater as used in RPM nightlies --- browser/installer/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index 4cd058d2879a..5282ef692612 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -48,7 +48,6 @@ include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in -MOZ_PKG_FATAL_WARNINGS = 1 MOZ_NONLOCALIZED_PKG_LIST = \ xpcom \ From 9d9cca28ee9c5c3c5671980e2f9d41383735ebfc Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Sat, 17 Mar 2012 13:07:28 -0700 Subject: [PATCH 2/3] Bug 612311: Add some instrumentation. r=me --- dom/workers/test/suspend_worker.js | 1 + dom/workers/test/terminate_worker.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/workers/test/suspend_worker.js b/dom/workers/test/suspend_worker.js index 43eb24a7ad33..31e826bdc2ee 100644 --- a/dom/workers/test/suspend_worker.js +++ b/dom/workers/test/suspend_worker.js @@ -5,6 +5,7 @@ var counter = 0; var interval = setInterval(function() { + dump("WorkerAlive\n"); postMessage(++counter); }, 100); diff --git a/dom/workers/test/terminate_worker.js b/dom/workers/test/terminate_worker.js index ad4e8252773d..6b7b3fffbeb5 100644 --- a/dom/workers/test/terminate_worker.js +++ b/dom/workers/test/terminate_worker.js @@ -10,4 +10,4 @@ onmessage = function(event) { throw "No messages should reach me!"; } -setInterval(function() { postMessage("Still alive!"); }, 100); +setInterval(function() { dump("WorkerAlive\n"); postMessage("Still alive!"); }, 100); From bd2a374d8d21b6c82c5c710b28d1b672c8e11936 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Sat, 17 Mar 2012 14:42:24 -0700 Subject: [PATCH 3/3] Bug 736778: Work around probable compiler bug breaking DEBUG builds of GonkCaptureProvider. r=fabrice (npotb) --- .../protocol/device/GonkCaptureProvider.cpp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/netwerk/protocol/device/GonkCaptureProvider.cpp b/netwerk/protocol/device/GonkCaptureProvider.cpp index b589f1b1bc5e..2eafb1afd282 100644 --- a/netwerk/protocol/device/GonkCaptureProvider.cpp +++ b/netwerk/protocol/device/GonkCaptureProvider.cpp @@ -71,21 +71,21 @@ class CameraHardwareInterface { static CameraHardwareInterface* openCamera(PRUint32 aCamera); - virtual ~CameraHardwareInterface() { }; + virtual ~CameraHardwareInterface() { } - virtual bool ok(); - virtual void enableMsgType(int32_t msgType); - virtual void disableMsgType(int32_t msgType); - virtual bool msgTypeEnabled(int32_t msgType); + virtual bool ok() = 0; + virtual void enableMsgType(int32_t msgType) = 0; + virtual void disableMsgType(int32_t msgType) = 0; + virtual bool msgTypeEnabled(int32_t msgType) = 0; virtual void setCallbacks(notify_callback notify_cb, data_callback data_cb, data_callback_timestamp data_cb_timestamp, - void* user); - virtual status_t startPreview(); - virtual void stopPreview(); - virtual void release(); - virtual status_t setParameters(const CameraParameters& params); - virtual CameraParameters getParameters() const; + void* user) = 0; + virtual status_t startPreview() = 0; + virtual void stopPreview() = 0; + virtual void release() = 0; + virtual status_t setParameters(const CameraParameters& params) = 0; + virtual CameraParameters getParameters() const = 0; protected: CameraHardwareInterface(PRUint32 aCamera = 0) { };