Permalink
Browse files

Upgrades to SpiderMonkey 19

  • Loading branch information...
1 parent 6c46d52 commit e4f78c7f93f2f13266cd5ff7aa8fb5c620302e01 @ricardoquesada committed Feb 22, 2013
Showing 539 changed files with 19,433 additions and 14,693 deletions.
@@ -7,7 +7,6 @@
#include "nsIXPConnect.h"
#include "nsThreadUtils.h"
#include "jsapi.h"
-#include "jsgc.h"
#include "jsfriendapi.h"
#include "jsdbgapi.h"
#include "mozilla/ModuleUtils.h"
View
@@ -16,22 +16,21 @@ using mozilla::void_t;
namespace mozilla {
namespace jsipc {
-using namespace IPC;
template <typename P>
struct CPOWSingleton
{
- static void Write(Message*, const P&) {}
- static bool Read(const Message*, void**, P*) { return true; }
+ static void Write(IPC::Message*, const P&) {}
+ static bool Read(const IPC::Message*, void**, P*) { return true; }
};
template <typename Type, typename As>
struct CPOWConvertible
{
- static void Write(Message* m, const Type& t) {
+ static void Write(IPC::Message* m, const Type& t) {
WriteParam(m, As(t));
}
- static bool Read(const Message* m, void** iter, Type* tp) {
+ static bool Read(const IPC::Message* m, void** iter, Type* tp) {
As a;
return (ReadParam(m, iter, &a) &&
(*tp = Type(a), true));
@@ -43,9 +42,8 @@ struct CPOWConvertible
namespace IPC {
-using namespace mozilla::jsipc;
-template <> struct ParamTraits<JSType> : public CPOWConvertible<JSType, int> {};
+template <> struct ParamTraits<JSType> : public mozilla::jsipc::CPOWConvertible<JSType, int> {};
}
View
@@ -2410,28 +2410,28 @@ NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTION_CLASS(jsdService)
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(jsdService)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mErrorHook)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mBreakpointHook)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDebugHook)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mDebuggerHook)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mInterruptHook)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mScriptHook)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mThrowHook)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTopLevelHook)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mFunctionHook)
- NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mActivationCallback)
+ NS_IMPL_CYCLE_COLLECTION_UNLINK(mErrorHook)
+ NS_IMPL_CYCLE_COLLECTION_UNLINK(mBreakpointHook)
+ NS_IMPL_CYCLE_COLLECTION_UNLINK(mDebugHook)
+ NS_IMPL_CYCLE_COLLECTION_UNLINK(mDebuggerHook)
+ NS_IMPL_CYCLE_COLLECTION_UNLINK(mInterruptHook)
+ NS_IMPL_CYCLE_COLLECTION_UNLINK(mScriptHook)
+ NS_IMPL_CYCLE_COLLECTION_UNLINK(mThrowHook)
+ NS_IMPL_CYCLE_COLLECTION_UNLINK(mTopLevelHook)
+ NS_IMPL_CYCLE_COLLECTION_UNLINK(mFunctionHook)
+ NS_IMPL_CYCLE_COLLECTION_UNLINK(mActivationCallback)
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(jsdService)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mErrorHook)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mBreakpointHook)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDebugHook)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDebuggerHook)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mInterruptHook)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mScriptHook)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mThrowHook)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTopLevelHook)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mFunctionHook)
- NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mActivationCallback)
+ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mErrorHook)
+ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBreakpointHook)
+ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDebugHook)
+ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDebuggerHook)
+ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mInterruptHook)
+ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mScriptHook)
+ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mThrowHook)
+ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTopLevelHook)
+ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFunctionHook)
+ NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mActivationCallback)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(jsdService)
Oops, something went wrong.

0 comments on commit e4f78c7

Please sign in to comment.