Merge mozilla-central and inbound

gfx/tests/gtest/Makefile.in

@@ -24,6 +24,7 @@ LOCAL_INCLUDES = \
   $(NULL)
 
 GTEST_CPPSRCS = \
+  TestLayers.cpp \
   TestTiledLayerBuffer.cpp \
   $(NULL)
 

gfx/tests/gtest/TestLayers.cpp

@@ -0,0 +1,107 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+#include "Layers.h"
+
+using namespace mozilla;
+using namespace mozilla::layers;
+
+class TestLayer: public Layer {
+public:
+  TestLayer(LayerManager* aManager)
+    : Layer(aManager, nullptr)
+  {}
+
+  virtual const char* Name() const {
+    return "TestLayer";
+  }
+
+  virtual LayerType GetType() const {
+    return TYPE_CONTAINER;
+  }
+
+  virtual void ComputeEffectiveTransforms(const gfx3DMatrix& aTransformToSurface) {
+    MOZ_CRASH();
+  }
+};
+
+class TestUserData: public LayerUserData {
+public:
+  MOCK_METHOD0(Die, void());
+  virtual ~TestUserData() { Die(); }
+};
+
+
+TEST(Layers, LayerConstructor) {
+  TestLayer layer(nullptr);
+}
+
+TEST(Layers, Defaults) {
+  TestLayer layer(nullptr);
+  ASSERT_EQ(1.0, layer.GetOpacity());
+  ASSERT_EQ(1.0f, layer.GetPostXScale());
+  ASSERT_EQ(1.0f, layer.GetPostYScale());
+
+  ASSERT_EQ(nullptr, layer.GetNextSibling());
+  ASSERT_EQ(nullptr, layer.GetPrevSibling());
+  ASSERT_EQ(nullptr, layer.GetFirstChild());
+  ASSERT_EQ(nullptr, layer.GetLastChild());
+}
+
+TEST(Layers, Transform) {
+  TestLayer layer(nullptr);
+
+  gfx3DMatrix identity;
+  ASSERT_EQ(true, identity.IsIdentity());
+
+  ASSERT_EQ(identity, layer.GetTransform());
+}
+
+TEST(Layers, Type) {
+  TestLayer layer(nullptr);
+  ASSERT_EQ(nullptr, layer.AsThebesLayer());
+  ASSERT_EQ(nullptr, layer.AsRefLayer());
+  ASSERT_EQ(nullptr, layer.AsColorLayer());
+}
+
+TEST(Layers, UserData) {
+  TestLayer* layerPtr = new TestLayer(nullptr);
+  TestLayer& layer = *layerPtr;
+
+  void* key1 = (void*)1;
+  void* key2 = (void*)2;
+  void* key3 = (void*)3;
+
+  TestUserData* data1 = new TestUserData;
+  TestUserData* data2 = new TestUserData;
+  TestUserData* data3 = new TestUserData;
+
+  ASSERT_EQ(nullptr, layer.GetUserData(key1));
+  ASSERT_EQ(nullptr, layer.GetUserData(key2));
+  ASSERT_EQ(nullptr, layer.GetUserData(key3));
+
+  layer.SetUserData(key1, data1);
+  layer.SetUserData(key2, data2);
+  layer.SetUserData(key3, data3);
+
+  // Also checking that the user data is returned but not free'd
+  ASSERT_EQ(data1, layer.RemoveUserData(key1).forget());
+  ASSERT_EQ(data2, layer.RemoveUserData(key2).forget());
+  ASSERT_EQ(data3, layer.RemoveUserData(key3).forget());
+
+  layer.SetUserData(key1, data1);
+  layer.SetUserData(key2, data2);
+  layer.SetUserData(key3, data3);
+
+  // Layer has ownership of data1-3, check that they are destroyed
+  EXPECT_CALL(*data1, Die());
+  EXPECT_CALL(*data2, Die());
+  EXPECT_CALL(*data3, Die());
+  delete layerPtr;
+
+}
+

js/ductwork/debugger/JSDebugger.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef COMPONENTS_JSDEBUGGER_H
-#define COMPONENTS_JSDEBUGGER_H
+#ifndef JSDebugger_h
+#define JSDebugger_h
 
 #include "IJSDebugger.h"
 #include "mozilla/Attributes.h"
@@ -27,4 +27,4 @@ private:
 }
 }
 
-#endif
+#endif /* JSDebugger_h */

js/ipc/CPOWTypes.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_jsipc_ContextWrapperTypes_h__
-#define mozilla_jsipc_ContextWrapperTypes_h__
+#ifndef mozilla_jsipc_CPOWTypes_h
+#define mozilla_jsipc_CPOWTypes_h
 
 #include "jsapi.h"
 #include "jspubtd.h"
@@ -61,4 +61,4 @@ template <> struct ParamTraits<JSType> : public mozilla::jsipc::CPOWConvertible<
 #define JSVAL_TO_CSTR(CX, V) ((char*)0)
 #endif
 
-#endif
+#endif /* mozilla_jsipc_CPOWTypes_h */

js/ipc/ContextWrapperChild.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_jsipc_ContextWrapperChild_h__
-#define mozilla_jsipc_ContextWrapperChild_h__
+#ifndef mozilla_jsipc_ContextWrapperChild_h
+#define mozilla_jsipc_ContextWrapperChild_h
 
 #include "mozilla/jsipc/PContextWrapperChild.h"
 #include "mozilla/jsipc/ObjectWrapperChild.h"
@@ -77,4 +77,4 @@ private:
 
 }}
 
-#endif
+#endif /* mozilla_jsipc_ContextWrapperChild_h */

js/ipc/ContextWrapperParent.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_jsipc_ContextWrapperParent_h__
-#define mozilla_jsipc_ContextWrapperParent_h__
+#ifndef mozilla_jsipc_ContextWrapperParent_h
+#define mozilla_jsipc_ContextWrapperParent_h
 
 #include "mozilla/jsipc/PContextWrapperParent.h"
 #include "mozilla/jsipc/ObjectWrapperParent.h"
@@ -82,4 +82,4 @@ private:
 
 }}
 
-#endif
+#endif /* mozilla_jsipc_ContextWrapperParent_h */

js/ipc/ObjectWrapperChild.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_jsipc_ObjectWrapperChild_h__
-#define mozilla_jsipc_ObjectWrapperChild_h__
+#ifndef mozilla_jsipc_ObjectWrapperChild_h
+#define mozilla_jsipc_ObjectWrapperChild_h
 
 #include "mozilla/jsipc/PObjectWrapperChild.h"
 
@@ -90,4 +90,4 @@ protected:
 
 }}
   
-#endif
+#endif /* mozilla_jsipc_ObjectWrapperChild_h */

js/ipc/ObjectWrapperParent.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_jsipc_ObjectWrapperParent_h__
-#define mozilla_jsipc_ObjectWrapperParent_h__
+#ifndef mozilla_jsipc_ObjectWrapperParent_h
+#define mozilla_jsipc_ObjectWrapperParent_h
 
 #include "mozilla/jsipc/PObjectWrapperParent.h"
 #include "jsapi.h"
@@ -142,4 +142,4 @@ public:
 
 }}
 
-#endif
+#endif /* mozilla_jsipc_ObjectWrapperParent_h */

js/public/Anchor.h

@@ -6,8 +6,8 @@
 
 /* JS::Anchor implementation. */
 
-#ifndef js_Anchor_h___
-#define js_Anchor_h___
+#ifndef js_Anchor_h
+#define js_Anchor_h
 
 #include "mozilla/Attributes.h"
 
@@ -159,4 +159,4 @@ inline Anchor<T>::~Anchor()
 
 } // namespace JS
 
-#endif /* js_Anchor_h___ */
+#endif /* js_Anchor_h */

js/public/CallArgs.h

@@ -26,8 +26,8 @@
  * methods' implementations, potentially under time pressure.
  */
 
-#ifndef js_CallArgs_h___
-#define js_CallArgs_h___
+#ifndef js_CallArgs_h
+#define js_CallArgs_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -400,4 +400,4 @@ JS_THIS(JSContext *cx, JS::Value *vp)
  */
 #define JS_THIS_VALUE(cx,vp)    ((vp)[1])
 
-#endif /* js_CallArgs_h___ */
+#endif /* js_CallArgs_h */

js/public/CharacterEncoding.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef js_CharacterEncoding_h___
-#define js_CharacterEncoding_h___
+#ifndef js_CharacterEncoding_h
+#define js_CharacterEncoding_h
 
 #include "mozilla/Range.h"
 
@@ -152,4 +152,4 @@ TwoByteCharsToNewUTF8CharsZ(JSContext *cx, TwoByteChars tbchars);
 inline void JS_free(JS::Latin1CharsZ &ptr) { js_free((void*)ptr.get()); }
 inline void JS_free(JS::UTF8CharsZ &ptr) { js_free((void*)ptr.get()); }
 
-#endif // js_CharacterEncoding_h___
+#endif /* js_CharacterEncoding_h */

js/public/Date.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef js_Date_h___
-#define js_Date_h___
+#ifndef js_Date_h
+#define js_Date_h
 
 #include "jstypes.h"
 
@@ -32,4 +32,4 @@ DayFromTime(double time);
 
 } // namespace JS
 
-#endif /* js_Date_h___ */
+#endif /* js_Date_h */

js/public/GCAPI.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef js_gc_api_h___
-#define js_gc_api_h___
+#ifndef js_GCAPI_h
+#define js_GCAPI_h
 
 #include "HeapAPI.h"
 
@@ -291,4 +291,4 @@ ExposeValueToActiveJS(const Value &v)
 
 } /* namespace JS */
 
-#endif /* js_gc_api_h___ */
+#endif /* js_GCAPI_h */

js/public/HashTable.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef js_HashTable_h__
-#define js_HashTable_h__
+#ifndef js_HashTable_h
+#define js_HashTable_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -1464,5 +1464,4 @@ class HashTable : private AllocPolicy
 }  // namespace detail
 }  // namespace js
 
-#endif  // js_HashTable_h__
-
+#endif  /* js_HashTable_h */

js/public/HeapAPI.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef js_heap_api_h___
-#define js_heap_api_h___
+#ifndef js_HeapAPI_h
+#define js_HeapAPI_h
 
 #include "jspubtd.h"
 
@@ -159,4 +159,4 @@ IsIncrementalBarrierNeededOnGCThing(shadow::Runtime *rt, void *thing, JSGCTraceK
 
 } /* namespace JS */
 
-#endif /* js_heap_api_h___ */
+#endif /* js_HeapAPI_h */

js/public/LegacyIntTypes.h

@@ -20,8 +20,8 @@
  *         It is safest to use only the JSAPI <stdint.h>-style types,
  *         customizing those types using MOZ_CUSTOM_STDINT_H if necessary.
  */
-#ifndef PROTYPES_H
-#define PROTYPES_H
+#ifndef js_LegacyIntTypes_h
+#define js_LegacyIntTypes_h
 
 #include "mozilla/StandardInteger.h"
 
@@ -57,4 +57,4 @@ typedef int16_t JSInt16;
 typedef int32_t JSInt32;
 typedef int64_t JSInt64;
 
-#endif /* !defined(PROTYPES_H) */
+#endif /* js_LegacyIntTypes_h */

js/public/MemoryMetrics.h

@@ -457,4 +457,4 @@ PeakSizeOfTemporary(const JSRuntime *rt);
 
 } // namespace JS
 
-#endif // js_MemoryMetrics_h
+#endif /* js_MemoryMetrics_h */

js/public/PropertyKey.h

@@ -6,8 +6,8 @@
 
 /* JS::PropertyKey implementation. */
 
-#ifndef js_PropertyKey_h___
-#define js_PropertyKey_h___
+#ifndef js_PropertyKey_h
+#define js_PropertyKey_h
 
 #include "mozilla/Attributes.h"
 
@@ -95,4 +95,4 @@ ToPropertyKey(JSContext *cx, HandleValue v, PropertyKey *key)
 
 } // namespace JS
 
-#endif /* js_PropertyKey_h___ */
+#endif /* js_PropertyKey_h */

js/public/RequiredDefines.h

@@ -10,8 +10,8 @@
  * or SpiderMonkey public headers may not work correctly.
  */
 
-#ifndef js_RequiredDefines_h___
-#define js_RequiredDefines_h___
+#ifndef js_RequiredDefines_h
+#define js_RequiredDefines_h
 
 /*
  * The c99 defining the limit macros (UINT32_MAX for example), says:
@@ -20,4 +20,4 @@
  */
 #define __STDC_LIMIT_MACROS
 
-#endif /* js_RequiredDefines_h___ */
+#endif /* js_RequiredDefines_h */

js/public/RootingAPI.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_root_h__
-#define jsgc_root_h__
+#ifndef js_RootingAPI_h
+#define js_RootingAPI_h
 
 #include "mozilla/GuardObjects.h"
 #include "mozilla/TypeTraits.h"
@@ -931,4 +931,4 @@ class CompilerRootNode
 
 }  /* namespace js */
 
-#endif  /* jsgc_root_h___ */
+#endif  /* js_RootingAPI_h */

js/public/TemplateLib.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef js_template_lib_h__
-#define js_template_lib_h__
+#ifndef js_TemplateLib_h
+#define js_TemplateLib_h
 
 #include "jstypes.h"
 
@@ -114,4 +114,4 @@ template <class T> struct IsRelocatableHeapType { static const bool result = tru
 } /* namespace tl */
 } /* namespace js */
 
-#endif  /* js_template_lib_h__ */
+#endif  /* js_TemplateLib_h */

js/public/Utility.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef js_utility_h__
-#define js_utility_h__
+#ifndef js_Utility_h
+#define js_Utility_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
@@ -860,4 +860,4 @@ typedef size_t(*JSMallocSizeOfFun)(const void *p);
 # define STATIC_SKIP_INFERENCE STATIC_INVARIANT(skip_inference())
 #endif /* HAVE_STATIC_ANNOTATIONS */
 
-#endif /* js_utility_h__ */
+#endif /* js_Utility_h */

js/public/Value.h

@@ -6,8 +6,8 @@
 
 /* JS::Value implementation. */
 
-#ifndef js_Value_h___
-#define js_Value_h___
+#ifndef js_Value_h
+#define js_Value_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/FloatingPoint.h"
@@ -1832,4 +1832,4 @@ JSVAL_TO_PRIVATE(jsval v)
     return JSVAL_TO_PRIVATE_PTR_IMPL(JSVAL_TO_IMPL(v));
 }
 
-#endif /* js_Value_h___ */
+#endif /* js_Value_h */

js/public/Vector.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsvector_h_
-#define jsvector_h_
+#ifndef js_Vector_h
+#define js_Vector_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/TypeTraits.h"
@@ -1104,4 +1104,4 @@ Vector<T,N,AP>::swap(Vector &other)
 #pragma warning(pop)
 #endif
 
-#endif /* jsvector_h_ */
+#endif /* js_Vector_h */

js/src/TraceLogging.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#if !defined(TraceLogging_h__)
-#define TraceLogging_h__
+#ifndef TraceLogging_h
+#define TraceLogging_h
 
 #include "jsscript.h"
 
@@ -113,5 +113,4 @@ class AutoTraceLog {
 
 }  /* namespace js */
 
-#endif // TraceLogging_h__
-
+#endif /* TraceLogging_h */

js/src/assembler/assembler/ARMAssembler.h

@@ -28,8 +28,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef ARMAssembler_h
-#define ARMAssembler_h
+#ifndef assembler_assembler_ARMAssembler_h
+#define assembler_assembler_ARMAssembler_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -1705,4 +1705,4 @@ namespace JSC {
 
 #endif // ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
 
-#endif // ARMAssembler_h
+#endif /* assembler_assembler_ARMAssembler_h */

js/src/assembler/assembler/ARMv7Assembler.h

@@ -28,8 +28,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef ARMAssembler_h
-#define ARMAssembler_h
+#ifndef assembler_assembler_ARMv7Assembler_h
+#define assembler_assembler_ARMv7Assembler_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -1929,4 +1929,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER) && CPU(ARM_THUMB2)
 
-#endif // ARMAssembler_h
+#endif /* assembler_assembler_ARMv7Assembler_h */

js/src/assembler/assembler/AbstractMacroAssembler.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef AbstractMacroAssembler_h
-#define AbstractMacroAssembler_h
+#ifndef assembler_assembler_AbstractMacroAssembler_h
+#define assembler_assembler_AbstractMacroAssembler_h
 
 #include "assembler/wtf/Platform.h"
 #include "assembler/assembler/MacroAssemblerCodeRef.h"
@@ -656,4 +656,4 @@ protected:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // AbstractMacroAssembler_h
+#endif /* assembler_assembler_AbstractMacroAssembler_h */

js/src/assembler/assembler/AssemblerBuffer.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef AssemblerBuffer_h
-#define AssemblerBuffer_h
+#ifndef assembler_assembler_AssemblerBuffer_h
+#define assembler_assembler_AssemblerBuffer_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -336,4 +336,4 @@ namespace JSC {
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // AssemblerBuffer_h
+#endif /* assembler_assembler_AssemblerBuffer_h */

js/src/assembler/assembler/AssemblerBufferWithConstantPool.h

@@ -28,8 +28,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef AssemblerBufferWithConstantPool_h
-#define AssemblerBufferWithConstantPool_h
+#ifndef assembler_assembler_AssemblerBufferWithConstantPool_h
+#define assembler_assembler_AssemblerBufferWithConstantPool_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -383,4 +383,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // AssemblerBufferWithConstantPool_h
+#endif /* assembler_assembler_AssemblerBufferWithConstantPool_h */

js/src/assembler/assembler/CodeLocation.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef CodeLocation_h
-#define CodeLocation_h
+#ifndef assembler_assembler_CodeLocation_h
+#define assembler_assembler_CodeLocation_h
 
 #include "assembler/wtf/Platform.h"
 #include "assembler/assembler/MacroAssemblerCodeRef.h"
@@ -186,4 +186,4 @@ inline CodeLocationDataLabel32 CodeLocationCommon::dataLabel32AtOffset(int offse
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // CodeLocation_h
+#endif /* assembler_assembler_CodeLocation_h */

js/src/assembler/assembler/LinkBuffer.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef LinkBuffer_h
-#define LinkBuffer_h
+#ifndef assembler_assembler_LinkBuffer_h
+#define assembler_assembler_LinkBuffer_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -230,4 +230,4 @@ protected:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // LinkBuffer_h
+#endif /* assembler_assembler_LinkBuffer_h */

js/src/assembler/assembler/MIPSAssembler.h

@@ -26,8 +26,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MIPSAssembler_h
-#define MIPSAssembler_h
+#ifndef assembler_assembler_MIPSAssembler_h
+#define assembler_assembler_MIPSAssembler_h
 
 #if ENABLE(ASSEMBLER) && CPU(MIPS)
 
@@ -1070,4 +1070,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER) && CPU(MIPS)
 
-#endif // MIPSAssembler_h
+#endif /* assembler_assembler_MIPSAssembler_h */

js/src/assembler/assembler/MacroAssembler.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssembler_h
-#define MacroAssembler_h
+#ifndef assembler_assembler_MacroAssembler_h
+#define assembler_assembler_MacroAssembler_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -393,4 +393,4 @@ public:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssembler_h
+#endif /* assembler_assembler_MacroAssembler_h */

js/src/assembler/assembler/MacroAssemblerARM.h

@@ -29,8 +29,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerARM_h
-#define MacroAssemblerARM_h
+#ifndef assembler_assembler_MacroAssemblerARM_h
+#define assembler_assembler_MacroAssemblerARM_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -1542,4 +1542,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
 
-#endif // MacroAssemblerARM_h
+#endif /* assembler_assembler_MacroAssemblerARM_h */

js/src/assembler/assembler/MacroAssemblerARMv7.h

@@ -28,8 +28,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerARMv7_h
-#define MacroAssemblerARMv7_h
+#ifndef assembler_assembler_MacroAssemblerARMv7_h
+#define assembler_assembler_MacroAssemblerARMv7_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -1220,4 +1220,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerARMv7_h
+#endif /* assembler_assembler_MacroAssemblerARMv7_h */

js/src/assembler/assembler/MacroAssemblerCodeRef.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerCodeRef_h
-#define MacroAssemblerCodeRef_h
+#ifndef assembler_assembler_MacroAssemblerCodeRef_h
+#define assembler_assembler_MacroAssemblerCodeRef_h
 
 #include "assembler/wtf/Platform.h"
 #include "assembler/jit/ExecutableAllocator.h"
@@ -222,4 +222,4 @@ public:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerCodeRef_h
+#endif /* assembler_assembler_MacroAssemblerCodeRef_h */

js/src/assembler/assembler/MacroAssemblerMIPS.h

@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef MacroAssemblerMIPS_h
-#define MacroAssemblerMIPS_h
+#ifndef assembler_assembler_MacroAssemblerMIPS_h
+#define assembler_assembler_MacroAssemblerMIPS_h
 
 #if ENABLE(ASSEMBLER) && CPU(MIPS)
 
@@ -2787,4 +2787,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER) && CPU(MIPS)
 
-#endif // MacroAssemblerMIPS_h
+#endif /* assembler_assembler_MacroAssemblerMIPS_h */

js/src/assembler/assembler/MacroAssemblerSparc.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef MacroAssemblerSparc_h
-#define MacroAssemblerSparc_h
+#ifndef assembler_assembler_MacroAssemblerSparc_h
+#define assembler_assembler_MacroAssemblerSparc_h
 
 #include <assembler/wtf/Platform.h>
 
@@ -1458,4 +1458,4 @@ namespace JSC {
 
 #endif // ENABLE(ASSEMBLER) && CPU(SPARC)
 
-#endif // MacroAssemblerSparc_h
+#endif /* assembler_assembler_MacroAssemblerSparc_h */

js/src/assembler/assembler/MacroAssemblerX86.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerX86_h
-#define MacroAssemblerX86_h
+#ifndef assembler_assembler_MacroAssemblerX86_h
+#define assembler_assembler_MacroAssemblerX86_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -260,4 +260,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerX86_h
+#endif /* assembler_assembler_MacroAssemblerX86_h */

js/src/assembler/assembler/MacroAssemblerX86Common.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerX86Common_h
-#define MacroAssemblerX86Common_h
+#ifndef assembler_assembler_MacroAssemblerX86Common_h
+#define assembler_assembler_MacroAssemblerX86Common_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -1517,4 +1517,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerX86Common_h
+#endif /* assembler_assembler_MacroAssemblerX86Common_h */

js/src/assembler/assembler/MacroAssemblerX86_64.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef MacroAssemblerX86_64_h
-#define MacroAssemblerX86_64_h
+#ifndef assembler_assembler_MacroAssemblerX86_64_h
+#define assembler_assembler_MacroAssemblerX86_64_h
 
 #include "mozilla/DebugOnly.h"
 
@@ -601,4 +601,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // MacroAssemblerX86_64_h
+#endif /* assembler_assembler_MacroAssemblerX86_64_h */

js/src/assembler/assembler/RepatchBuffer.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef RepatchBuffer_h
-#define RepatchBuffer_h
+#ifndef assembler_assembler_RepatchBuffer_h
+#define assembler_assembler_RepatchBuffer_h
 
 #include "assembler/wtf/Platform.h"
 
@@ -160,4 +160,4 @@ protected:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // RepatchBuffer_h
+#endif /* assembler_assembler_RepatchBuffer_h */

js/src/assembler/assembler/SparcAssembler.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef SparcAssembler_h
-#define SparcAssembler_h
+#ifndef assembler_assembler_SparcAssembler_h
+#define assembler_assembler_SparcAssembler_h
 
 #include <assembler/wtf/Platform.h>
 
@@ -1215,4 +1215,4 @@ namespace JSC {
 
 #endif // ENABLE(ASSEMBLER) && CPU(SPARC)
 
-#endif // SparcAssembler_h
+#endif /* assembler_assembler_SparcAssembler_h */

js/src/assembler/assembler/X86Assembler.h

@@ -27,8 +27,8 @@
  * 
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef X86Assembler_h
-#define X86Assembler_h
+#ifndef assembler_assembler_X86Assembler_h
+#define assembler_assembler_X86Assembler_h
 
 #include <stdarg.h>
 
@@ -3501,4 +3501,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER) && CPU(X86)
 
-#endif // X86Assembler_h
+#endif /* assembler_assembler_X86Assembler_h */

js/src/assembler/jit/ExecutableAllocator.h

@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef ExecutableAllocator_h
-#define ExecutableAllocator_h
+#ifndef assembler_jit_ExecutableAllocator_h
+#define assembler_jit_ExecutableAllocator_h
 
 #include <stddef.h> // for ptrdiff_t
 #include <limits>
@@ -505,5 +505,4 @@ private:
 
 #endif // ENABLE(ASSEMBLER)
 
-#endif // !defined(ExecutableAllocator)
-
+#endif /* assembler_jit_ExecutableAllocator_h */

js/src/assembler/moco/MocoStubs.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef _include_assembler_moco_stubs_h_
-#define _include_assembler_moco_stubs_h_
+#ifndef assembler_moco_MocoStubs_h
+#define assembler_moco_MocoStubs_h
 
 namespace JSC {
 
@@ -35,5 +35,4 @@ private:
 
 } // namespace JSC
 
-#endif /* _include_assembler_moco_stubs_h_ */
-
+#endif /* assembler_moco_MocoStubs_h */

js/src/assembler/wtf/Assertions.h

@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef WTF_Assertions_h
-#define WTF_Assertions_h
+#ifndef assembler_wtf_Assertions_h
+#define assembler_wtf_Assertions_h
 
 #include "Platform.h"
 #include "mozilla/Assertions.h"
@@ -46,5 +46,4 @@
 #define CRASH() MOZ_CRASH()
 #define COMPILE_ASSERT(exp, name) MOZ_STATIC_ASSERT(exp, #name)
 
-#endif  // WTF_Assertions_h
-
+#endif /* assembler_wtf_Assertions_h */

js/src/assembler/wtf/Platform.h

@@ -25,8 +25,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WTF_Platform_h
-#define WTF_Platform_h
+#ifndef assembler_wtf_Platform_h
+#define assembler_wtf_Platform_h
 
 /* ==== PLATFORM handles OS, operating environment, graphics API, and
    CPU. This macro will be phased out in favor of platform adaptation
@@ -1233,4 +1233,4 @@
 #define WTF_USE_UNIX_DOMAIN_SOCKETS 1
 #endif
 
-#endif /* WTF_Platform_h */
+#endif /* assembler_wtf_Platform_h */

js/src/assembler/wtf/SegmentedVector.h

@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SegmentedVector_h
-#define SegmentedVector_h
+#ifndef assembler_wtf_SegmentedVector_h
+#define assembler_wtf_SegmentedVector_h
 
 #include "jsprvtd.h"
 #include "js/Vector.h"
@@ -261,4 +261,4 @@ namespace WTF {
 
 using WTF::SegmentedVector;
 
-#endif // SegmentedVector_h
+#endif /* assembler_wtf_SegmentedVector_h */

js/src/assembler/wtf/VMTags.h

@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef VMTags_h
-#define VMTags_h
+#ifndef assembler_wtf_VMTags_h
+#define assembler_wtf_VMTags_h
 
 // On Mac OS X, the VM subsystem allows tagging memory requested from mmap and vm_map
 // in order to aid tools that inspect system memory use. 
@@ -87,4 +87,4 @@
 
 #endif // OS(DARWIN)
 
-#endif // VMTags_h
+#endif /* assembler_wtf_VMTags_h */

js/src/builtin/Eval.h

@@ -4,10 +4,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "vm/Stack.h"
+#ifndef builtin_Eval_h
+#define builtin_Eval_h
 
-#ifndef Eval_h__
-#define Eval_h__
+#include "vm/Stack.h"
 
 namespace js {
 
@@ -47,4 +47,4 @@ extern JSPrincipals *
 PrincipalsForCompiledCode(const CallReceiver &call, JSContext *cx);
 
 }  // namespace js
-#endif  // Eval_h__
+#endif /* builtin_Eval_h */

js/src/builtin/Intl.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Intl_h___
-#define Intl_h___
+#ifndef builtin_Intl_h
+#define builtin_Intl_h
 
 #include "jsapi.h"
 
@@ -186,4 +186,4 @@ intl_FormatDateTime(JSContext *cx, unsigned argc, Value *vp);
 
 } // namespace js
 
-#endif /* Intl_h___ */
+#endif /* builtin_Intl_h */

js/src/builtin/Iterator-inl.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Iterator_inl_h_
-#define Iterator_inl_h_
+#ifndef builtin_Iterator_inl_h
+#define builtin_Iterator_inl_h
 
 #include "jsiter.h"
 #include "vm/ObjectImpl-inl.h"
@@ -23,4 +23,4 @@ js::PropertyIteratorObject::setNativeIterator(js::NativeIterator *ni)
     setPrivate(ni);
 }
 
-#endif  // Iterator_inl_h_
+#endif /* builtin_Iterator_inl_h */

js/src/builtin/MapObject.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef MapObject_h__
-#define MapObject_h__
+#ifndef builtin_MapObject_h
+#define builtin_MapObject_h
 
 #include "jsapi.h"
 #include "jscntxt.h"
@@ -164,4 +164,4 @@ js_InitMapClass(JSContext *cx, js::HandleObject obj);
 extern JSObject *
 js_InitSetClass(JSContext *cx, js::HandleObject obj);
 
-#endif  /* MapObject_h__ */
+#endif /* builtin_MapObject_h */

js/src/builtin/Module.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Module_h___
-#define Module_h___
+#ifndef builtin_Module_h
+#define builtin_Module_h
 
 #include "jsobj.h"
 
@@ -35,4 +35,4 @@ class Module : public JSObject {
 
 } // namespace js
 
-#endif // Module_h___
+#endif /* builtin_Module_h */

js/src/builtin/Object.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Object_h___
-#define Object_h___
+#ifndef builtin_Object_h
+#define builtin_Object_h
 
 #include "jsobj.h"
 
@@ -20,4 +20,4 @@ obj_construct(JSContext *cx, unsigned argc, js::Value *vp);
 
 } /* namespace js */
 
-#endif
+#endif /* builtin_Object_h */

js/src/builtin/ParallelArray.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ParallelArray_h__
-#define ParallelArray_h__
+#ifndef builtin_ParallelArray_h
+#define builtin_ParallelArray_h
 
 #include "jsapi.h"
 #include "jscntxt.h"
@@ -57,4 +57,4 @@ class ParallelArrayObject : public JSObject
 extern JSObject *
 js_InitParallelArrayClass(JSContext *cx, js::HandleObject obj);
 
-#endif // ParallelArray_h__
+#endif /* builtin_ParallelArray_h */

js/src/builtin/Profilers.h

@@ -8,8 +8,8 @@
  * Functions for controlling profilers from within JS: Valgrind, Perf,
  * Shark, etc.
  */
-#ifndef Profilers_h___
-#define Profilers_h___
+#ifndef builtin_Profilers_h
+#define builtin_Profilers_h
 
 #include "jstypes.h"
 
@@ -86,4 +86,4 @@ js_StopPerf();
 
 #endif /* __linux__ */
 
-#endif /* Profilers_h___ */
+#endif /* builtin_Profilers_h */

js/src/builtin/RegExp.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef RegExp_h___
-#define RegExp_h___
+#ifndef builtin_RegExp_h
+#define builtin_RegExp_h
 
 #include "jsprvtd.h"
 
@@ -58,4 +58,4 @@ regexp_test(JSContext *cx, unsigned argc, Value *vp);
 
 } /* namespace js */
 
-#endif /* RegExp_h__ */
+#endif /* builtin_RegExp_h */

js/src/builtin/TestingFunctions.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef TestingFunctions_h__
-#define TestingFunctions_h__
+#ifndef builtin_TestingFunctions_h
+#define builtin_TestingFunctions_h
 
 #include "jsapi.h"
 
@@ -19,4 +19,4 @@ testingFunc_inParallelSection(JSContext *cx, unsigned argc, jsval *vp);
 
 } /* namespace js */
 
-#endif /* TestingFunctions_h__ */
+#endif /* builtin_TestingFunctions_h */

js/src/ctypes/CTypes.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef CTYPES_H
-#define CTYPES_H
+#ifndef ctypes_CTypes_h
+#define ctypes_CTypes_h
 
 #include "jscntxt.h"
 #include "jsapi.h"
@@ -509,4 +509,4 @@ namespace UInt64 {
 }
 }
 
-#endif
+#endif /* ctypes_CTypes_h */

js/src/ctypes/Library.h

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef LIBRARY_H
-#define LIBRARY_H
+#ifndef ctypes_Library_h
+#define ctypes_Library_h
 
 #include "jsapi.h"
 
@@ -33,4 +33,4 @@ namespace Library
 }
 }
 
-#endif
+#endif /* ctypes_Library_h */

js/src/ctypes/typedefs.h

@@ -15,6 +15,9 @@
  * which sizeof(ctype) and templated type conversions will be derived), and
  * 'ffitype' is the ffi_type to use. (Special types, such as 'void' and the
  * pointer, array, and struct types are handled separately.)
+ *
+ * This header lacks a #ifndef wrapper because it is deliberately #included
+ * multiple times in ctypes/CTypes.h.
  */
 
 // If we're not breaking the types out, combine them together under one

js/src/devtools/Instruments.h

@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Instruments_h__
-#define Instruments_h__
+#ifndef devtools_Instruments_h
+#define devtools_Instruments_h
 
 #ifdef __APPLE__
 
@@ -18,4 +18,4 @@ void Stop(const char* profileName);
 
 #endif /* __APPLE__ */
 
-#endif /* Instruments_h__ */
+#endif /* devtools_Instruments_h */

js/src/devtools/sharkctl.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef _SHARKCTL_H
-#define _SHARKCTL_H
+#ifndef devtools_sharkctl_h
+#define devtools_sharkctl_h
 
 #ifdef __APPLE__
 
@@ -19,6 +19,6 @@ void Stop();
 
 }
 
-#endif
+#endif /* __APPLE__ */
 
-#endif
+#endif /* devtools_sharkctl_h */

js/src/devtools/vprof/vprof.h

@@ -41,8 +41,8 @@
 //    the number of registers can be changed in vprof.h
 //
 
-#ifndef __VPROF__
-#define __VPROF__
+#ifndef devtools_vprof_vprof_h
+#define devtools_vprof_vprof_h
 //
 // If the application for which you want to use vprof is threaded, THREADED must be defined as 1, otherwise define it as 0
 //
@@ -272,4 +272,4 @@ typedef struct entry {
 #define _DVAR2 ((entry_t)vprofID)->dvar[2]
 #define _DVAR3 ((entry_t)vprofID)->dvar[3]
 
-#endif /* __VPROF__ */
+#endif /* devtools_vprof_vprof_h */

js/src/ds/BitArray.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef BitArray_h__
-#define BitArray_h__
+#ifndef ds_BitArray_h
+#define ds_BitArray_h
 
 #include "jstypes.h" 
 
@@ -61,4 +61,4 @@ class BitArray {
 
 } /* namespace js */
 
-#endif
+#endif /* ds_BitArray_h */

js/src/ds/InlineMap.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef InlineMap_h__
-#define InlineMap_h__
+#ifndef ds_InlineMap_h
+#define ds_InlineMap_h
 
 #include "js/HashTable.h"
 
@@ -373,4 +373,4 @@ class InlineMap
 
 } /* namespace js */
 
-#endif
+#endif /* ds_InlineMap_h */

js/src/ds/LifoAlloc.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef LifoAlloc_h__
-#define LifoAlloc_h__
+#ifndef ds_LifoAlloc_h
+#define ds_LifoAlloc_h
 
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MemoryChecking.h"
@@ -408,4 +408,4 @@ class LifoAllocScope
 
 } // namespace js
 
-#endif
+#endif /* ds_LifoAlloc_h */

js/src/ds/PriorityQueue.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jspriorityqueue_h_
-#define jspriorityqueue_h_
+#ifndef ds_PriorityQueue_h
+#define ds_PriorityQueue_h
 
 #include "js/Vector.h"
 
@@ -132,4 +132,4 @@ class PriorityQueue
 
 }  /* namespace js */
 
-#endif /* jspriorityqueue_h_ */
+#endif /* ds_PriorityQueue_h */

js/src/ds/Sort.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Sort_h__
-#define Sort_h__
+#ifndef ds_Sort_h
+#define ds_Sort_h
 
 #include "jstypes.h"
 
@@ -134,4 +134,4 @@ MergeSort(T *array, size_t nelems, T *scratch, Comparator c)
 
 } /* namespace js */
 
-#endif
+#endif /* ds_Sort_h */

js/src/ds/SplayTree.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jssplaytree_h_
-#define jssplaytree_h_
+#ifndef ds_SplayTree_h
+#define ds_SplayTree_h
 
 #include "LifoAlloc.h"
 
@@ -277,4 +277,4 @@ class SplayTree
 
 }  /* namespace js */
 
-#endif /* jssplaytree_h_ */
+#endif /* ds_SplayTree_h */

js/src/editline/editline.h

@@ -3,6 +3,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef editline_editline_h
+#define editline_editline_h
+
 /*
  * Copyright 1992,1993 Simmule Turner and Rich Salz.  All rights reserved.
  *
@@ -99,3 +102,4 @@ extern int	strlen();
 extern int	strncmp();
 #endif	/* !defined(HAVE_STDLIB) */
 
+#endif /* editline_editline_h */

js/src/editline/unix.h

@@ -3,6 +3,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef editline_unix_h
+#define editline_unix_h
+
 /*
  * Copyright 1992,1993 Simmule Turner and Rich Salz.  All rights reserved.
  *
@@ -46,3 +49,4 @@ typedef struct direct	DIRENTRY;
 #define S_ISDIR(m)		(((m) & S_IFMT) == S_IFDIR)
 #endif	/* !defined(S_ISDIR) */
 
+#endif /* editline_unix_h */

js/src/frontend/BytecodeCompiler.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef BytecodeCompiler_h__
-#define BytecodeCompiler_h__
+#ifndef frontend_BytecodeCompiler_h
+#define frontend_BytecodeCompiler_h
 
 #include "jsapi.h"
 
@@ -57,4 +57,4 @@ MarkParser(JSTracer *trc, AutoGCRooter *parser);
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* BytecodeCompiler_h__ */
+#endif /* frontend_BytecodeCompiler_h */

js/src/frontend/BytecodeEmitter-inl.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef BytecodeEmitter_inl_h__
-#define BytecodeEmitter_inl_h__
+#ifndef frontend_BytecodeEmitter_inl_h
+#define frontend_BytecodeEmitter_inl_h
 
 #include "frontend/BytecodeEmitter.h"
 #include "frontend/Parser.h"
@@ -22,4 +22,4 @@ BytecodeEmitter::tokenStream()
 } // namespace frontend
 } // namespace js
 
-#endif // BytecodeEmitter_inl_h__
+#endif /* frontend_BytecodeEmitter_inl_h */

js/src/frontend/BytecodeEmitter.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef BytecodeEmitter_h__
-#define BytecodeEmitter_h__
+#ifndef frontend_BytecodeEmitter_h
+#define frontend_BytecodeEmitter_h
 
 /*
  * JS bytecode generation.
@@ -297,4 +297,4 @@ BytecodeEmitter::countFinalSourceNotes()
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* BytecodeEmitter_h__ */
+#endif /* frontend_BytecodeEmitter_h */

js/src/frontend/FoldConstants.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef FoldConstants_h__
-#define FoldConstants_h__
+#ifndef frontend_FoldConstants_h
+#define frontend_FoldConstants_h
 
 #include "jsprvtd.h"
 
@@ -34,4 +34,4 @@ FoldConstants(JSContext *cx, typename ParseHandler::Node *pnp,
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* FoldConstants_h__ */
+#endif /* frontend_FoldConstants_h */

js/src/frontend/FullParseHandler.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef FullParseHandler_h__
-#define FullParseHandler_h__
+#ifndef frontend_FullParseHandler_h
+#define frontend_FullParseHandler_h
 
 #include "mozilla/PodOperations.h"
 
@@ -542,4 +542,4 @@ FullParseHandler::makeAssignment(ParseNode *pn, ParseNode *rhs)
 } // frontend
 } // js
 
-#endif /* FullParseHandler_h__ */
+#endif /* frontend_FullParseHandler_h */

js/src/frontend/NameFunctions.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef NameFunctions_h__
-#define NameFunctions_h__
+#ifndef frontend_NameFunctions_h
+#define frontend_NameFunctions_h
 
 struct JSContext;
 
@@ -20,4 +20,4 @@ NameFunctions(JSContext *cx, ParseNode *pn);
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* NameFunctions_h__ */
+#endif /* frontend_NameFunctions_h */

js/src/frontend/ParseMaps-inl.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ParseMapPool_inl_h__
-#define ParseMapPool_inl_h__
+#ifndef frontend_ParseMaps_inl_h
+#define frontend_ParseMaps_inl_h
 
 #include "jscntxt.h"
 
@@ -119,4 +119,4 @@ AtomDecls<ParseHandler>::~AtomDecls()
 } /* namespace frontend */
 } /* namespace js */
 
-#endif
+#endif /* frontend_ParseMaps_inl_h */

js/src/frontend/ParseMaps.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ParseMaps_h__
-#define ParseMaps_h__
+#ifndef frontend_ParseMaps_h
+#define frontend_ParseMaps_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/TypeTraits.h"
@@ -468,4 +468,4 @@ struct IsPod<js::frontend::DefinitionList> : TrueType {};
 
 } /* namespace mozilla */
 
-#endif
+#endif /* frontend_ParseMaps_h */

js/src/frontend/ParseNode-inl.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ParseNode_inl_h__
-#define ParseNode_inl_h__
+#ifndef frontend_ParseNode_inl_h
+#define frontend_ParseNode_inl_h
 
 #include "frontend/ParseNode.h"
 #include "frontend/SharedContext.h"
@@ -47,4 +47,4 @@ ParseNode::atom() const
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* ParseNode_inl_h__ */
+#endif /* frontend_ParseNode_inl_h */

js/src/frontend/ParseNode.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef ParseNode_h__
-#define ParseNode_h__
+#ifndef frontend_ParseNode_h
+#define frontend_ParseNode_h
 
 #include "mozilla/Attributes.h"
 
@@ -1427,4 +1427,4 @@ enum FunctionSyntaxKind { Expression, Statement, Arrow };
 } /* namespace frontend */
 } /* namespace js */
 
-#endif /* ParseNode_h__ */
+#endif /* frontend_ParseNode_h */

js/src/frontend/Parser-inl.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Parser_inl_h__
-#define Parser_inl_h__
+#ifndef frontend_Parser_inl
+#define frontend_Parser_inl
 
 #include "frontend/BytecodeCompiler.h"
 #include "frontend/Parser.h"
@@ -118,5 +118,4 @@ CheckStrictBinding(JSContext *cx, ParseHandler *handler, ParseContext<ParseHandl
 } // namespace frontend
 } // namespace js
 
-#endif // Parser_inl_h__
-
+#endif /* frontend_Parser_inl */

js/src/frontend/Parser.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef Parser_h__
-#define Parser_h__
+#ifndef frontend_Parser_h
+#define frontend_Parser_h
 
 /*
  * JS parser definitions.
@@ -566,4 +566,4 @@ Parser<SyntaxParseHandler>::setAssignmentLhsOps(Node pn, JSOp op);
  */
 #define TS(p) (&(p)->tokenStream)
 
-#endif /* Parser_h__ */
+#endif /* frontend_Parser_h */

js/src/frontend/SharedContext-inl.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef SharedContext_inl_h__
-#define SharedContext_inl_h__
+#ifndef frontend_SharedContext_inl_h
+#define frontend_SharedContext_inl_h
 
 #include "frontend/Parser.h"
 #include "frontend/SharedContext.h"
@@ -95,4 +95,4 @@ frontend::FinishPopStatement(ContextT *ct)
 
 } // namespace js
 
-#endif // SharedContext_inl_h__
+#endif /* frontend_SharedContext_inl_h */

js/src/frontend/SharedContext.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef SharedContext_h__
-#define SharedContext_h__
+#ifndef frontend_SharedContext_h
+#define frontend_SharedContext_h
 
 #include "jstypes.h"
 #include "jsatom.h"
@@ -384,4 +384,4 @@ LexicalLookup(ContextT *ct, HandleAtom atom, int *slotp, typename ContextT::Stmt
 
 } // namespace js
 
-#endif // SharedContext_h__
+#endif /* frontend_SharedContext_h */

js/src/frontend/SourceNotes.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef SourceNotes_h__
-#define SourceNotes_h__
+#ifndef frontend_SourceNotes_h
+#define frontend_SourceNotes_h
 
 #include "jsprvtd.h"
 
@@ -159,4 +159,4 @@ extern JS_FRIEND_API(unsigned)         js_SrcNoteLength(jssrcnote *sn);
 extern JS_FRIEND_API(ptrdiff_t)
 js_GetSrcNoteOffset(jssrcnote *sn, unsigned which);
 
-#endif  // SourceNotes_h__
+#endif /* frontend_SourceNotes_h */

js/src/frontend/SyntaxParseHandler.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef SyntaxParseHandler_h__
-#define SyntaxParseHandler_h__
+#ifndef frontend_SyntaxParseHandler_h
+#define frontend_SyntaxParseHandler_h
 
 namespace js {
 namespace frontend {
@@ -216,4 +216,4 @@ class SyntaxParseHandler
 } // namespace frontend
 } // namespace js
 
-#endif /* SyntaxParseHandler_h__ */
+#endif /* frontend_SyntaxParseHandler_h */

js/src/frontend/TokenStream.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef TokenStream_h__
-#define TokenStream_h__
+#ifndef frontend_TokenStream_h
+#define frontend_TokenStream_h
 
 /*
  * JS lexical scanner interface.
@@ -956,4 +956,4 @@ extern const char *
 TokenKindToString(js::frontend::TokenKind tt);
 #endif
 
-#endif /* TokenStream_h__ */
+#endif /* frontend_TokenStream_h */

js/src/gc/Barrier-inl.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_barrier_inl_h___
-#define jsgc_barrier_inl_h___
+#ifndef gc_Barrier_inl_h
+#define gc_Barrier_inl_h
 
 #include "gc/Barrier.h"
 #include "gc/Marking.h"
@@ -585,4 +585,4 @@ ReadBarrieredValue::toObject() const
 
 } /* namespace js */
 
-#endif /* jsgc_barrier_inl_h___ */
+#endif /* gc_Barrier_inl_h */

js/src/gc/Barrier.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_barrier_h___
-#define jsgc_barrier_h___
+#ifndef gc_Barrier_h
+#define gc_Barrier_h
 
 #include "jsapi.h"
 
@@ -659,4 +659,4 @@ template <> struct IsRelocatableHeapType<HeapId>    { static const bool result =
 } /* namespace tl */
 } /* namespace js */
 
-#endif /* jsgc_barrier_h___ */
+#endif /* gc_Barrier_h */

js/src/gc/FindSCCs-inl.h

@@ -4,6 +4,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifndef gc_FindSCCs_inl_h
+#define gc_FindSCCs_inl_h
+
 #include "jsfriendapi.h"
 
 #include "gc/FindSCCs.h"
@@ -145,3 +148,5 @@ ComponentFinder<Node>::mergeGroups(Node *first)
 
 } /* namespace gc */
 } /* namespace js */
+
+#endif /* gc_FindSCCs_inl_h */

js/src/gc/FindSCCs.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef gc_findsccs_h___
-#define gc_findsccs_h___
+#ifndef gc_FindSCCs_h
+#define gc_FindSCCs_h
 
 #include "jsutil.h"
 
@@ -99,4 +99,4 @@ class ComponentFinder
 } /* namespace gc */
 } /* namespace js */
 
-#endif /* gc_findsccs_h___ */
+#endif /* gc_FindSCCs_h */

js/src/gc/GCInternals.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_internal_h___
-#define jsgc_internal_h___
+#ifndef gc_GCInternals_h
+#define gc_GCInternals_h
 
 #include "jsapi.h"
 
@@ -144,4 +144,4 @@ struct AutoStopVerifyingBarriers
 } /* namespace gc */
 } /* namespace js */
 
-#endif /* jsgc_internal_h___ */
+#endif /* gc_GCInternals_h */

js/src/gc/Heap.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef gc_heap_h___
-#define gc_heap_h___
+#ifndef gc_Heap_h
+#define gc_Heap_h
 
 #include "mozilla/Attributes.h"
 #include "mozilla/PodOperations.h"
@@ -1063,4 +1063,4 @@ InFreeList(ArenaHeader *aheader, void *thing)
 } /* namespace gc */
 } /* namespace js */
 
-#endif /* gc_heap_h___ */
+#endif /* gc_Heap_h */

js/src/gc/Marking.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef gc_marking_h___
-#define gc_marking_h___
+#ifndef gc_Marking_h
+#define gc_Marking_h
 
 #include "jsgc.h"
 #include "jscntxt.h"
@@ -410,4 +410,4 @@ TraceChildren(JSTracer *trc, void *thing, JSGCTraceKind kind);
 
 } /* namespace js */
 
-#endif /* gc_marking_h___ */
+#endif /* gc_Marking_h */

js/src/gc/Memory.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef jsgc_memory_h___
-#define jsgc_memory_h___
+#ifndef gc_Memory_h
+#define gc_Memory_h
 
 #include <stddef.h>
 #include "jsgc.h"
@@ -36,4 +36,4 @@ size_t GetPageFaultCount();
 } // namespace gc
 } // namespace js
 
-#endif // jsgc_memory_h___
+#endif /* gc_Memory_h */