Bug 836654 - Part 12 (follow-up): Unbust debug builds, and remove an XXX comment.
☠☠ backed out by 4f05e3bc58ce ☠ ☠
authorJustin Lebar <justin.lebar@gmail.com>
Thu, 14 Feb 2013 02:53:07 -0500
changeset 131742 9b04f5fd79d63c3ee415cd7d32cbf04a6d1ab8b0
parent 131741 6df7745580ff4d4384bc201be1618c07f38cd8d0
child 131743 a74f08ec0e4669d3b1a333b0bf2e1f63d661f2d4
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs836654
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 836654 - Part 12 (follow-up): Unbust debug builds, and remove an XXX comment.
hal/HalTypes.h
hal/sandbox/SandboxHal.cpp
--- a/hal/HalTypes.h
+++ b/hal/HalTypes.h
@@ -8,17 +8,19 @@
 
 #include "IPCMessageUtils.h"
 #include "Observer.h"
 
 namespace mozilla {
 namespace hal {
 
 /**
- * XXX
+ * These constants specify special values for content process IDs.  You can get
+ * a content process ID by calling ContentChild::GetID() or
+ * ContentParent::GetChildID().
  */
 const uint64_t CONTENT_PROCESS_ID_UNKNOWN = uint64_t(-1);
 const uint64_t CONTENT_PROCESS_ID_MAIN = 0;
 
 /**
  * These are defined by libhardware, specifically, hardware/libhardware/include/hardware/lights.h
  * in the gonk subsystem.
  * If these change and are exposed to JS, make sure nsIHal.idl is updated as well.
--- a/hal/sandbox/SandboxHal.cpp
+++ b/hal/sandbox/SandboxHal.cpp
@@ -276,17 +276,17 @@ DisableWakeLockNotifications()
 }
 
 void
 ModifyWakeLock(const nsAString &aTopic,
                WakeLockControl aLockAdjust,
                WakeLockControl aHiddenAdjust,
                uint64_t aProcessID)
 {
-  MOZ_ASSERT(aProcessID != ContentChild::kUnknownID);
+  MOZ_ASSERT(aProcessID != CONTENT_PROCESS_ID_UNKNOWN);
   Hal()->SendModifyWakeLock(nsString(aTopic), aLockAdjust, aHiddenAdjust, aProcessID);
 }
 
 void
 GetWakeLockInfo(const nsAString &aTopic, WakeLockInformation *aWakeLockInfo)
 {
   Hal()->SendGetWakeLockInfo(nsString(aTopic), aWakeLockInfo);
 }
@@ -708,17 +708,17 @@ public:
   }
 
   virtual bool
   RecvModifyWakeLock(const nsString& aTopic,
                      const WakeLockControl& aLockAdjust,
                      const WakeLockControl& aHiddenAdjust,
                      const uint64_t& aProcessID) MOZ_OVERRIDE
   {
-    MOZ_ASSERT(aProcessID != ContentChild::kUnknownID);
+    MOZ_ASSERT(aProcessID != CONTENT_PROCESS_ID_UNKNOWN);
 
     // We allow arbitrary content to use wake locks.
     hal::ModifyWakeLock(aTopic, aLockAdjust, aHiddenAdjust, aProcessID);
     return true;
   }
 
   virtual bool
   RecvEnableWakeLockNotifications() MOZ_OVERRIDE