Bug 911043 (part 2) - Remove unnecessary jsapi.h includes in SpiderMonkey. r=luke.

--HG--
extra : rebase_source : 2320e364bb9efb59283a572e100185702ef494da

js/src/builtin/BinaryData.h

@@ -7,7 +7,6 @@
 #ifndef builtin_BinaryData_h
 #define builtin_BinaryData_h
 
-#include "jsapi.h"
 #include "jsobj.h"
 
 #include "builtin/TypeRepresentation.h"

js/src/builtin/Eval.h

@@ -7,7 +7,6 @@
 #ifndef builtin_Eval_h
 #define builtin_Eval_h
 
-#include "jsapi.h"
 #include "jsbytecode.h"
 #include "NamespaceImports.h"
 

js/src/builtin/Intl.h

@@ -7,7 +7,6 @@
 #ifndef builtin_Intl_h
 #define builtin_Intl_h
 
-#include "jsapi.h"
 #include "NamespaceImports.h"
 
 #include "js/RootingAPI.h"

js/src/builtin/TestingFunctions.h

@@ -7,7 +7,6 @@
 #ifndef builtin_TestingFunctions_h
 #define builtin_TestingFunctions_h
 
-#include "jsapi.h"
 #include "NamespaceImports.h"
 
 namespace js {
@@ -16,10 +15,10 @@ bool
 DefineTestingFunctions(JSContext *cx, HandleObject obj);
 
 bool
-testingFunc_inParallelSection(JSContext *cx, unsigned argc, jsval *vp);
+testingFunc_inParallelSection(JSContext *cx, unsigned argc, Value *vp);
 
 bool
-testingFunc_bailout(JSContext *cx, unsigned argc, jsval *vp);
+testingFunc_bailout(JSContext *cx, unsigned argc, Value *vp);
 
 } /* namespace js */
 

js/src/ds/IdValuePair.h

@@ -7,7 +7,6 @@
 #ifndef ds_IdValuePair_h
 #define ds_IdValuePair_h
 
-#include "jsapi.h"
 #include "NamespaceImports.h"
 
 namespace js {

js/src/frontend/BytecodeCompiler.h

@@ -7,7 +7,6 @@
 #ifndef frontend_BytecodeCompiler_h
 #define frontend_BytecodeCompiler_h
 
-#include "jsapi.h"
 #include "NamespaceImports.h"
 
 class JSLinearString;

js/src/gc/Statistics.h

@@ -10,10 +10,11 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/PodOperations.h"
 
-#include "jsapi.h"
+#include "jsalloc.h"
 #include "jspubtd.h"
 
 #include "js/GCAPI.h"
+#include "js/Vector.h"
 
 struct JSCompartment;
 

js/src/jit/AsmJS.h

@@ -7,7 +7,9 @@
 #ifndef jit_AsmJS_h
 #define jit_AsmJS_h
 
-#include "jsapi.h"
+#include <stddef.h>
+
+#include "js/TypeDecls.h"
 
 namespace js {
 

js/src/jit/AsmJSLink.h

@@ -7,7 +7,6 @@
 #ifndef jit_AsmJSLink_h
 #define jit_AsmJSLink_h
 
-#include "jsapi.h"
 #include "NamespaceImports.h"
 
 namespace js {

js/src/jit/C1Spewer.h

@@ -9,7 +9,6 @@
 
 #ifdef DEBUG
 
-#include "jsapi.h"
 #include "NamespaceImports.h"
 
 #include "js/RootingAPI.h"

js/src/jsapi.h

@@ -9,11 +9,9 @@
 #ifndef jsapi_h
 #define jsapi_h
 
-#include "mozilla/Compiler.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/MemoryReporting.h"
 #include "mozilla/RangedPtr.h"
-#include "mozilla/TypeTraits.h"
 
 #include <stdarg.h>
 #include <stddef.h>
@@ -24,7 +22,6 @@
 #include "jspubtd.h"
 
 #include "js/CallArgs.h"
-#include "js/CallNonGenericMethod.h"
 #include "js/Class.h"
 #include "js/HashTable.h"
 #include "js/Id.h"

js/src/jsmath.h

@@ -9,7 +9,6 @@
 
 #include "mozilla/MemoryReporting.h"
 
-#include "jsapi.h"
 #include "NamespaceImports.h"
 
 namespace js {

js/src/jsnum.h

@@ -9,7 +9,6 @@
 
 #include "mozilla/FloatingPoint.h"
 
-#include "jsapi.h"
 #include "NamespaceImports.h"
 
 #include "vm/NumericConversions.h"

js/src/jspropertytree.cpp

@@ -6,7 +6,6 @@
 
 #include "jspropertytree.h"
 
-#include "jsapi.h"
 #include "jscntxt.h"
 #include "jsgc.h"
 #include "jstypes.h"

js/src/jsstr.h

@@ -10,13 +10,13 @@
 #include "mozilla/HashFunctions.h"
 #include "mozilla/PodOperations.h"
 
-#include "jsapi.h"
 #include "jsutil.h"
 #include "NamespaceImports.h"
 
 #include "js/RootingAPI.h"
 #include "vm/Unicode.h"
 
+class JSAutoByteString;
 class JSFlatString;
 class JSLinearString;
 class JSStableString;

js/src/jswatchpoint.h

@@ -8,7 +8,6 @@
 #define jswatchpoint_h
 
 #include "jsalloc.h"
-#include "jsapi.h"
 
 #include "gc/Barrier.h"
 #include "js/HashTable.h"

js/src/perf/jsperf.h

@@ -6,7 +6,10 @@
 #ifndef perf_jsperf_h
 #define perf_jsperf_h
 
-#include "jsapi.h"
+#include "jstypes.h"
+
+#include "js/TypeDecls.h"
+#include "js/Utility.h"
 
 namespace JS {
 
@@ -118,12 +121,12 @@ extern JS_FRIEND_API(JSObject*)
     RegisterPerfMeasurement(JSContext *cx, JSObject *global);
 
 /*
- * Given a jsval which contains an instance of the aforementioned
+ * Given a Value which contains an instance of the aforementioned
  * wrapper class, extract the C++ object.  Returns NULL if the
- * jsval is not an instance of the wrapper.
+ * Value is not an instance of the wrapper.
  */
 extern JS_FRIEND_API(PerfMeasurement*)
-    ExtractPerfMeasurement(jsval wrapper);
+    ExtractPerfMeasurement(Value wrapper);
 
 } // namespace JS
 

js/src/vm/Xdr.h

@@ -9,7 +9,6 @@
 
 #include "mozilla/Endian.h"
 
-#include "jsapi.h"
 #include "jsatom.h"
 
 namespace js {