wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out changeset a4763990a983 (bug 838686) because gcc doesn't like it and we get a CLOSED TREE.

Browse Source
This commit is contained in:
Boris Zbarsky 2013-02-26 15:35:13 -05:00
parent 8f45a6f4d4
commit f857806f73
2 changed files with 0 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dom/bindings/CallbackObject.cpp
View File

@ -12,7 +12,6 @@
#include "nsPIDOMWindow.h"
#include "nsJSUtils.h"
#include "nsIScriptSecurityManager.h"
#include "xpcprivate.h"
namespace mozilla {
namespace dom {
@ -182,39 +181,5 @@ CallbackObject::CallSetup::~CallSetup()
}
}
already_AddRefed<nsISupports>
CallbackObjectHolderBase::ToXPCOMCallback(CallbackObject* aCallback,
const nsIID& aIID)
{
if (!aCallback) {
return nullptr;
}
JSObject* callback = aCallback->Callback();
SafeAutoJSContext cx;
JSAutoCompartment ac(cx, callback);
XPCCallContext ccx(NATIVE_CALLER, cx);
if (!ccx.IsValid()) {
return nullptr;
}
nsRefPtr<nsXPCWrappedJS> wrappedJS;
nsresult rv =
nsXPCWrappedJS::GetNewOrUsed(ccx, callback, aIID,
nullptr, getter_AddRefs(wrappedJS));
if (NS_FAILED(rv) || !wrappedJS) {
return nullptr;
}
nsCOMPtr<nsISupports> retval;
rv = wrappedJS->QueryInterface(aIID, getter_AddRefs(retval));
if (NS_FAILED(rv)) {
return nullptr;
}
return retval.forget();
}
} // namespace dom
} // namespace mozilla

211
dom/bindings/CallbackObject.h
View File

@ -81,19 +81,6 @@ public:
return mCallback;
}
/*
* This getter does not change the color of the JSObject meaning that the
* object returned is not guaranteed to be kept alive past the next CC.
*
* This should only be called if you are certain that the return value won't
* be passed into a JS API function and that it won't be stored without being
* rooted (or otherwise signaling the stored value to the CC).
*/
JSObject* CallbackPreserveColor() const
{
return mCallback;
}
enum ExceptionHandling {
eReportExceptions,
eRethrowExceptions
@ -177,204 +164,6 @@ protected:
};
};
template<class WebIDLCallbackT, class XPCOMCallbackT>
class CallbackObjectHolder;
template<class T, class U>
inline void ImplCycleCollectionUnlink(CallbackObjectHolder<T, U>& aField);
class CallbackObjectHolderBase
{
protected:
// Returns null on all failures
already_AddRefed<nsISupports> ToXPCOMCallback(CallbackObject* aCallback,
const nsIID& aIID);
};
template<class WebIDLCallbackT, class XPCOMCallbackT>
class CallbackObjectHolder : CallbackObjectHolderBase
{
/**
* A class which stores either a WebIDLCallbackT* or an XPCOMCallbackT*. Both
* types must inherit from nsISupports. The pointer that's stored can be
* null.
*
* When storing a WebIDLCallbackT*, mPtrBits is set to the pointer value.
* When storing an XPCOMCallbackT*, mPtrBits is the pointer value with low bit
* set.
*/
public:
explicit CallbackObjectHolder(WebIDLCallbackT* aCallback)
: mPtrBits(reinterpret_cast<uintptr_t>(aCallback))
{
NS_IF_ADDREF(aCallback);
}
explicit CallbackObjectHolder(XPCOMCallbackT* aCallback)
: mPtrBits(reinterpret_cast<uintptr_t>(aCallback) | XPCOMCallbackFlag)
{
NS_IF_ADDREF(aCallback);
}
explicit CallbackObjectHolder(const CallbackObjectHolder& aOther)
: mPtrBits(aOther.mPtrBits)
{
NS_IF_ADDREF(GetISupports());
}
CallbackObjectHolder()
: mPtrBits(0)
{}
~CallbackObjectHolder()
{
UnlinkSelf();
}
nsISupports* GetISupports() const
{
return reinterpret_cast<nsISupports*>(mPtrBits & ~XPCOMCallbackFlag);
}
// Even if HasWebIDLCallback returns true, GetWebIDLCallback() might still
// return null.
bool HasWebIDLCallback() const
{
return !(mPtrBits & XPCOMCallbackFlag);
}
WebIDLCallbackT* GetWebIDLCallback() const
{
MOZ_ASSERT(HasWebIDLCallback());
return reinterpret_cast<WebIDLCallbackT*>(mPtrBits);
}
XPCOMCallbackT* GetXPCOMCallback() const
{
MOZ_ASSERT(!HasWebIDLCallback());
return reinterpret_cast<XPCOMCallbackT*>(mPtrBits & ~XPCOMCallbackFlag);
}
bool operator==(WebIDLCallbackT* aOtherCallback) const
{
if (!aOtherCallback) {
// If other is null, then we must be null to be equal.
return !GetISupports();
}
if (!HasWebIDLCallback() || !GetWebIDLCallback()) {
// If other is non-null, then we can't be equal if we have a
// non-WebIDL callback or a null callback.
return false;
}
JSObject* thisObj =
js::UnwrapObject(GetWebIDLCallback()->CallbackPreserveColor());
JSObject* otherObj =
js::UnwrapObject(aOtherCallback->CallbackPreserveColor());
return thisObj == otherObj;
}
bool operator==(XPCOMCallbackT* aOtherCallback) const
{
return (!aOtherCallback && !GetISupports()) ||
(!HasWebIDLCallback() && GetXPCOMCallback() == aOtherCallback);
}
bool operator==(const CallbackObjectHolder& aOtherCallback) const
{
if (aOtherCallback.HasWebIDLCallback()) {
return *this == aOtherCallback.GetWebIDLCallback();
}
return *this == aOtherCallback.GetXPCOMCallback();
}
// Try to return an XPCOMCallbackT version of this object.
already_AddRefed<XPCOMCallbackT> ToXPCOMCallback()
{
if (!HasWebIDLCallback()) {
nsRefPtr<XPCOMCallbackT> callback = GetXPCOMCallback();
return callback.forget();
}
nsCOMPtr<nsISupports> supp =
CallbackObjectHolderBase::ToXPCOMCallback(GetWebIDLCallback(),
NS_GET_TEMPLATE_IID(XPCOMCallbackT));
// ToXPCOMCallback already did the right QI for us.
return static_cast<XPCOMCallbackT*>(supp.forget().get());
}
// Try to return a WebIDLCallbackT version of this object.
already_AddRefed<WebIDLCallbackT> ToWebIDLCallback()
{
if (HasWebIDLCallback()) {
nsRefPtr<WebIDLCallbackT> callback = GetWebIDLCallback();
return callback.forget();
}
XPCOMCallbackT* callback = GetXPCOMCallback();
if (!callback) {
return nullptr;
}
nsCOMPtr<nsIXPConnectWrappedJS> wrappedJS = do_QueryInterface(callback);
if (!wrappedJS) {
return nullptr;
}
JSObject* obj;
if (NS_FAILED(wrappedJS->GetJSObject(&obj)) || !obj) {
return nullptr;
}
SafeAutoJSContext cx;
JSAutoCompartment ac(cx, obj);
bool inited;
nsRefPtr<WebIDLCallbackT> newCallback =
new WebIDLCallbackT(cx, nullptr, obj, &inited);
if (!inited) {
return nullptr;
}
return newCallback.forget();
}
private:
static const uintptr_t XPCOMCallbackFlag = 1u;
friend inline void
ImplCycleCollectionUnlink<WebIDLCallbackT,
XPCOMCallbackT>(CallbackObjectHolder& aField);
void UnlinkSelf()
{
// NS_IF_RELEASE because we might have been unlinked before
nsISupports* ptr = GetISupports();
NS_IF_RELEASE(ptr);
mPtrBits = 0;
}
uintptr_t mPtrBits;
};
template<class T, class U>
inline void
ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,
CallbackObjectHolder<T, U>& aField,
const char* aName,
uint32_t aFlags = 0)
{
CycleCollectionNoteChild(aCallback, aField.GetISupports(), aName, aFlags);
}
template<class T, class U>
inline void
ImplCycleCollectionUnlink(CallbackObjectHolder<T, U>& aField)
{
aField.UnlinkSelf();
}
} // namespace dom
} // namespace mozilla