corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1187552 - Make NativeJSContainer use direct ownership model; r=snorp

Browse Source 
Make NativeJSContainer/NativeJSObject Java objects own their
corresponding C++ objects directly, to reduce an extra
allocation/deallocation for each object and to simplify code.
This commit is contained in:
Jim Chen
2015-08-04 17:47:28 -04:00
parent b4d1d1173f
commit de41cfe9d0
2 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
widget/android/NativeJSContainer.cpp
View File

@@ -14,7 +14,6 @@
#include "nsJSUtils.h"
#include <mozilla/Vector.h>
#include <mozilla/WeakPtr.h>
#include <mozilla/jni/Accessors.h>
#include <mozilla/jni/Refs.h>
#include <mozilla/jni/Utils.h>
@@ -104,8 +103,7 @@ public:
} // namepsace
class NativeJSContainerImpl final
: public SupportsWeakPtr<NativeJSContainerImpl>
, public NativeJSObject::Natives<NativeJSContainerImpl>
: public NativeJSObject::Natives<NativeJSContainerImpl>
, public NativeJSContainer::Natives<NativeJSContainerImpl>
{
typedef NativeJSContainerImpl Self;
@@ -576,46 +574,46 @@ class NativeJSContainerImpl final
return (this->*Prop::FromValue)(val);
}
NativeJSObject::LocalRef CreateChild(JS::HandleObject object)
{
auto instance = NativeJSObject::New();
mozilla::UniquePtr<NativeJSContainerImpl> impl(
new NativeJSContainerImpl(instance.Env(), mJSContext, object));
ObjectBase::AttachNative(instance, mozilla::Move(impl));
mChildren.append(NativeJSObject::GlobalRef(instance));
return instance;
}
NativeJSContainerImpl(JNIEnv* env, JSContext* cx, JS::HandleObject object)
: mEnv(env)
, mJSContext(cx)
, mJSObject(cx, object)
{}
public:
~NativeJSContainerImpl()
{
// Dispose of all children on destruction. The children will in turn
// dispose any of their children (i.e. our grandchildren) and so on.
NativeJSObject::LocalRef childObj(mEnv);
NativeJSObject::LocalRef child(mEnv);
for (size_t i = 0; i < mChildren.length(); i++) {
childObj = mChildren[i];
Self* const child = ObjectBase::GetNative(childObj);
child->ObjectBase::DisposeNative(childObj);
delete child;
child = mChildren[i];
ObjectBase::GetNative(child)->ObjectBase::DisposeNative(child);
}
}
NativeJSObject::LocalRef CreateChild(JS::HandleObject object)
{
auto instance = NativeJSObject::New();
(new NativeJSContainerImpl(instance.Env(), mJSContext, object))
->ObjectBase::AttachNative(instance);
mChildren.append(NativeJSObject::GlobalRef(instance));
return instance;
}
public:
static NativeJSContainer::LocalRef
CreateInstance(JSContext* cx, JS::HandleObject object)
{
auto instance = NativeJSContainer::New();
(new NativeJSContainerImpl(instance.Env(), cx, object))
->ContainerBase::AttachNative(instance);
mozilla::UniquePtr<NativeJSContainerImpl> impl(
new NativeJSContainerImpl(instance.Env(), cx, object));
ContainerBase::AttachNative(instance, mozilla::Move(impl));
return instance;
}
MOZ_DECLARE_WEAKREFERENCE_TYPENAME(NativeJSContainerImpl)
// NativeJSContainer methods
void DisposeNative(const NativeJSContainer::LocalRef& instance)
@@ -624,7 +622,6 @@ public:
return;
}
ContainerBase::DisposeNative(instance);
delete this;
}
NativeJSContainer::LocalRef Clone()