From 7d55c1638910c1af33727065f404c358e2016fa4 Mon Sep 17 00:00:00 2001 From: "dcarney@chromium.org" Date: Mon, 3 Jun 2013 10:02:02 +0000 Subject: [PATCH] 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 --- include/v8.h | 6 ------ src/api.cc | 3 --- src/global-handles.cc | 3 --- test/cctest/test-api.cc | 33 ++++++++++++++++++++------------- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/include/v8.h b/include/v8.h index 5b0b304..54b513a 100644 --- a/include/v8.h +++ b/include/v8.h @@ -764,10 +764,7 @@ template class Persistent // NOLINT #ifndef V8_USE_UNSAFE_HANDLES -#ifndef V8_ALLOW_ACCESS_TO_PERSISTENT_IMPLICIT - private: -#endif // TODO(dcarney): make unlinkable before cutover V8_INLINE(Persistent(const Persistent& that)) : val_(that.val_) {} // TODO(dcarney): make unlinkable before cutover @@ -790,11 +787,8 @@ template class Persistent // NOLINT } // TODO(dcarney): remove before cutover V8_INLINE(T* operator*() const) { return val_; } - public: -#ifndef V8_ALLOW_ACCESS_TO_PERSISTENT_ARROW private: -#endif // TODO(dcarney): remove before cutover V8_INLINE(T* operator->() const) { return val_; } public: diff --git a/src/api.cc b/src/api.cc index 77c3088..0755ae1 100644 --- a/src/api.cc +++ b/src/api.cc @@ -25,9 +25,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // 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 // For memcpy, strlen. diff --git a/src/global-handles.cc b/src/global-handles.cc index 20a258c..b601e99 100644 --- a/src/global-handles.cc +++ b/src/global-handles.cc @@ -25,9 +25,6 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // 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 "api.h" diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc index 9eecf94..26a9207 100644 --- a/test/cctest/test-api.cc +++ b/test/cctest/test-api.cc @@ -4350,7 +4350,7 @@ THREADED_TEST(Equality) { v8::Handle obj = v8::Object::New(); v8::Persistent alias(isolate, obj); - CHECK(alias->StrictEquals(obj)); + CHECK(v8::Local::New(isolate, alias)->StrictEquals(obj)); alias.Dispose(isolate); } @@ -6084,7 +6084,8 @@ v8::Handle WhammyPropertyGetter(Local name, v8::Handle obj = v8::Object::New(); if (!prev.IsEmpty()) { - prev->Set(v8_str("next"), obj); + v8::Local::New(info.GetIsolate(), prev) + ->Set(v8_str("next"), obj); prev.MakeWeak(info.GetIsolate(), new Snorkel(), &HandleWeakReference); @@ -6237,10 +6238,11 @@ THREADED_TEST(IndependentHandleRevival) { v8::Persistent object; { v8::HandleScope handle_scope(isolate); - object.Reset(isolate, v8::Object::New()); - object->Set(v8_str("x"), v8::Integer::New(1)); + v8::Local o = v8::Object::New(); + object.Reset(isolate, o); + o->Set(v8_str("x"), v8::Integer::New(1)); v8::Local y_str = v8_str("y"); - object->Set(y_str, y_str); + o->Set(y_str, y_str); } bool revived = false; object.MakeWeak(isolate, &revived, &RevivingCallback); @@ -6250,9 +6252,10 @@ THREADED_TEST(IndependentHandleRevival) { HEAP->CollectAllGarbage(i::Heap::kAbortIncrementalMarkingMask); { v8::HandleScope handle_scope(isolate); + v8::Local o = v8::Local::New(isolate, object); v8::Local y_str = v8_str("y"); - CHECK_EQ(v8::Integer::New(1), object->Get(v8_str("x"))); - CHECK(object->Get(y_str)->Equals(y_str)); + CHECK_EQ(v8::Integer::New(1), o->Get(v8_str("x"))); + CHECK(o->Get(y_str)->Equals(y_str)); } } @@ -12465,10 +12468,13 @@ THREADED_TEST(DisposeEnteredContext) { } v8::HandleScope scope(isolate); { - inner->Enter(); - inner.Dispose(inner->GetIsolate()); + // Don't want a handle here, so do this unsafely + v8::Handle inner_local = + *reinterpret_cast*>(&inner); + inner_local->Enter(); + inner.Dispose(); inner.Clear(); - inner->Exit(); + inner_local->Exit(); } } @@ -12487,7 +12493,8 @@ THREADED_TEST(Regress54) { local->SetInternalFieldCount(1); templ.Reset(isolate, inner.Close(local)); } - v8::Handle result = templ->NewInstance(); + v8::Handle result = + v8::Local::New(isolate, templ)->NewInstance(); CHECK_EQ(1, result->InternalFieldCount()); } @@ -17148,10 +17155,10 @@ TEST(RunTwoIsolatesOnSingleThread) { { v8::Isolate::Scope iscope(isolate2); - context2.Dispose(context2->GetIsolate()); + context2.Dispose(); } - context1.Dispose(context1->GetIsolate()); + context1.Dispose(); isolate1->Exit(); v8::V8::SetFatalErrorHandler(StoringErrorCallback); -- 2.7.4