Bug 692277 - Part b: Remove js/src from xpconnect LOCAL_INCLUDES; r=luke (045c664f) · Commits · Tommy Webb / Tor Browser

js/src/jsfriendapi.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,12 @@ AutoSwitchCompartment::~AutoSwitchCompartment()
		cx->compartment = oldCompartment;
		}

		JS_FRIEND_API(bool)
		js::IsSystemCompartment(const JSCompartment *c)
		{
		return c->isSystemCompartment;
		}

		JS_FRIEND_API(bool)
		js::IsScopeObject(const JSObject *obj)
		{

+12 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,9 @@ JS_FRIEND_API(JSBool) obj_defineGetter(JSContext cx, uintN argc, js::Value vp)
		JS_FRIEND_API(JSBool) obj_defineSetter(JSContext cx, uintN argc, js::Value vp);
		#endif

		extern JS_FRIEND_API(bool)
		IsSystemCompartment(const JSCompartment *compartment);

		/*
		* Check whether it is OK to assign an undeclared property with name
		* propname of the global object in the current script on cx. Reports
		@@ -438,6 +441,15 @@ JS_FRIEND_API(JSString *)
		GetPCCountScriptContents(JSContext *cx, size_t script);

		} /* namespace js */

		/*
		* If protoKey is not JSProto_Null, then clasp is ignored. If protoKey is
		* JSProto_Null, clasp must non-null.
		*/
		extern JS_FRIEND_API(JSBool)
		js_GetClassPrototype(JSContext cx, JSObject scope, JSProtoKey protoKey,
		JSObject *protop, js::Class clasp = NULL);

		#endif

		#endif /* jsfriendapi_h___ */

+6 −0

Original line number	Diff line number	Diff line
		@@ -1230,6 +1230,12 @@ const size_t INITIAL_CHUNK_CAPACITY = 16 * 1024 * 1024 / ChunkSize;
		/* The number of GC cycles an empty chunk can survive before been released. */
		const size_t MAX_EMPTY_CHUNK_AGE = 4;

		inline Cell *
		AsCell(JSObject *obj)
		{
		return reinterpret_cast<Cell *>(obj);
		}

		} /* namespace gc */

		struct GCPtrHasher

+0 −8

Original line number	Diff line number	Diff line
		@@ -1901,14 +1901,6 @@ CheckAccess(JSContext cx, JSObject obj, jsid id, JSAccessMode mode,
		extern bool
		js_IsDelegate(JSContext cx, JSObject obj, const js::Value &v);

		/*
		* If protoKey is not JSProto_Null, then clasp is ignored. If protoKey is
		* JSProto_Null, clasp must non-null.
		*/
		extern JS_FRIEND_API(JSBool)
		js_GetClassPrototype(JSContext cx, JSObject scope, JSProtoKey protoKey,
		JSObject *protop, js::Class clasp = NULL);

		/*
		* Wrap boolean, number or string as Boolean, Number or String object.
		* *vp must not be an object, null or undefined.

+0 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ include $(topsrcdir)/config/config.mk
		LOCAL_INCLUDES = \
		-I$(srcdir)/../wrappers \
		-I$(srcdir)/../loader \
		-I$(topsrcdir)/js/src \
		-I$(topsrcdir)/caps/include \
		-I$(topsrcdir)/content/base/src \
		-I$(topsrcdir)/content/html/content/src \