From ba1e9bce908dc980998d6db98ee5bff4526830d4 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Thu, 10 Oct 2013 15:22:35 -0700 Subject: [PATCH] Bug 925584 - Remove some unnecessary jsapi.h inclusions from .cpp files. r=Ms2ger. --HG-- extra : rebase_source : 41fcb0e922a519ef679c1c1b6293c2b638e83a48 --- .../src/html/HTMLFormControlAccessible.cpp | 1 - caps/src/nsJSPrincipals.cpp | 1 - content/base/src/Element.cpp | 2 -- content/base/src/FragmentOrElement.cpp | 2 +- content/html/content/src/HTMLScriptElement.cpp | 1 - content/html/content/src/HTMLVideoElement.cpp | 1 - content/xbl/src/nsBindingManager.cpp | 1 - content/xul/document/src/nsXULContentSink.cpp | 1 - content/xul/document/src/nsXULPrototypeCache.cpp | 1 - .../xul/templates/src/nsXULContentBuilder.cpp | 1 - dom/base/DOMException.cpp | 1 - dom/base/nsDOMJSUtils.h | 2 +- dom/base/nsGlobalWindow.cpp | 1 - dom/camera/DOMCameraControl.cpp | 1 - dom/camera/GonkCameraControl.cpp | 1 - dom/camera/GonkCameraManager.cpp | 1 - dom/icc/src/StkCommandEvent.cpp | 1 - dom/mobilemessage/src/MobileMessageService.cpp | 1 - dom/mobilemessage/src/android/MmsService.cpp | 1 - dom/mobilemessage/src/android/SmsService.cpp | 1 - dom/mobilemessage/src/fallback/MmsService.cpp | 1 - dom/mobilemessage/src/fallback/SmsService.cpp | 1 - dom/mobilemessage/src/gonk/SmsService.cpp | 1 - dom/mobilemessage/src/ipc/SmsIPCService.cpp | 1 - dom/network/src/MobileConnection.cpp | 1 - dom/network/src/TCPServerSocketChild.cpp | 1 - dom/network/src/TCPServerSocketParent.cpp | 2 -- dom/plugins/base/nsJSNPRuntime.cpp | 1 - dom/src/jsurl/nsJSProtocolHandler.cpp | 1 + dom/wifi/WifiProxyService.cpp | 1 - js/public/RootingAPI.h | 2 +- js/src/TraceLogging.cpp | 1 - js/src/builtin/ParallelArray.cpp | 1 - js/src/devtools/Instruments.cpp | 2 +- js/src/frontend/TokenStream.cpp | 1 - js/src/gc/Iteration.cpp | 1 - js/src/gc/RootMarking.cpp | 1 - js/src/jsapi-tests/testIntTypesABI.cpp | 1 - js/src/jsiter.cpp | 1 - js/src/jsnum.cpp | 1 - js/src/json.cpp | 1 - js/src/jswrapper.cpp | 1 - js/src/vm/Debugger.cpp | 1 - js/src/vm/Interpreter.cpp | 1 - js/src/vm/OldDebugAPI.cpp | 1 - js/src/vm/Shape.cpp | 1 - js/xpconnect/public/xpc_map_end.h | 16 +++++++++------- .../src/peerconnection/PeerConnectionImpl.cpp | 1 - .../src/peerconnection/PeerConnectionMedia.cpp | 1 - storage/src/mozStoragePrivateHelpers.cpp | 1 - .../ctypes/tests/jsctypes-test-finalizer.cpp | 1 - .../components/ctypes/tests/jsctypes-test.cpp | 1 - toolkit/devtools/server/nsJSInspector.cpp | 1 - tools/profiler/nsProfiler.cpp | 2 +- widget/xpwidgets/GfxInfoCollector.cpp | 2 +- xpcom/io/nsBinaryStream.cpp | 1 - xpfe/appshell/src/nsAppShellService.cpp | 1 - 57 files changed, 16 insertions(+), 64 deletions(-) diff --git a/accessible/src/html/HTMLFormControlAccessible.cpp b/accessible/src/html/HTMLFormControlAccessible.cpp index 0f0ea7aaa26..1384b4b35f9 100644 --- a/accessible/src/html/HTMLFormControlAccessible.cpp +++ b/accessible/src/html/HTMLFormControlAccessible.cpp @@ -24,7 +24,6 @@ #include "nsINameSpaceManager.h" #include "nsIPersistentProperties2.h" #include "nsISelectionController.h" -#include "jsapi.h" #include "nsIServiceManager.h" #include "nsITextControlFrame.h" diff --git a/caps/src/nsJSPrincipals.cpp b/caps/src/nsJSPrincipals.cpp index 473f7f3c8c8..b981d1d91d3 100644 --- a/caps/src/nsJSPrincipals.cpp +++ b/caps/src/nsJSPrincipals.cpp @@ -11,7 +11,6 @@ #include "plstr.h" #include "nsXPIDLString.h" #include "nsCOMPtr.h" -#include "jsapi.h" #include "nsIJSRuntimeService.h" #include "nsIServiceManager.h" #include "nsMemory.h" diff --git a/content/base/src/Element.cpp b/content/base/src/Element.cpp index 535c6014f2c..cd951acad11 100644 --- a/content/base/src/Element.cpp +++ b/content/base/src/Element.cpp @@ -84,8 +84,6 @@ #include "nsIBaseWindow.h" #include "nsIWidget.h" -#include "jsapi.h" - #include "nsNodeInfoManager.h" #include "nsICategoryManager.h" #include "nsIDOMDocumentType.h" diff --git a/content/base/src/FragmentOrElement.cpp b/content/base/src/FragmentOrElement.cpp index 1410633ce7d..5530891fa00 100644 --- a/content/base/src/FragmentOrElement.cpp +++ b/content/base/src/FragmentOrElement.cpp @@ -79,7 +79,7 @@ #include "nsIBaseWindow.h" #include "nsIWidget.h" -#include "jsapi.h" +#include "js/GCAPI.h" #include "nsNodeInfoManager.h" #include "nsICategoryManager.h" diff --git a/content/html/content/src/HTMLScriptElement.cpp b/content/html/content/src/HTMLScriptElement.cpp index 1794d7b36ea..236e32c4ce0 100644 --- a/content/html/content/src/HTMLScriptElement.cpp +++ b/content/html/content/src/HTMLScriptElement.cpp @@ -11,7 +11,6 @@ #include "nsNetUtil.h" #include "nsContentUtils.h" #include "nsUnicharUtils.h" // for nsCaseInsensitiveStringComparator() -#include "jsapi.h" #include "nsIScriptContext.h" #include "nsIScriptGlobalObject.h" #include "nsIXPConnect.h" diff --git a/content/html/content/src/HTMLVideoElement.cpp b/content/html/content/src/HTMLVideoElement.cpp index bbc2bee036d..e447eeb6091 100644 --- a/content/html/content/src/HTMLVideoElement.cpp +++ b/content/html/content/src/HTMLVideoElement.cpp @@ -24,7 +24,6 @@ #include "nsIScriptSecurityManager.h" #include "nsIXPConnect.h" -#include "jsapi.h" #include "nsITimer.h" diff --git a/content/xbl/src/nsBindingManager.cpp b/content/xbl/src/nsBindingManager.cpp index 4dc4eb23486..da99a64e2cf 100644 --- a/content/xbl/src/nsBindingManager.cpp +++ b/content/xbl/src/nsBindingManager.cpp @@ -33,7 +33,6 @@ #include "nsRuleProcessorData.h" #include "nsIWeakReference.h" -#include "jsapi.h" #include "nsIXPConnect.h" #include "nsDOMCID.h" #include "nsIDOMScriptObjectFactory.h" diff --git a/content/xul/document/src/nsXULContentSink.cpp b/content/xul/document/src/nsXULContentSink.cpp index e6e33f1abeb..83fe0dccb55 100644 --- a/content/xul/document/src/nsXULContentSink.cpp +++ b/content/xul/document/src/nsXULContentSink.cpp @@ -14,7 +14,6 @@ #include "nsXULContentSink.h" -#include "jsapi.h" #include "jsfriendapi.h" #include "nsCOMPtr.h" diff --git a/content/xul/document/src/nsXULPrototypeCache.cpp b/content/xul/document/src/nsXULPrototypeCache.cpp index 20724f1a69c..bbf8646965a 100644 --- a/content/xul/document/src/nsXULPrototypeCache.cpp +++ b/content/xul/document/src/nsXULPrototypeCache.cpp @@ -22,7 +22,6 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" -#include "jsapi.h" #include "js/Tracer.h" #include "mozilla/Preferences.h" diff --git a/content/xul/templates/src/nsXULContentBuilder.cpp b/content/xul/templates/src/nsXULContentBuilder.cpp index 1210df10abc..22af8a804dd 100644 --- a/content/xul/templates/src/nsXULContentBuilder.cpp +++ b/content/xul/templates/src/nsXULContentBuilder.cpp @@ -33,7 +33,6 @@ #include "mozAutoDocUpdate.h" #include "nsTextNode.h" -#include "jsapi.h" #include "pldhash.h" #include "rdf.h" diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp index 0d2f02b9e9d..af705fa47f7 100644 --- a/dom/base/DOMException.cpp +++ b/dom/base/DOMException.cpp @@ -5,7 +5,6 @@ #include "mozilla/dom/DOMException.h" -#include "jsapi.h" #include "jsprf.h" #include "js/OldDebugAPI.h" #include "mozilla/HoldDropJSObjects.h" diff --git a/dom/base/nsDOMJSUtils.h b/dom/base/nsDOMJSUtils.h index bac8aff6598..5917064a1b9 100644 --- a/dom/base/nsDOMJSUtils.h +++ b/dom/base/nsDOMJSUtils.h @@ -2,11 +2,11 @@ * 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 nsDOMJSUtils_h__ #define nsDOMJSUtils_h__ #include "nsIScriptContext.h" +#include "jsapi.h" class nsIJSArgArray; diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index dbc0be9e523..f7027094a75 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -50,7 +50,6 @@ #include "nsJSUtils.h" #include "jsapi.h" // for JSAutoRequest #include "js/OldDebugAPI.h" // for JS_ClearWatchPointsForObject -#include "jsfriendapi.h" // for JS_GetGlobalForFrame #include "jswrapper.h" #include "nsReadableUtils.h" #include "nsDOMClassInfo.h" diff --git a/dom/camera/DOMCameraControl.cpp b/dom/camera/DOMCameraControl.cpp index 33c43e7ac69..bf7b790cc58 100644 --- a/dom/camera/DOMCameraControl.cpp +++ b/dom/camera/DOMCameraControl.cpp @@ -6,7 +6,6 @@ #include "nsCOMPtr.h" #include "nsDOMClassInfo.h" #include "nsHashPropertyBag.h" -#include "jsapi.h" #include "nsThread.h" #include "DeviceStorage.h" #include "mozilla/dom/CameraControlBinding.h" diff --git a/dom/camera/GonkCameraControl.cpp b/dom/camera/GonkCameraControl.cpp index 9e5a75ae415..dc09e576a8f 100644 --- a/dom/camera/GonkCameraControl.cpp +++ b/dom/camera/GonkCameraControl.cpp @@ -25,7 +25,6 @@ #include "nsCOMPtr.h" #include "nsDOMClassInfo.h" #include "nsMemory.h" -#include "jsapi.h" #include "nsThread.h" #include #include "mozilla/FileUtils.h" diff --git a/dom/camera/GonkCameraManager.cpp b/dom/camera/GonkCameraManager.cpp index a81ed8f54bc..23087d7e55a 100644 --- a/dom/camera/GonkCameraManager.cpp +++ b/dom/camera/GonkCameraManager.cpp @@ -16,7 +16,6 @@ #include -#include "jsapi.h" #include "GonkCameraControl.h" #include "DOMCameraManager.h" #include "CameraCommon.h" diff --git a/dom/icc/src/StkCommandEvent.cpp b/dom/icc/src/StkCommandEvent.cpp index 45c1d2c0b12..66c5b26899b 100644 --- a/dom/icc/src/StkCommandEvent.cpp +++ b/dom/icc/src/StkCommandEvent.cpp @@ -4,7 +4,6 @@ #include "mozilla/dom/StkCommandEvent.h" -#include "jsapi.h" #include "jsfriendapi.h" #include "nsJSON.h" #include "SimToolKit.h" diff --git a/dom/mobilemessage/src/MobileMessageService.cpp b/dom/mobilemessage/src/MobileMessageService.cpp index be591161bfc..8b66a373212 100644 --- a/dom/mobilemessage/src/MobileMessageService.cpp +++ b/dom/mobilemessage/src/MobileMessageService.cpp @@ -7,7 +7,6 @@ #include "MobileMessageThread.h" #include "MobileMessageService.h" #include "SmsSegmentInfo.h" -#include "jsapi.h" namespace mozilla { namespace dom { diff --git a/dom/mobilemessage/src/android/MmsService.cpp b/dom/mobilemessage/src/android/MmsService.cpp index 06df6effb37..6c901435198 100644 --- a/dom/mobilemessage/src/android/MmsService.cpp +++ b/dom/mobilemessage/src/android/MmsService.cpp @@ -6,7 +6,6 @@ #include "MobileMessageCallback.h" #include "MmsService.h" #include "AndroidBridge.h" -#include "jsapi.h" namespace mozilla { namespace dom { diff --git a/dom/mobilemessage/src/android/SmsService.cpp b/dom/mobilemessage/src/android/SmsService.cpp index f3a455fb6bc..69b6358d097 100644 --- a/dom/mobilemessage/src/android/SmsService.cpp +++ b/dom/mobilemessage/src/android/SmsService.cpp @@ -7,7 +7,6 @@ #include "SmsService.h" #include "SmsSegmentInfo.h" #include "AndroidBridge.h" -#include "jsapi.h" namespace mozilla { namespace dom { diff --git a/dom/mobilemessage/src/fallback/MmsService.cpp b/dom/mobilemessage/src/fallback/MmsService.cpp index 11d5bcebed4..9b09f3b772b 100644 --- a/dom/mobilemessage/src/fallback/MmsService.cpp +++ b/dom/mobilemessage/src/fallback/MmsService.cpp @@ -5,7 +5,6 @@ #include "MobileMessageCallback.h" #include "MmsService.h" -#include "jsapi.h" namespace mozilla { namespace dom { diff --git a/dom/mobilemessage/src/fallback/SmsService.cpp b/dom/mobilemessage/src/fallback/SmsService.cpp index b4595a5e800..9b7ec1c2803 100644 --- a/dom/mobilemessage/src/fallback/SmsService.cpp +++ b/dom/mobilemessage/src/fallback/SmsService.cpp @@ -6,7 +6,6 @@ #include "SmsMessage.h" #include "SmsSegmentInfo.h" #include "SmsService.h" -#include "jsapi.h" namespace mozilla { namespace dom { diff --git a/dom/mobilemessage/src/gonk/SmsService.cpp b/dom/mobilemessage/src/gonk/SmsService.cpp index 4b25015f60f..c3f6e774f65 100644 --- a/dom/mobilemessage/src/gonk/SmsService.cpp +++ b/dom/mobilemessage/src/gonk/SmsService.cpp @@ -5,7 +5,6 @@ #include "SmsMessage.h" #include "SmsService.h" -#include "jsapi.h" #include "SmsSegmentInfo.h" #include "mozilla/Preferences.h" #include "nsServiceManagerUtils.h" diff --git a/dom/mobilemessage/src/ipc/SmsIPCService.cpp b/dom/mobilemessage/src/ipc/SmsIPCService.cpp index 9180dccc1d5..f4f12cb7a99 100644 --- a/dom/mobilemessage/src/ipc/SmsIPCService.cpp +++ b/dom/mobilemessage/src/ipc/SmsIPCService.cpp @@ -6,7 +6,6 @@ #include "mozilla/dom/ContentChild.h" #include "SmsIPCService.h" #include "nsXULAppAPI.h" -#include "jsapi.h" #include "mozilla/dom/mobilemessage/SmsChild.h" #include "SmsMessage.h" #include "SmsFilter.h" diff --git a/dom/network/src/MobileConnection.cpp b/dom/network/src/MobileConnection.cpp index 7ef1c6ec19e..e743ea4158a 100644 --- a/dom/network/src/MobileConnection.cpp +++ b/dom/network/src/MobileConnection.cpp @@ -17,7 +17,6 @@ #include "nsJSUtils.h" #include "nsJSON.h" -#include "jsapi.h" #include "mozilla/Services.h" #define NS_RILCONTENTHELPER_CONTRACTID "@mozilla.org/ril/content-helper;1" diff --git a/dom/network/src/TCPServerSocketChild.cpp b/dom/network/src/TCPServerSocketChild.cpp index 3ec9271bec4..d066e9e49dd 100644 --- a/dom/network/src/TCPServerSocketChild.cpp +++ b/dom/network/src/TCPServerSocketChild.cpp @@ -9,7 +9,6 @@ #include "mozilla/dom/TabChild.h" #include "nsIDOMTCPSocket.h" #include "nsJSUtils.h" -#include "jsapi.h" #include "jsfriendapi.h" using mozilla::net::gNeckoChild; diff --git a/dom/network/src/TCPServerSocketParent.cpp b/dom/network/src/TCPServerSocketParent.cpp index afc6bda91cb..ab8163ac512 100644 --- a/dom/network/src/TCPServerSocketParent.cpp +++ b/dom/network/src/TCPServerSocketParent.cpp @@ -3,8 +3,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "TCPServerSocketParent.h" -#include "jsapi.h" -#include "jsfriendapi.h" #include "nsJSUtils.h" #include "TCPSocketParent.h" #include "mozilla/unused.h" diff --git a/dom/plugins/base/nsJSNPRuntime.cpp b/dom/plugins/base/nsJSNPRuntime.cpp index 65ddd4466c2..e2c682add5e 100644 --- a/dom/plugins/base/nsJSNPRuntime.cpp +++ b/dom/plugins/base/nsJSNPRuntime.cpp @@ -5,7 +5,6 @@ #include "base/basictypes.h" -#include "jsapi.h" #include "jsfriendapi.h" #include "jswrapper.h" diff --git a/dom/src/jsurl/nsJSProtocolHandler.cpp b/dom/src/jsurl/nsJSProtocolHandler.cpp index f8c1f727057..4592d7338f0 100644 --- a/dom/src/jsurl/nsJSProtocolHandler.cpp +++ b/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -3,6 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * 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 "nsCOMPtr.h" #include "nsAutoPtr.h" #include "jsapi.h" diff --git a/dom/wifi/WifiProxyService.cpp b/dom/wifi/WifiProxyService.cpp index 9b6253f485b..7efa4016f1c 100644 --- a/dom/wifi/WifiProxyService.cpp +++ b/dom/wifi/WifiProxyService.cpp @@ -8,7 +8,6 @@ #include "mozilla/ClearOnShutdown.h" #include "nsXULAppAPI.h" #include "WifiUtils.h" -#include "jsapi.h" #include "nsCxPusher.h" #define NS_WIFIPROXYSERVICE_CID \ diff --git a/js/public/RootingAPI.h b/js/public/RootingAPI.h index 3c5bd6ec3a6..82863f020a0 100644 --- a/js/public/RootingAPI.h +++ b/js/public/RootingAPI.h @@ -375,7 +375,7 @@ class TenuredHeap : public js::HeapBase template class MOZ_NONHEAP_CLASS Handle : public js::HandleBase { - friend class MutableHandle; + friend class JS::MutableHandle; public: /* Creates a handle from a handle of a type convertible to T. */ diff --git a/js/src/TraceLogging.cpp b/js/src/TraceLogging.cpp index 82542774fd0..161fcfe3627 100644 --- a/js/src/TraceLogging.cpp +++ b/js/src/TraceLogging.cpp @@ -13,7 +13,6 @@ #include #include -#include "jsapi.h" #include "jsscript.h" using namespace js; diff --git a/js/src/builtin/ParallelArray.cpp b/js/src/builtin/ParallelArray.cpp index 5185b6edc69..ebee0a6adbc 100644 --- a/js/src/builtin/ParallelArray.cpp +++ b/js/src/builtin/ParallelArray.cpp @@ -6,7 +6,6 @@ #include "builtin/ParallelArray.h" -#include "jsapi.h" #include "jsobj.h" #include "vm/GlobalObject.h" diff --git a/js/src/devtools/Instruments.cpp b/js/src/devtools/Instruments.cpp index 360727d7012..68d649e883c 100644 --- a/js/src/devtools/Instruments.cpp +++ b/js/src/devtools/Instruments.cpp @@ -6,9 +6,9 @@ #ifdef __APPLE__ -#include "jsapi.h" #include #include +#include // There are now 2 paths to the DTPerformanceSession framework. We try to load // the one contained in /Applications/Xcode.app first, falling back to the one diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp index 986295a64d2..e5ef60c0f7d 100644 --- a/js/src/frontend/TokenStream.cpp +++ b/js/src/frontend/TokenStream.cpp @@ -15,7 +15,6 @@ #include #include -#include "jsapi.h" #include "jsatom.h" #include "jscntxt.h" #include "jsexn.h" diff --git a/js/src/gc/Iteration.cpp b/js/src/gc/Iteration.cpp index ae081e51df3..b5f38d4a575 100644 --- a/js/src/gc/Iteration.cpp +++ b/js/src/gc/Iteration.cpp @@ -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 "jscompartment.h" #include "jsgc.h" diff --git a/js/src/gc/RootMarking.cpp b/js/src/gc/RootMarking.cpp index 45382d578a8..f689c84ba6c 100644 --- a/js/src/gc/RootMarking.cpp +++ b/js/src/gc/RootMarking.cpp @@ -10,7 +10,6 @@ # include #endif -#include "jsapi.h" #include "jscntxt.h" #include "jsgc.h" #include "jsonparser.h" diff --git a/js/src/jsapi-tests/testIntTypesABI.cpp b/js/src/jsapi-tests/testIntTypesABI.cpp index 815ff90cfad..6bba73b6622 100644 --- a/js/src/jsapi-tests/testIntTypesABI.cpp +++ b/js/src/jsapi-tests/testIntTypesABI.cpp @@ -9,7 +9,6 @@ * even the ones tests.h itself included, to verify this. */ -#include "jsapi.h" #include "jscpucfg.h" #include "jspubtd.h" #include "jstypes.h" diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp index 2814109c66c..1128365114b 100644 --- a/js/src/jsiter.cpp +++ b/js/src/jsiter.cpp @@ -12,7 +12,6 @@ #include "mozilla/PodOperations.h" #include "mozilla/Util.h" -#include "jsapi.h" #include "jsarray.h" #include "jsatom.h" #include "jscntxt.h" diff --git a/js/src/jsnum.cpp b/js/src/jsnum.cpp index 4bab52a7b87..b2cccc49e46 100644 --- a/js/src/jsnum.cpp +++ b/js/src/jsnum.cpp @@ -27,7 +27,6 @@ #include #include "double-conversion.h" -#include "jsapi.h" #include "jsatom.h" #include "jscntxt.h" #include "jsdtoa.h" diff --git a/js/src/json.cpp b/js/src/json.cpp index 47f796f8ae8..0b9a36d5db7 100644 --- a/js/src/json.cpp +++ b/js/src/json.cpp @@ -8,7 +8,6 @@ #include "mozilla/FloatingPoint.h" -#include "jsapi.h" #include "jsarray.h" #include "jsatom.h" #include "jscntxt.h" diff --git a/js/src/jswrapper.cpp b/js/src/jswrapper.cpp index 95fb1acdeef..925b6f647bb 100644 --- a/js/src/jswrapper.cpp +++ b/js/src/jswrapper.cpp @@ -6,7 +6,6 @@ #include "jswrapper.h" -#include "jsapi.h" #include "jscntxt.h" #include "jscompartment.h" #include "jsexn.h" diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp index 030280df108..1a2489a243f 100644 --- a/js/src/vm/Debugger.cpp +++ b/js/src/vm/Debugger.cpp @@ -6,7 +6,6 @@ #include "vm/Debugger-inl.h" -#include "jsapi.h" #include "jscntxt.h" #include "jscompartment.h" #include "jsnum.h" diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp index 8345be4606d..a25db7ef862 100644 --- a/js/src/vm/Interpreter.cpp +++ b/js/src/vm/Interpreter.cpp @@ -16,7 +16,6 @@ #include -#include "jsapi.h" #include "jsarray.h" #include "jsatom.h" #include "jsautooplen.h" diff --git a/js/src/vm/OldDebugAPI.cpp b/js/src/vm/OldDebugAPI.cpp index e2bd495d7e6..1a6c697a935 100644 --- a/js/src/vm/OldDebugAPI.cpp +++ b/js/src/vm/OldDebugAPI.cpp @@ -12,7 +12,6 @@ #include -#include "jsapi.h" #include "jscntxt.h" #include "jsfun.h" #include "jsgc.h" diff --git a/js/src/vm/Shape.cpp b/js/src/vm/Shape.cpp index 89ea4929616..25238b97f4d 100644 --- a/js/src/vm/Shape.cpp +++ b/js/src/vm/Shape.cpp @@ -12,7 +12,6 @@ #include "mozilla/MathAlgorithms.h" #include "mozilla/PodOperations.h" -#include "jsapi.h" #include "jsatom.h" #include "jscntxt.h" #include "jsobj.h" diff --git a/js/xpconnect/public/xpc_map_end.h b/js/xpconnect/public/xpc_map_end.h index 19df34922d5..09debaa612d 100644 --- a/js/xpconnect/public/xpc_map_end.h +++ b/js/xpconnect/public/xpc_map_end.h @@ -13,6 +13,8 @@ #error "Must #define XPC_MAP_QUOTED_CLASSNAME before #including xpc_map_end.h" #endif +#include "js/Id.h" + /**************************************************************/ NS_IMETHODIMP XPC_MAP_CLASSNAME::GetClassName(char * *aClassName) @@ -108,7 +110,7 @@ NS_IMETHODIMP XPC_MAP_CLASSNAME::PostTransplant(nsIXPConnectWrappedNative *wrapp #endif #ifndef XPC_MAP_WANT_ADDPROPERTY -NS_IMETHODIMP XPC_MAP_CLASSNAME::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, jsid id, jsval * vp, bool *_retval) +NS_IMETHODIMP XPC_MAP_CLASSNAME::AddProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, jsid id, JS::Value * vp, bool *_retval) {NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;} #endif @@ -118,17 +120,17 @@ NS_IMETHODIMP XPC_MAP_CLASSNAME::DelProperty(nsIXPConnectWrappedNative *wrapper, #endif #ifndef XPC_MAP_WANT_GETPROPERTY -NS_IMETHODIMP XPC_MAP_CLASSNAME::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, jsid id, jsval * vp, bool *_retval) +NS_IMETHODIMP XPC_MAP_CLASSNAME::GetProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, jsid id, JS::Value * vp, bool *_retval) {NS_WARNING("never called"); return NS_ERROR_NOT_IMPLEMENTED;} #endif #ifndef XPC_MAP_WANT_SETPROPERTY -NS_IMETHODIMP XPC_MAP_CLASSNAME::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, jsid id, jsval * vp, bool *_retval) +NS_IMETHODIMP XPC_MAP_CLASSNAME::SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, jsid id, JS::Value * vp, bool *_retval) {NS_WARNING("never called"); return NS_ERROR_NOT_IMPLEMENTED;} #endif #ifndef XPC_MAP_WANT_NEWENUMERATE -NS_IMETHODIMP XPC_MAP_CLASSNAME::NewEnumerate(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, uint32_t enum_op, jsval * statep, jsid * idp, bool *_retval) +NS_IMETHODIMP XPC_MAP_CLASSNAME::NewEnumerate(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, uint32_t enum_op, JS::Value * statep, jsid * idp, bool *_retval) {NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;} #endif @@ -143,7 +145,7 @@ NS_IMETHODIMP XPC_MAP_CLASSNAME::NewResolve(nsIXPConnectWrappedNative *wrapper, #endif #ifndef XPC_MAP_WANT_CONVERT -NS_IMETHODIMP XPC_MAP_CLASSNAME::Convert(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, uint32_t type, jsval * vp, bool *_retval) +NS_IMETHODIMP XPC_MAP_CLASSNAME::Convert(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, uint32_t type, JS::Value * vp, bool *_retval) {NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;} #endif @@ -153,7 +155,7 @@ NS_IMETHODIMP XPC_MAP_CLASSNAME::Finalize(nsIXPConnectWrappedNative *wrapper, JS #endif #ifndef XPC_MAP_WANT_CHECKACCESS -NS_IMETHODIMP XPC_MAP_CLASSNAME::CheckAccess(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, jsid id, uint32_t mode, jsval * vp, bool *_retval) +NS_IMETHODIMP XPC_MAP_CLASSNAME::CheckAccess(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, jsid id, uint32_t mode, JS::Value * vp, bool *_retval) {NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;} #endif @@ -168,7 +170,7 @@ NS_IMETHODIMP XPC_MAP_CLASSNAME::Construct(nsIXPConnectWrappedNative *wrapper, J #endif #ifndef XPC_MAP_WANT_HASINSTANCE -NS_IMETHODIMP XPC_MAP_CLASSNAME::HasInstance(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, const jsval &val, bool *bp, bool *_retval) +NS_IMETHODIMP XPC_MAP_CLASSNAME::HasInstance(nsIXPConnectWrappedNative *wrapper, JSContext * cx, JSObject * obj, const JS::Value &val, bool *bp, bool *_retval) {NS_ERROR("never called"); return NS_ERROR_NOT_IMPLEMENTED;} #endif diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp index c6deba5e806..f7abfc0536f 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp @@ -60,7 +60,6 @@ #include "MediaStreamList.h" #include "MediaStreamTrack.h" #include "nsIScriptGlobalObject.h" -#include "jsapi.h" #include "DOMMediaStream.h" #endif diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp index 7115800deb5..dbd03a1b849 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp @@ -20,7 +20,6 @@ #include "MediaStreamList.h" #include "nsIScriptGlobalObject.h" #include "mozilla/Preferences.h" -#include "jsapi.h" #endif using namespace mozilla; diff --git a/storage/src/mozStoragePrivateHelpers.cpp b/storage/src/mozStoragePrivateHelpers.cpp index cedc3fceecc..3e97b6f2bb5 100644 --- a/storage/src/mozStoragePrivateHelpers.cpp +++ b/storage/src/mozStoragePrivateHelpers.cpp @@ -6,7 +6,6 @@ #include "sqlite3.h" -#include "jsapi.h" #include "jsfriendapi.h" #include "nsPrintfCString.h" diff --git a/toolkit/components/ctypes/tests/jsctypes-test-finalizer.cpp b/toolkit/components/ctypes/tests/jsctypes-test-finalizer.cpp index eb38675ed03..efa419ba2e4 100644 --- a/toolkit/components/ctypes/tests/jsctypes-test-finalizer.cpp +++ b/toolkit/components/ctypes/tests/jsctypes-test-finalizer.cpp @@ -2,7 +2,6 @@ #include "jsctypes-test.h" #include "jsctypes-test-finalizer.h" -#include "jsapi.h" #if defined(XP_WIN) #define snprintf _snprintf diff --git a/toolkit/components/ctypes/tests/jsctypes-test.cpp b/toolkit/components/ctypes/tests/jsctypes-test.cpp index a2f63995dca..0dbbad681b4 100644 --- a/toolkit/components/ctypes/tests/jsctypes-test.cpp +++ b/toolkit/components/ctypes/tests/jsctypes-test.cpp @@ -4,7 +4,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "jsctypes-test.h" -#include "jsapi.h" #include "nsCRTGlue.h" #include #include diff --git a/toolkit/devtools/server/nsJSInspector.cpp b/toolkit/devtools/server/nsJSInspector.cpp index 57596656fc0..3d4be1199b7 100644 --- a/toolkit/devtools/server/nsJSInspector.cpp +++ b/toolkit/devtools/server/nsJSInspector.cpp @@ -7,7 +7,6 @@ #include "nsIXPConnect.h" #include "nsThreadUtils.h" #include "nsCxPusher.h" -#include "jsapi.h" #include "jsfriendapi.h" #include "js/OldDebugAPI.h" #include "mozilla/ModuleUtils.h" diff --git a/tools/profiler/nsProfiler.cpp b/tools/profiler/nsProfiler.cpp index 622ed4c4745..f636f2fbff8 100644 --- a/tools/profiler/nsProfiler.cpp +++ b/tools/profiler/nsProfiler.cpp @@ -19,7 +19,7 @@ #include "nsIWebNavigation.h" #include "nsIInterfaceRequestorUtils.h" #include "shared-libraries.h" -#include "jsapi.h" +#include "js/Value.h" using std::string; diff --git a/widget/xpwidgets/GfxInfoCollector.cpp b/widget/xpwidgets/GfxInfoCollector.cpp index aa7c85123dd..bdc7972152d 100644 --- a/widget/xpwidgets/GfxInfoCollector.cpp +++ b/widget/xpwidgets/GfxInfoCollector.cpp @@ -50,4 +50,4 @@ InfoObject::InfoObject(JSContext *aCx) : mCx(aCx), mObj(aCx), mOk(true) mObj = JS_NewObject(mCx, NULL, NULL, NULL); if (!mObj) mOk = false; -} \ No newline at end of file +} diff --git a/xpcom/io/nsBinaryStream.cpp b/xpcom/io/nsBinaryStream.cpp index ea225228801..e3917845870 100644 --- a/xpcom/io/nsBinaryStream.cpp +++ b/xpcom/io/nsBinaryStream.cpp @@ -27,7 +27,6 @@ #include "nsIURI.h" // for NS_IURI_IID #include "mozilla/Endian.h" -#include "jsapi.h" #include "jsfriendapi.h" NS_IMPL_ISUPPORTS3(nsBinaryOutputStream, nsIObjectOutputStream, nsIBinaryOutputStream, nsIOutputStream) diff --git a/xpfe/appshell/src/nsAppShellService.cpp b/xpfe/appshell/src/nsAppShellService.cpp index c7ca8ee1644..6bb85da4569 100644 --- a/xpfe/appshell/src/nsAppShellService.cpp +++ b/xpfe/appshell/src/nsAppShellService.cpp @@ -31,7 +31,6 @@ /* For implementing GetHiddenWindowAndJSContext */ #include "nsIScriptGlobalObject.h" #include "nsIScriptContext.h" -#include "jsapi.h" #include "nsAppShellService.h" #include "nsISupportsPrimitives.h"