From 9f8f6cd2540470e668b046734a979f4e55565f4d Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Tue, 23 Jul 2013 17:34:12 -0700
Subject: [PATCH] Bug 888088 (part 0) - Some minor #include fix-ups. 
 r=wmccloskey.

--HG--
extra : rebase_source : edb1291d4571c2ea3bd942e2b1fcea0ab58cbe25
---
 js/public/HeapAPI.h |  6 ++++--
 js/src/gc/Heap.h    | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/js/public/HeapAPI.h b/js/public/HeapAPI.h
index 37cadfac3783..4d739304bcb3 100644
--- a/js/public/HeapAPI.h
+++ b/js/public/HeapAPI.h
@@ -9,6 +9,8 @@
 
 #include "jspubtd.h"
 
+#include "js/Utility.h"
+
 /* These values are private to the JS engine. */
 namespace js {
 namespace gc {
@@ -50,7 +52,7 @@ namespace shadow {
 
 struct ArenaHeader
 {
-    js::Zone *zone;
+    JS::Zone *zone;
 };
 
 struct Zone
@@ -136,7 +138,7 @@ IsIncrementalBarrierNeededOnGCThing(shadow::Runtime *rt, void *thing, JSGCTraceK
 {
     if (!rt->needsBarrier_)
         return false;
-    js::Zone *zone = GetGCThingZone(thing);
+    JS::Zone *zone = GetGCThingZone(thing);
     return reinterpret_cast<shadow::Zone *>(zone)->needsBarrier_;
 }
 
diff --git a/js/src/gc/Heap.h b/js/src/gc/Heap.h
index aa866f5fc369..aefb27b57a52 100644
--- a/js/src/gc/Heap.h
+++ b/js/src/gc/Heap.h
@@ -98,8 +98,8 @@ struct Cell
     MOZ_ALWAYS_INLINE void unmark(uint32_t color) const;
 
     inline JSRuntime *runtime() const;
-    inline Zone *tenuredZone() const;
-    inline bool tenuredIsInsideZone(Zone *zone) const;
+    inline JS::Zone *tenuredZone() const;
+    inline bool tenuredIsInsideZone(JS::Zone *zone) const;
 
 #ifdef DEBUG
     inline bool isAligned() const;
@@ -457,7 +457,7 @@ struct ArenaHeader : public JS::shadow::ArenaHeader
         return allocKind < size_t(FINALIZE_LIMIT);
     }
 
-    void init(Zone *zoneArg, AllocKind kind) {
+    void init(JS::Zone *zoneArg, AllocKind kind) {
         JS_ASSERT(!allocated());
         JS_ASSERT(!markOverflow);
         JS_ASSERT(!allocatedDuringIncremental);
@@ -781,7 +781,7 @@ struct Chunk
         return info.numArenasFree != 0;
     }
 
-    inline void addToAvailableList(Zone *zone);
+    inline void addToAvailableList(JS::Zone *zone);
     inline void insertToAvailableList(Chunk **insertPoint);
     inline void removeFromAvailableList();
 
@@ -987,7 +987,7 @@ Cell::unmark(uint32_t color) const
     chunk()->bitmap.unmark(this, color);
 }
 
-Zone *
+JS::Zone *
 Cell::tenuredZone() const
 {
     JS_ASSERT(InSequentialOrExclusiveParallelSection());
@@ -996,7 +996,7 @@ Cell::tenuredZone() const
 }
 
 bool
-Cell::tenuredIsInsideZone(Zone *zone) const
+Cell::tenuredIsInsideZone(JS::Zone *zone) const
 {
     JS_ASSERT(isTenured());
     return zone == arenaHeader()->zone;