From 2fde95af84964af7fea258704b04a9dbe322e873 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Fri, 23 Dec 2016 08:30:29 +1100 Subject: [PATCH] Bug 1324330 (part 4) - Remove some unused functions. r=mccr8. --HG-- extra : rebase_source : 093a6ae13879deafc070ffa658d5822dc310cf88 --- js/xpconnect/src/XPCWrappedNative.cpp | 7 ------- js/xpconnect/src/xpcprivate.h | 11 ----------- 2 files changed, 18 deletions(-) diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp index 874672e976e7..1913f917d2e8 100644 --- a/js/xpconnect/src/XPCWrappedNative.cpp +++ b/js/xpconnect/src/XPCWrappedNative.cpp @@ -617,13 +617,6 @@ XPCWrappedNative::Destroy() mMaybeScope = nullptr; } -void -XPCWrappedNative::UpdateScriptableInfo(XPCNativeScriptableInfo* si) -{ - MOZ_ASSERT(mScriptableInfo, "UpdateScriptableInfo expects an existing scriptable info"); - mScriptableInfo = si; -} - void XPCWrappedNative::SetProto(XPCWrappedNativeProto* p) { diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h index d5f41889eb0c..4ae5630c2f2a 100644 --- a/js/xpconnect/src/xpcprivate.h +++ b/js/xpconnect/src/xpcprivate.h @@ -1489,18 +1489,9 @@ private: class MOZ_STACK_CLASS XPCNativeScriptableCreateInfo final { public: - - explicit XPCNativeScriptableCreateInfo(const XPCNativeScriptableInfo& si) - : mCallback(si.GetCallback()), mFlags(si.GetFlags()) {} - - XPCNativeScriptableCreateInfo(already_AddRefed&& callback, - XPCNativeScriptableFlags flags) - : mCallback(callback), mFlags(flags) {} - XPCNativeScriptableCreateInfo() : mFlags(0) {} - nsIXPCScriptable* GetCallback() const {return mCallback;} @@ -1893,8 +1884,6 @@ protected: virtual ~XPCWrappedNative(); void Destroy(); - void UpdateScriptableInfo(XPCNativeScriptableInfo* si); - private: enum { // Flags bits for mFlatJSObject: