remove V8_ALLOW_ACCESS_TO_PERSISTENT_IMPLICIT and V8_ALLOW_ACCESS_TO_PERSISTENT_ARROW
R=svenpanne@chromium.org BUG= Review URL: https://codereview.chromium.org/15979014 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14914 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
880934b1a8
commit
7d55c16389
@ -764,10 +764,7 @@ template <class T> class Persistent // NOLINT
|
|||||||
|
|
||||||
#ifndef V8_USE_UNSAFE_HANDLES
|
#ifndef V8_USE_UNSAFE_HANDLES
|
||||||
|
|
||||||
#ifndef V8_ALLOW_ACCESS_TO_PERSISTENT_IMPLICIT
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
#endif
|
|
||||||
// TODO(dcarney): make unlinkable before cutover
|
// TODO(dcarney): make unlinkable before cutover
|
||||||
V8_INLINE(Persistent(const Persistent& that)) : val_(that.val_) {}
|
V8_INLINE(Persistent(const Persistent& that)) : val_(that.val_) {}
|
||||||
// TODO(dcarney): make unlinkable before cutover
|
// TODO(dcarney): make unlinkable before cutover
|
||||||
@ -790,11 +787,8 @@ template <class T> class Persistent // NOLINT
|
|||||||
}
|
}
|
||||||
// TODO(dcarney): remove before cutover
|
// TODO(dcarney): remove before cutover
|
||||||
V8_INLINE(T* operator*() const) { return val_; }
|
V8_INLINE(T* operator*() const) { return val_; }
|
||||||
public:
|
|
||||||
#ifndef V8_ALLOW_ACCESS_TO_PERSISTENT_ARROW
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
#endif
|
|
||||||
// TODO(dcarney): remove before cutover
|
// TODO(dcarney): remove before cutover
|
||||||
V8_INLINE(T* operator->() const) { return val_; }
|
V8_INLINE(T* operator->() const) { return val_; }
|
||||||
public:
|
public:
|
||||||
|
@ -25,9 +25,6 @@
|
|||||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
// TODO(dcarney): remove
|
|
||||||
#define V8_ALLOW_ACCESS_TO_PERSISTENT_IMPLICIT
|
|
||||||
|
|
||||||
#include "api.h"
|
#include "api.h"
|
||||||
|
|
||||||
#include <string.h> // For memcpy, strlen.
|
#include <string.h> // For memcpy, strlen.
|
||||||
|
@ -25,9 +25,6 @@
|
|||||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
// TODO(dcarney): remove
|
|
||||||
#define V8_ALLOW_ACCESS_TO_PERSISTENT_IMPLICIT
|
|
||||||
|
|
||||||
#include "v8.h"
|
#include "v8.h"
|
||||||
|
|
||||||
#include "api.h"
|
#include "api.h"
|
||||||
|
@ -4350,7 +4350,7 @@ THREADED_TEST(Equality) {
|
|||||||
|
|
||||||
v8::Handle<v8::Object> obj = v8::Object::New();
|
v8::Handle<v8::Object> obj = v8::Object::New();
|
||||||
v8::Persistent<v8::Object> alias(isolate, obj);
|
v8::Persistent<v8::Object> alias(isolate, obj);
|
||||||
CHECK(alias->StrictEquals(obj));
|
CHECK(v8::Local<v8::Object>::New(isolate, alias)->StrictEquals(obj));
|
||||||
alias.Dispose(isolate);
|
alias.Dispose(isolate);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6084,7 +6084,8 @@ v8::Handle<Value> WhammyPropertyGetter(Local<String> name,
|
|||||||
|
|
||||||
v8::Handle<v8::Object> obj = v8::Object::New();
|
v8::Handle<v8::Object> obj = v8::Object::New();
|
||||||
if (!prev.IsEmpty()) {
|
if (!prev.IsEmpty()) {
|
||||||
prev->Set(v8_str("next"), obj);
|
v8::Local<v8::Object>::New(info.GetIsolate(), prev)
|
||||||
|
->Set(v8_str("next"), obj);
|
||||||
prev.MakeWeak<Value, Snorkel>(info.GetIsolate(),
|
prev.MakeWeak<Value, Snorkel>(info.GetIsolate(),
|
||||||
new Snorkel(),
|
new Snorkel(),
|
||||||
&HandleWeakReference);
|
&HandleWeakReference);
|
||||||
@ -6237,10 +6238,11 @@ THREADED_TEST(IndependentHandleRevival) {
|
|||||||
v8::Persistent<v8::Object> object;
|
v8::Persistent<v8::Object> object;
|
||||||
{
|
{
|
||||||
v8::HandleScope handle_scope(isolate);
|
v8::HandleScope handle_scope(isolate);
|
||||||
object.Reset(isolate, v8::Object::New());
|
v8::Local<v8::Object> o = v8::Object::New();
|
||||||
object->Set(v8_str("x"), v8::Integer::New(1));
|
object.Reset(isolate, o);
|
||||||
|
o->Set(v8_str("x"), v8::Integer::New(1));
|
||||||
v8::Local<String> y_str = v8_str("y");
|
v8::Local<String> y_str = v8_str("y");
|
||||||
object->Set(y_str, y_str);
|
o->Set(y_str, y_str);
|
||||||
}
|
}
|
||||||
bool revived = false;
|
bool revived = false;
|
||||||
object.MakeWeak(isolate, &revived, &RevivingCallback);
|
object.MakeWeak(isolate, &revived, &RevivingCallback);
|
||||||
@ -6250,9 +6252,10 @@ THREADED_TEST(IndependentHandleRevival) {
|
|||||||
HEAP->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask);
|
HEAP->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask);
|
||||||
{
|
{
|
||||||
v8::HandleScope handle_scope(isolate);
|
v8::HandleScope handle_scope(isolate);
|
||||||
|
v8::Local<v8::Object> o = v8::Local<v8::Object>::New(isolate, object);
|
||||||
v8::Local<String> y_str = v8_str("y");
|
v8::Local<String> y_str = v8_str("y");
|
||||||
CHECK_EQ(v8::Integer::New(1), object->Get(v8_str("x")));
|
CHECK_EQ(v8::Integer::New(1), o->Get(v8_str("x")));
|
||||||
CHECK(object->Get(y_str)->Equals(y_str));
|
CHECK(o->Get(y_str)->Equals(y_str));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -12465,10 +12468,13 @@ THREADED_TEST(DisposeEnteredContext) {
|
|||||||
}
|
}
|
||||||
v8::HandleScope scope(isolate);
|
v8::HandleScope scope(isolate);
|
||||||
{
|
{
|
||||||
inner->Enter();
|
// Don't want a handle here, so do this unsafely
|
||||||
inner.Dispose(inner->GetIsolate());
|
v8::Handle<v8::Context> inner_local =
|
||||||
|
*reinterpret_cast<v8::Handle<v8::Context>*>(&inner);
|
||||||
|
inner_local->Enter();
|
||||||
|
inner.Dispose();
|
||||||
inner.Clear();
|
inner.Clear();
|
||||||
inner->Exit();
|
inner_local->Exit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -12487,7 +12493,8 @@ THREADED_TEST(Regress54) {
|
|||||||
local->SetInternalFieldCount(1);
|
local->SetInternalFieldCount(1);
|
||||||
templ.Reset(isolate, inner.Close(local));
|
templ.Reset(isolate, inner.Close(local));
|
||||||
}
|
}
|
||||||
v8::Handle<v8::Object> result = templ->NewInstance();
|
v8::Handle<v8::Object> result =
|
||||||
|
v8::Local<v8::ObjectTemplate>::New(isolate, templ)->NewInstance();
|
||||||
CHECK_EQ(1, result->InternalFieldCount());
|
CHECK_EQ(1, result->InternalFieldCount());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -17148,10 +17155,10 @@ TEST(RunTwoIsolatesOnSingleThread) {
|
|||||||
|
|
||||||
{
|
{
|
||||||
v8::Isolate::Scope iscope(isolate2);
|
v8::Isolate::Scope iscope(isolate2);
|
||||||
context2.Dispose(context2->GetIsolate());
|
context2.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
context1.Dispose(context1->GetIsolate());
|
context1.Dispose();
|
||||||
isolate1->Exit();
|
isolate1->Exit();
|
||||||
|
|
||||||
v8::V8::SetFatalErrorHandler(StoringErrorCallback);
|
v8::V8::SetFatalErrorHandler(StoringErrorCallback);
|
||||||
|
Loading…
Reference in New Issue
Block a user