Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 905017 (part 1) - Minimize inclusions of JS engine headers in .h and .idl files. r=billm.

Browse Source 
--HG--
extra : rebase_source : 984c61ab12f46be0509b1ce0d458d9a6e5841c64
This commit is contained in:
Nicholas Nethercote 2013-08-17 15:50:18 -07:00
parent a24a19c1e4
commit 2585de9a07
142 changed files with 153 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caps/include/nsScriptSecurityManager.h
View File

@ -9,8 +9,6 @@
#include "nsIScriptSecurityManager.h"
#include "nsIPrincipal.h"
#include "jsapi.h"
#include "jsdbgapi.h"
#include "nsIXPCSecurityManager.h"
#include "nsInterfaceHashtable.h"
#include "nsHashtable.h"
@ -23,6 +21,10 @@
#include <stdint.h>
namespace JS {
template <typename T> class Handle;
template <typename T> class MutableHandle;
}
class nsIDocShell;
class nsString;
class nsIClassInfo;

2
content/base/public/nsIDOMFile.idl
View File

@ -6,8 +6,6 @@
#include "domstubs.idl"
%{C++
#include "jsapi.h"
namespace mozilla {
namespace dom {
namespace indexedDB {

5
content/base/public/nsIXMLHttpRequest.idl
View File

@ -16,11 +16,6 @@ interface nsIGlobalObject;
interface nsIInputStream;
interface nsIDOMBlob;
%{C++
// for jsval
#include "jsapi.h"
%}
[scriptable, builtinclass, uuid(ac97e161-9f1d-4163-adc9-e9a59e18682c)]
interface nsIXMLHttpRequestEventTarget : nsIDOMEventTarget {
// event handler attributes

1
content/base/src/WebSocket.h
View File

@ -22,7 +22,6 @@
// Need this for BinaryType.
#include "mozilla/dom/WebSocketBinding.h"
#include "jsfriendapi.h"
#include "nsISupportsUtils.h"
#include "nsCOMPtr.h"
#include "nsString.h"

3
content/base/src/nsFrameMessageManager.h
View File

@ -23,6 +23,7 @@
#include "nsThreadUtils.h"
#include "nsWeakPtr.h"
#include "mozilla/Attributes.h"
#include "js/RootingAPI.h"
namespace mozilla {
namespace dom {
@ -135,7 +136,7 @@ class MOZ_STACK_CLASS SameProcessCpowHolder : public CpowHolder
bool ToObject(JSContext* aCx, JSObject** aObjp);
private:
JS::RootedObject mObj;
JS::Rooted<JSObject*> mObj;
};
class nsFrameMessageManager MOZ_FINAL : public nsIContentFrameMessageManager,

1
content/base/src/nsInProcessTabChildGlobal.h
View File

@ -15,7 +15,6 @@
#include "nsIScriptObjectPrincipal.h"
#include "nsIScriptContext.h"
#include "nsIClassInfo.h"
#include "jsapi.h"
#include "nsIDocShell.h"
#include "nsIDOMElement.h"
#include "nsCOMArray.h"

1
content/base/src/nsXMLHttpRequest.h
View File

@ -17,7 +17,6 @@
#include "nsIDocument.h"
#include "nsIStreamListener.h"
#include "nsWeakReference.h"
#include "jsapi.h"
#include "nsIScriptContext.h"
#include "nsIChannelEventSink.h"
#include "nsIAsyncVerifyRedirectCallback.h"

2
content/canvas/src/ImageData.h
View File

@ -16,8 +16,6 @@
#include "nsTraceRefcnt.h"
#include "xpcpublic.h"
#include "jsapi.h"
namespace mozilla {
namespace dom {

7
content/canvas/src/WebGLActiveInfo.h
View File

@ -9,7 +9,12 @@
#include "WebGLTypes.h"
#include "nsISupports.h"
#include "nsString.h"
#include "jsapi.h"
struct JSContext;
class JSObject;
namespace JS {
template <typename T> class Handle;
}
namespace mozilla {

1
content/events/src/nsDOMMessageEvent.h
View File

@ -9,7 +9,6 @@
#include "nsIDOMMessageEvent.h"
#include "nsDOMEvent.h"
#include "nsCycleCollectionParticipant.h"
#include "jsapi.h"
#include "mozilla/dom/MessageEventBinding.h"
/**

1
content/events/src/nsEventListenerManager.h
View File

@ -6,7 +6,6 @@
#ifndef nsEventListenerManager_h__
#define nsEventListenerManager_h__
#include "jsapi.h"
#include "mozilla/dom/EventListenerBinding.h"
#include "mozilla/MemoryReporting.h"
#include "nsAutoPtr.h"

1
content/html/content/src/HTMLPropertiesCollection.h
View File

@ -19,7 +19,6 @@
#include "nsIHTMLCollection.h"
#include "nsHashKeys.h"
#include "nsRefPtrHashtable.h"
#include "jsapi.h"
class nsGenericHTMLElement;
class nsIDocument;

1
content/html/content/src/nsDOMStringMap.h
View File

@ -13,7 +13,6 @@
#include "nsString.h"
#include "nsWrapperCache.h"
#include "nsGenericHTMLElement.h"
#include "jsfriendapi.h"
namespace mozilla {
class ErrorResult;

1
content/html/document/src/nsHTMLDocument.h
View File

@ -12,7 +12,6 @@
#include "nsIDOMHTMLDocument.h"
#include "nsIDOMHTMLCollection.h"
#include "nsIScriptElement.h"
#include "jsapi.h"
#include "nsTArray.h"
#include "pldhash.h"

1
content/xbl/src/nsXBLBinding.h
View File

@ -15,7 +15,6 @@
#include "nsTArray.h"
#include "nsCycleCollectionParticipant.h"
#include "nsISupportsImpl.h"
#include "jsapi.h"
class nsXBLPrototypeBinding;
class nsIContent;

2
content/xbl/src/nsXBLMaybeCompiled.h
View File

@ -6,8 +6,6 @@
#ifndef nsXBLMaybeCompiled_h__
#define nsXBLMaybeCompiled_h__
#include "js/RootingAPI.h"
/*
* A union containing either a pointer representing uncompiled source or a
* JSObject* representing the compiled result. The class is templated on the

1
content/xbl/src/nsXBLProtoImplMember.h
View File

@ -8,7 +8,6 @@
#include "nsIAtom.h"
#include "nsString.h"
#include "jsapi.h"
#include "nsString.h"
#include "nsIServiceManager.h"
#include "nsContentUtils.h" // For NS_CONTENT_DELETE_LIST_MEMBER.

1
content/xbl/src/nsXBLProtoImplMethod.h
View File

@ -9,7 +9,6 @@
#include "mozilla/Attributes.h"
#include "nsIAtom.h"
#include "nsString.h"
#include "jsapi.h"
#include "nsString.h"
#include "nsXBLMaybeCompiled.h"
#include "nsXBLProtoImplMember.h"

1
content/xbl/src/nsXBLProtoImplProperty.h
View File

@ -9,7 +9,6 @@
#include "mozilla/Attributes.h"
#include "nsIAtom.h"
#include "nsString.h"
#include "jsapi.h"
#include "nsString.h"
#include "nsXBLSerialize.h"
#include "nsXBLMaybeCompiled.h"

6
content/xbl/src/nsXBLPrototypeHandler.h
View File

@ -16,8 +16,6 @@
#include "nsIScriptGlobalObject.h"
#include "nsCycleCollectionParticipant.h"
#include "js/RootingAPI.h"
class JSObject;
class nsIDOMEvent;
class nsIContent;
@ -28,6 +26,10 @@ class nsIObjectInputStream;
class nsIObjectOutputStream;
class nsXBLPrototypeBinding;
namespace JS {
template <typename T> class MutableHandle;
}
namespace mozilla {
namespace dom {
class EventTarget;

7
content/xbl/src/nsXBLSerialize.h
View File

@ -6,12 +6,15 @@
#ifndef nsXBLSerialize_h__
#define nsXBLSerialize_h__
#include "jsapi.h"
#include "nsIObjectInputStream.h"
#include "nsIObjectOutputStream.h"
#include "nsINameSpaceManager.h"
namespace JS {
template <typename T> class Handle;
template <typename T> class MutableHandle;
}
typedef uint8_t XBLBindingSerializeDetails;
// A version number to ensure we don't load cached data in a different

1
content/xul/content/src/nsXULElement.h
View File

@ -34,7 +34,6 @@
#include "nsAutoPtr.h"
#include "nsStyledElement.h"
#include "nsIFrameLoader.h"
#include "jspubtd.h"
#include "nsFrameLoader.h"
class nsIDocument;

3
content/xul/document/src/nsXULPrototypeCache.h
View File

@ -17,11 +17,8 @@
#include "nsIInputStream.h"
#include "nsIStorageStream.h"
#include "jspubtd.h"
#include "mozilla/scache/StartupCache.h"
class nsCSSStyleSheet;
/**

2
dom/base/StructuredCloneTags.h
View File

@ -5,8 +5,6 @@
#ifndef StructuredCloneTags_h__
#define StructuredCloneTags_h__
#include "jsapi.h"
namespace mozilla {
namespace dom {

1
dom/base/WindowNamedPropertiesHandler.h
View File

@ -7,7 +7,6 @@
#ifndef mozilla_dom_WindowNamedPropertiesHandler_h
#define mozilla_dom_WindowNamedPropertiesHandler_h
#include "jsproxy.h"
#include "mozilla/dom/DOMJSProxyHandler.h"
namespace mozilla {

22
dom/base/nsDOMClassInfo.h
View File

@ -266,7 +266,7 @@ public:
NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx,
JSObject *globalObj, JSObject **parentObj) MOZ_OVERRIDE;
NS_IMETHOD AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, jsval *vp, bool *_retval) MOZ_OVERRIDE;
JSObject *obj, jsid id, JS::Value *vp, bool *_retval) MOZ_OVERRIDE;
virtual void PreserveWrapper(nsISupports *aNative) MOZ_OVERRIDE;
@ -355,12 +355,12 @@ protected:
public:
NS_IMETHOD CheckAccess(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, uint32_t mode,
jsval *vp, bool *_retval) MOZ_OVERRIDE;
JS::Value *vp, bool *_retval) MOZ_OVERRIDE;
NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx,
JSObject *globalObj, JSObject **parentObj) MOZ_OVERRIDE;
NS_IMETHODIMP AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, jsval *vp, bool *_retval);
JSObject *obj, jsid id, JS::Value *vp, bool *_retval);
static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
{
@ -419,7 +419,7 @@ protected:
public:
NS_IMETHOD GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, jsval *vp, bool *_retval) MOZ_OVERRIDE;
JSObject *obj, jsid id, JS::Value *vp, bool *_retval) MOZ_OVERRIDE;
private:
// Not implemented, nothing should create an instance of this class.
@ -443,7 +443,7 @@ public:
static bool DocumentAllNewResolve(JSContext *cx, JS::Handle<JSObject*> obj, JS::Handle<jsid> id,
unsigned flags, JS::MutableHandle<JSObject*> objp);
static void ReleaseDocument(JSFreeOp *fop, JSObject *obj);
static bool CallToGetPropMapper(JSContext *cx, unsigned argc, jsval *vp);
static bool CallToGetPropMapper(JSContext *cx, unsigned argc, JS::Value *vp);
};
@ -465,7 +465,7 @@ protected:
public:
NS_IMETHOD GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, jsval *vp, bool *_retval) MOZ_OVERRIDE;
JSObject *obj, jsid id, JS::Value *vp, bool *_retval) MOZ_OVERRIDE;
};
@ -489,7 +489,7 @@ public:
NS_IMETHOD PreCreate(nsISupports *nativeObj, JSContext *cx,
JSObject *globalObj, JSObject **parentObj) MOZ_OVERRIDE;
NS_IMETHOD GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, jsval *vp, bool *_retval) MOZ_OVERRIDE;
JSObject *obj, jsid id, JS::Value *vp, bool *_retval) MOZ_OVERRIDE;
static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
{
@ -611,13 +611,13 @@ protected:
JSObject *obj, jsid id, uint32_t flags,
JSObject **objp, bool *_retval) MOZ_OVERRIDE;
NS_IMETHOD SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, jsval *vp, bool *_retval) MOZ_OVERRIDE;
JSObject *obj, jsid id, JS::Value *vp, bool *_retval) MOZ_OVERRIDE;
NS_IMETHOD GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, jsval *vp, bool *_retval) MOZ_OVERRIDE;
JSObject *obj, jsid id, JS::Value *vp, bool *_retval) MOZ_OVERRIDE;
NS_IMETHOD DelProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsid id, bool *_retval) MOZ_OVERRIDE;
NS_IMETHOD NewEnumerate(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, uint32_t enum_op, jsval *statep,
JSObject *obj, uint32_t enum_op, JS::Value *statep,
jsid *idp, bool *_retval) MOZ_OVERRIDE;
public:
@ -676,7 +676,7 @@ public:
JSObject *obj, const JS::CallArgs &args, bool *_retval) MOZ_OVERRIDE;
NS_IMETHOD HasInstance(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, const jsval &val, bool *bp,
JSObject *obj, const JS::Value &val, bool *bp,
bool *_retval);
static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)

1
dom/base/nsDOMJSUtils.h
View File

@ -6,7 +6,6 @@
#ifndef nsDOMJSUtils_h__
#define nsDOMJSUtils_h__
#include "jsapi.h"
#include "nsIScriptContext.h"
class nsIJSArgArray;

1
dom/base/nsGlobalWindow.cpp
View File

@ -183,6 +183,7 @@
#endif
#include "prlog.h"
#include "prenv.h"
#include "prprf.h"
#include "mozilla/dom/indexedDB/IDBFactory.h"
#include "mozilla/dom/quota/QuotaManager.h"

1
dom/base/nsIJSEventListener.h
View File

@ -7,7 +7,6 @@
#define nsIJSEventListener_h__
#include "nsIScriptContext.h"
#include "jsapi.h"
#include "xpcpublic.h"
#include "nsIDOMEventListener.h"
#include "nsIAtom.h"

1
dom/base/nsIJSNativeInitializer.h
View File

@ -7,7 +7,6 @@
#define nsIJSNativeInitializer_h__
#include "nsISupports.h"
#include "jsapi.h"
#define NS_IJSNATIVEINITIALIZER_IID \
{ 0xdb48eee5, 0x89a4, 0x4f18, \

1
dom/base/nsIScriptContext.h
View File

@ -11,7 +11,6 @@
#include "nsISupports.h"
#include "nsCOMPtr.h"
#include "nsIProgrammingLanguage.h"
#include "jsfriendapi.h"
#include "jspubtd.h"
#include "js/GCAPI.h"

2
dom/base/nsJSEnvironment.h
View File

@ -8,8 +8,6 @@
#include "nsIScriptContext.h"
#include "nsIScriptGlobalObject.h"
#include "nsCOMPtr.h"
#include "jsapi.h"
#include "jsfriendapi.h"
#include "nsIObserver.h"
#include "prtime.h"
#include "nsCycleCollectionParticipant.h"

1
dom/base/nsPIDOMWindow.h
View File

@ -19,7 +19,6 @@
#include "nsTArray.h"
#include "nsIURI.h"
#include "mozilla/dom/EventTarget.h"
#include "js/RootingAPI.h"
#define DOM_WINDOW_DESTROYED_TOPIC "dom-window-destroyed"
#define DOM_WINDOW_FROZEN_TOPIC "dom-window-frozen"

1
dom/base/nsStructuredCloneContainer.cpp
View File

@ -13,6 +13,7 @@
#include "nsIXPConnect.h"
#include "nsServiceManagerUtils.h"
#include "nsContentUtils.h"
#include "jsapi.h"
#include "mozilla/Base64.h"

1
dom/base/nsStructuredCloneContainer.h
View File

@ -9,7 +9,6 @@
#define nsStructuredCloneContainer_h__
#include "nsIStructuredCloneContainer.h"
#include "jsapi.h"
#include "mozilla/Attributes.h"
#define NS_STRUCTUREDCLONECONTAINER_CONTRACTID \

3
dom/base/nsWrapperCache.h
View File

@ -8,7 +8,8 @@
#include "nsCycleCollectionParticipant.h"
#include "mozilla/Assertions.h"
#include "js/Value.h"
#include "js/Value.h" // must come before js/RootingAPI.h
#include "js/RootingAPI.h"
struct JSTracer;
class JSObject;

1
dom/base/nsWrapperCacheInlines.h
View File

@ -8,7 +8,6 @@
#include "nsWrapperCache.h"
#include "xpcpublic.h"
#include "jsapi.h"
inline JSObject*
nsWrapperCache::GetWrapper() const

7
dom/bindings/BindingDeclarations.h
View File

@ -14,7 +14,8 @@
#define mozilla_dom_BindingDeclarations_h__
#include "nsStringGlue.h"
#include "jsapi.h"
#include "js/Value.h"
#include "js/RootingAPI.h"
#include "mozilla/Util.h"
#include "nsCOMPtr.h"
#include "nsDOMString.h"
@ -22,6 +23,8 @@
#include "nsTArray.h"
#include "nsAutoPtr.h" // for nsRefPtr member variables
struct JSContext;
class JSObject;
class nsWrapperCache;
// nsGlobalWindow implements nsWrapperCache, but doesn't always use it. Don't
@ -72,7 +75,7 @@ public:
}
private:
JS::RootedObject mGlobalJSObject;
JS::Rooted<JSObject*> mGlobalJSObject;
nsISupports* mGlobalObject;
nsCOMPtr<nsISupports> mGlobalObjectRef;
};

1
dom/bindings/BindingUtils.cpp
View File

@ -24,6 +24,7 @@
#include "XPCQuickStubs.h"
#include "XrayWrapper.h"
#include "nsPrintfCString.h"
#include "prprf.h"
#include "mozilla/dom/HTMLObjectElement.h"
#include "mozilla/dom/HTMLObjectElementBinding.h"

2
dom/bindings/CallbackObject.h
View File

@ -20,7 +20,6 @@
#include "nsISupports.h"
#include "nsISupportsImpl.h"
#include "nsCycleCollectionParticipant.h"
#include "jsapi.h"
#include "jswrapper.h"
#include "mozilla/Assertions.h"
#include "mozilla/ErrorResult.h"
@ -31,7 +30,6 @@
#include "nsJSEnvironment.h"
#include "xpcpublic.h"
#include "nsLayoutStatics.h"
#include "js/RootingAPI.h"
namespace mozilla {
namespace dom {

1
dom/bindings/DOMJSClass.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_DOMJSClass_h
#define mozilla_dom_DOMJSClass_h
#include "jsapi.h"
#include "jsfriendapi.h"
#include "mozilla/Assertions.h"

3
dom/bindings/DOMJSProxyHandler.h
View File

@ -9,9 +9,6 @@
#include "mozilla/Attributes.h"
#include "mozilla/Likely.h"
#include "jsapi.h"
#include "jsfriendapi.h"
#include "jsproxy.h"
#include "xpcpublic.h"
#include "nsStringGlue.h"

1
dom/bindings/TypedArray.h
View File

@ -8,7 +8,6 @@
#define mozilla_dom_TypedArray_h
#include "jsfriendapi.h"
#include "js/RootingAPI.h"
#include "jsapi.h"
#include "mozilla/dom/BindingDeclarations.h"

1
dom/camera/ICameraControl.h
View File

@ -5,7 +5,6 @@
#ifndef DOM_CAMERA_ICAMERACONTROL_H
#define DOM_CAMERA_ICAMERACONTROL_H
#include "jsapi.h"
#include "nsIFile.h"
#include "nsIDOMCameraManager.h"
#include "DictionaryHelpers.h"

5
dom/interfaces/html/nsIDOMHTMLCanvasElement.idl
View File

@ -5,11 +5,6 @@
#include "nsIDOMHTMLElement.idl"
%{C++
// for jsval
#include "jsapi.h"
%}
/**
* The nsIDOMHTMLCanvasElement interface is the interface to a HTML
* <canvas> element.

6
dom/interfaces/json/nsIJSON.idl
View File

@ -9,9 +9,13 @@ interface nsIInputStream;
interface nsIOutputStream;
interface nsIScriptGlobalObject;
[ptr] native JSValPtr(jsval);
[ptr] native JSValPtr(JS::Value);
[ptr] native JSContext(JSContext);
%{C++
namespace JS { class Value; }
%}
/**
* Don't use this! Use JSON.parse and JSON.stringify directly.
*/

3
dom/ipc/StructuredCloneUtils.h
View File

@ -7,11 +7,12 @@
#ifndef mozilla_dom_StructuredCloneUtils_h
#define mozilla_dom_StructuredCloneUtils_h
#include "jsapi.h"
#include "nsCOMPtr.h"
#include "nsTArray.h"
#include "nsIDOMFile.h"
#include "jsapi.h"
namespace mozilla {
struct SerializedStructuredCloneBuffer;

1
dom/ipc/TabChild.h
View File

@ -22,7 +22,6 @@
#include "nsIDOMEventListener.h"
#include "nsIInterfaceRequestor.h"
#include "nsIWindowProvider.h"
#include "jsapi.h"
#include "nsIDOMWindow.h"
#include "nsIDocShell.h"
#include "nsIDocShellTreeItem.h"

1
dom/ipc/TabParent.h
View File

@ -9,7 +9,6 @@
#include "base/basictypes.h"
#include "jsapi.h"
#include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/PBrowserParent.h"
#include "mozilla/dom/PContentDialogParent.h"

1
dom/mobilemessage/src/MmsMessage.h
View File

@ -8,7 +8,6 @@
#include "nsIDOMMozMmsMessage.h"
#include "nsString.h"
#include "jspubtd.h"
#include "mozilla/dom/mobilemessage/Types.h"
#include "mozilla/Attributes.h"
#include "DictionaryHelpers.h"

1
dom/mobilemessage/src/MobileMessageThread.h
View File

@ -10,7 +10,6 @@
#include "mozilla/dom/mobilemessage/SmsTypes.h"
#include "nsIDOMMozMobileMessageThread.h"
#include "nsString.h"
#include "jspubtd.h"
namespace mozilla {
namespace dom {

1
dom/mobilemessage/src/SmsMessage.h
View File

@ -9,7 +9,6 @@
#include "mozilla/dom/mobilemessage/SmsTypes.h"
#include "nsIDOMMozSmsMessage.h"
#include "nsString.h"
#include "jspubtd.h"
#include "mozilla/dom/mobilemessage/Types.h"
#include "mozilla/Attributes.h"

1
dom/plugins/base/nsJSNPRuntime.h
View File

@ -7,7 +7,6 @@
#define nsJSNPRuntime_h_
#include "nscore.h"
#include "jsapi.h"
#include "npapi.h"
#include "npruntime.h"
#include "pldhash.h"

1
dom/plugins/base/nsNPAPIPlugin.h
View File

@ -10,7 +10,6 @@
#include "npfunctions.h"
#include "nsPluginHost.h"
#include "jsapi.h"
#include "nsCxPusher.h"
#include "mozilla/PluginLibrary.h"

1
dom/plugins/ipc/PluginScriptableObjectParent.h
View File

@ -9,7 +9,6 @@
#include "mozilla/plugins/PPluginScriptableObjectParent.h"
#include "jsapi.h"
#include "npfunctions.h"
#include "npruntime.h"

1
dom/src/events/nsJSEventListener.h
View File

@ -11,7 +11,6 @@
#include "nsIDOMKeyEvent.h"
#include "nsIJSEventListener.h"
#include "nsIDOMEventListener.h"
#include "jsapi.h"
#include "nsCOMPtr.h"
#include "nsIAtom.h"
#include "nsIScriptContext.h"

1
dom/src/json/nsJSON.h
View File

@ -6,7 +6,6 @@
#ifndef nsJSON_h__
#define nsJSON_h__
#include "jsapi.h"
#include "nsIJSON.h"
#include "nsString.h"
#include "nsCOMPtr.h"

1
dom/system/OSFileConstants.h
View File

@ -5,7 +5,6 @@
#ifndef mozilla_osfileconstants_h__
#define mozilla_osfileconstants_h__
#include "jspubtd.h"
#include "nsIOSFileConstantsService.h"
#include "mozilla/Attributes.h"

2
dom/workers/Exceptions.h
View File

@ -9,8 +9,6 @@
#include "Workers.h"
#include "jspubtd.h"
// DOMException Codes.
#define INDEX_SIZE_ERR 1
#define DOMSTRING_SIZE_ERR 2

2
dom/workers/File.h
View File

@ -9,8 +9,6 @@
#include "Workers.h"
#include "jspubtd.h"
class nsIDOMFile;
class nsIDOMBlob;

2
dom/workers/Location.h
View File

@ -10,8 +10,6 @@
#include "DOMBindingBase.h"
#include "WorkerPrivate.h"
#include "jspubtd.h"
BEGIN_WORKERS_NAMESPACE
class WorkerLocation MOZ_FINAL : public DOMBindingBase

2
dom/workers/Principal.h
View File

@ -8,8 +8,6 @@
#include "Workers.h"
#include "jspubtd.h"
BEGIN_WORKERS_NAMESPACE
JSPrincipals*

1
dom/workers/RuntimeService.h
View File

@ -11,7 +11,6 @@
#include "nsIObserver.h"
#include "jsapi.h"
#include "mozilla/Attributes.h"
#include "mozilla/Mutex.h"
#include "mozilla/TimeStamp.h"

2
dom/workers/ScriptLoader.h
View File

@ -8,8 +8,6 @@
#include "Workers.h"
#include "jsapi.h"
class nsIPrincipal;
class nsIURI;
class nsIDocument;

1
dom/workers/Worker.h
View File

@ -8,7 +8,6 @@
#include "Workers.h"
#include "jspubtd.h"
#include "mozilla/dom/DOMJSClass.h"
BEGIN_WORKERS_NAMESPACE

1
dom/workers/WorkerPrivate.h
View File

@ -15,7 +15,6 @@
#include "nsIThreadInternal.h"
#include "nsPIDOMWindow.h"
#include "jsapi.h"
#include "mozilla/Assertions.h"
#include "mozilla/CondVar.h"
#include "mozilla/Mutex.h"

1
embedding/components/windowwatcher/src/nsWindowWatcher.h
View File

@ -11,7 +11,6 @@
{0xa21bfa01, 0xf349, 0x4394, {0xa8, 0x4c, 0x8d, 0xe5, 0xcf, 0x7, 0x37, 0xd0}}
#include "nsCOMPtr.h"
#include "jspubtd.h"
#include "mozilla/Mutex.h"
#include "nsIWindowCreator.h" // for stupid compilers
#include "nsIWindowWatcher.h"

2
ipc/glue/SyncChannel.h
View File

@ -10,6 +10,8 @@
#include "mozilla/ipc/AsyncChannel.h"
#include <math.h>
namespace mozilla {
namespace ipc {
//-----------------------------------------------------------------------------

1
ipc/testshell/TestShellParent.h
View File

@ -11,7 +11,6 @@
#include "mozilla/ipc/PTestShellParent.h"
#include "mozilla/ipc/PTestShellCommandParent.h"
#include "jsapi.h"
#include "nsAutoJSValHolder.h"
#include "nsStringGlue.h"

1
js/ipc/JavaScriptParent.cpp
View File

@ -10,6 +10,7 @@
#include "nsJSUtils.h"
#include "jsfriendapi.h"
#include "jsproxy.h"
#include "jswrapper.h"
#include "HeapAPI.h"
#include "xpcprivate.h"
#include "mozilla/Casting.h"

1
js/ipc/JavaScriptParent.h
View File

@ -10,7 +10,6 @@
#include "JavaScriptShared.h"
#include "mozilla/jsipc/PJavaScriptParent.h"
#include "jsclass.h"
#ifdef XP_WIN
#undef GetClassName

3
js/ipc/JavaScriptShared.h
View File

@ -8,9 +8,6 @@
#ifndef mozilla_jsipc_JavaScriptShared_h__
#define mozilla_jsipc_JavaScriptShared_h__
#include "jsapi.h"
#include "jspubtd.h"
#include "js/HashTable.h"
#include "mozilla/dom/DOMTypes.h"
#include "mozilla/jsipc/PJavaScript.h"
#include "nsJSUtils.h"

5
js/jsd/jsd.h
View File

@ -29,12 +29,9 @@
#define JSD_USE_NSPR_LOCKS 1
#endif /* MOZILLA_CLIENT */
#include "jstypes.h"
#include "jsprf.h"
#include "jshash.h" /* Added by JSIFY */
#include "jshash.h"
#include "jsclist.h"
#include "jsdebug.h"
#include "jsapi.h"
#include "jsdbgapi.h"
#include "jsd_lock.h"

1
js/jsd/jsd_text.cpp
View File

@ -10,6 +10,7 @@
#include <ctype.h>
#include "jsd.h"
#include "jsprf.h"
#ifdef DEBUG
void JSD_ASSERT_VALID_SOURCE_TEXT(JSDSourceText* jsdsrc)

1
js/jsd/jsd_xpc.cpp
View File

@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "jsdbgapi.h"
#include "jsfriendapi.h"
#include "jsd_xpc.h"
#include "js/GCAPI.h"

1
js/jsd/jsdebug.h
View File

@ -12,7 +12,6 @@
#define jsdebug_h___
#include "jsapi.h"
#include "jsdbgapi.h"
extern "C" {

2
js/jsd/jshash.h
View File

@ -11,8 +11,8 @@
* API to portable hash table code.
*/
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include "jstypes.h"
extern "C" {

11
js/public/GCAPI.h
View File

@ -9,6 +9,7 @@
#include "js/HeapAPI.h"
#include "js/RootingAPI.h"
#include "js/Value.h"
namespace JS {
@ -207,7 +208,7 @@ PokeGC(JSRuntime *rt);
extern JS_FRIEND_API(bool)
WasIncrementalGC(JSRuntime *rt);
class ObjectPtr
class JS_PUBLIC_API(ObjectPtr)
{
Heap<JSObject *> value;
@ -233,9 +234,7 @@ class ObjectPtr
IncrementalObjectBarrier(value);
}
bool isAboutToBeFinalized() {
return JS_IsAboutToBeFinalized(&value);
}
bool isAboutToBeFinalized();
ObjectPtr &operator=(JSObject *obj) {
IncrementalObjectBarrier(value);
@ -243,9 +242,7 @@ class ObjectPtr
return *this;
}
void trace(JSTracer *trc, const char *name) {
JS_CallHeapObjectTracer(trc, &value, name);
}
void trace(JSTracer *trc, const char *name);
JSObject &operator*() const { return *value; }
JSObject *operator->() const { return value; }

12
js/src/jsfriendapi.cpp
View File

@ -958,6 +958,18 @@ js::GetAnyCompartmentInZone(JS::Zone *zone)
return comp.get();
}
bool
JS::ObjectPtr::isAboutToBeFinalized()
{
return JS_IsAboutToBeFinalized(&value);
}
void
JS::ObjectPtr::trace(JSTracer *trc, const char *name)
{
JS_CallHeapObjectTracer(trc, &value, name);
}
JS_FRIEND_API(JSObject *)
js::GetTestingFunctions(JSContext *cx)
{

6
js/src/jspubtd.h
View File

@ -29,11 +29,17 @@ namespace JS {
*/
class Value;
class AutoIdVector;
class CallArgs;
template <typename T>
class Rooted;
class JS_PUBLIC_API(AutoGCRooter);
class JS_PUBLIC_API(CompileOptions);
class JS_PUBLIC_API(CompartmentOptions);
struct Zone;
} /* namespace JS */

2
js/xpconnect/idl/nsIJSRuntimeService.idl
View File

@ -13,6 +13,8 @@ native xpcContextCallback(xpcContextCallback);
%{C++
#include "jsapi.h" // for JSGCStatus
typedef void
(* xpcGCCallback)(JSGCStatus status);

15
js/xpconnect/idl/nsIXPConnect.idl
View File

@ -23,19 +23,26 @@
#include "xptinfo.h"
#include "nsAXPCNativeCallContext.h"
struct JSFreeOp;
namespace JS {
template <typename T> class Handle;
template <typename T> class MutableHandle;
}
class nsWrapperCache;
%}
/***************************************************************************/
// NB: jsval and jsid are declared in nsIVariant.idl
// NB: jsval and jsid are declared in nsrootidl.idl
[ptr] native JSContextPtr(JSContext);
[ptr] native JSClassPtr(JSClass);
[ptr] native JSFreeOpPtr(JSFreeOp);
[ptr] native JSObjectPtr(JSObject);
[ptr] native JSValPtr(jsval);
[ptr] native JSValConstPtr(const jsval);
[ptr] native JSValPtr(JS::Value);
[ptr] native JSValConstPtr(const JS::Value);
native JSPropertyOp(JSPropertyOp);
native JSEqualityOp(JSEqualityOp);
[ptr] native JSScriptPtr(JSScript);
@ -46,7 +53,7 @@ class nsWrapperCache;
[ptr] native nsWrapperCachePtr(nsWrapperCache);
[ref] native JSCompartmentOptions(JS::CompartmentOptions);
[ref] native JSCallArgsRef(const JS::CallArgs);
native JSHandleId(JS::HandleId);
native JSHandleId(JS::Handle<jsid>);
/***************************************************************************/

7
js/xpconnect/idl/xpcexception.idl
View File

@ -8,11 +8,14 @@
#include "nsIException.idl"
%{ C++
#include "jsapi.h"
struct JSContext;
namespace JS {
class Value;
}
%}
[ptr] native xpcexJSContextPtr(JSContext);
native xpcexJSVal(jsval);
native xpcexJSVal(JS::Value);
[scriptable, uuid(cac29630-7bf2-4e22-811b-46855a7d5af0)]
interface nsIXPCException : nsIException

1
js/xpconnect/loader/mozJSComponentLoader.h
View File

@ -5,7 +5,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "plhash.h"
#include "jsapi.h"
#include "mozilla/ModuleLoader.h"
#include "nsIJSRuntimeService.h"
#include "nsISupports.h"

1
js/xpconnect/loader/mozJSLoaderUtils.h
View File

@ -8,7 +8,6 @@
#define mozJSLoaderUtils_h
#include "nsString.h"
#include "jsapi.h"
class nsIURI;
namespace mozilla {

1
js/xpconnect/loader/mozJSSubScriptLoader.h
View File

@ -4,7 +4,6 @@
* 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 "jsapi.h"
#include "nsCOMPtr.h"
#include "mozIJSSubScriptLoader.h"
#include "nsIScriptSecurityManager.h"

2
js/xpconnect/public/nsAXPCNativeCallContext.h
View File

@ -22,7 +22,7 @@ public:
NS_IMETHOD GetCalleeWrapper(nsIXPConnectWrappedNative **aResult) = 0;
NS_IMETHOD GetJSContext(JSContext **aResult) = 0;
NS_IMETHOD GetArgc(uint32_t *aResult) = 0;
NS_IMETHOD GetArgvPtr(jsval **aResult) = 0;
NS_IMETHOD GetArgvPtr(JS::Value **aResult) = 0;
// Methods added since mozilla 0.6....

2
js/xpconnect/public/nsAutoJSValHolder.h
View File

@ -6,8 +6,6 @@
#ifndef __NSAUTOJSVALHOLDER_H__
#define __NSAUTOJSVALHOLDER_H__
#include "jsapi.h"
#include "nsDebug.h"
/**

1
js/xpconnect/src/XPCComponents.cpp
View File

@ -17,6 +17,7 @@
#include "nsIDOMWindow.h"
#include "XPCJSWeakReference.h"
#include "XPCWrapper.h"
#include "jsdbgapi.h"
#include "jsproxy.h"
#include "WrapperFactory.h"
#include "XrayWrapper.h"

1
js/xpconnect/src/XPCConvert.cpp
View File

@ -23,6 +23,7 @@
#include "jsapi.h"
#include "jsfriendapi.h"
#include "jsprf.h"
#include "JavaScriptParent.h"
#include "mozilla/dom/BindingUtils.h"

2
js/xpconnect/src/XPCDebug.cpp
View File

@ -5,6 +5,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "xpcprivate.h"
#include "jsdbgapi.h"
#include "jsprf.h"
#ifdef XP_WIN
#include <windows.h>

1
js/xpconnect/src/XPCException.cpp
View File

@ -7,6 +7,7 @@
/* An implementaion of nsIException. */
#include "xpcprivate.h"
#include "jsprf.h"
#include "nsError.h"
#include "nsIUnicodeDecoder.h"

2
js/xpconnect/src/XPCInlines.h
View File

@ -12,8 +12,6 @@
#include <algorithm>
#include "jsfriendapi.h"
/***************************************************************************/
inline void

2
js/xpconnect/src/XPCJSRuntime.cpp
View File

@ -31,7 +31,9 @@
#include "nsCCUncollectableMarker.h"
#include "nsCycleCollectionNoteRootCallback.h"
#include "nsScriptLoader.h"
#include "jsdbgapi.h"
#include "jsfriendapi.h"
#include "jsprf.h"
#include "js/MemoryMetrics.h"
#include "mozilla/dom/DOMJSClass.h"
#include "mozilla/dom/BindingUtils.h"

2
js/xpconnect/src/XPCMaps.h
View File

@ -11,8 +11,6 @@
#include "mozilla/MemoryReporting.h"
#include "js/HashTable.h"
#include "jsfriendapi.h"
// Maps...

1
js/xpconnect/src/XPCQuickStubs.cpp
View File

@ -7,6 +7,7 @@
#include "jsapi.h"
#include "jsfriendapi.h"
#include "jsprf.h"
#include "nsCOMPtr.h"
#include "xpcprivate.h"
#include "XPCInlines.h"

2
js/xpconnect/src/XPCStack.cpp
View File

@ -7,6 +7,8 @@
/* Implements nsIStackFrame. */
#include "xpcprivate.h"
#include "jsdbgapi.h"
#include "jsprf.h"
class XPCJSStackFrame : public nsIStackFrame
{

1
js/xpconnect/src/XPCThrower.cpp
View File

@ -9,6 +9,7 @@
#include "xpcprivate.h"
#include "xpcpublic.h"
#include "XPCWrapper.h"
#include "jsprf.h"
bool XPCThrower::sVerbose = true;

1
js/xpconnect/src/XPCVariant.cpp
View File

@ -11,6 +11,7 @@
#include "nsCxPusher.h"
#include "jsfriendapi.h"
#include "jsprf.h"
using namespace JS;
using namespace mozilla;

1
js/xpconnect/src/XPCWrappedJS.cpp
View File

@ -7,6 +7,7 @@
/* Class that wraps JS objects to appear as XPCOM objects. */
#include "xpcprivate.h"
#include "jsprf.h"
#include "nsCxPusher.h"
#include "nsContentUtils.h"
#include "nsProxyRelease.h"

Some files were not shown because too many files have changed in this diff Show More