From 5633dfa6f5828e095435cb609834f26fda523c98 Mon Sep 17 00:00:00 2001 From: "vogelheim@chromium.org" Date: Thu, 10 Apr 2014 13:51:30 +0000 Subject: [PATCH] Remove V8_ALLOW_ACCESS_TO_RAW_HANDLE_CONSTRUCTOR. The usage of this define has been obsoleted by removal of UnsafePersistent from Chromium. Depends on https://codereview.chromium.org/230613005 R=dcarney@chromium.org BUG=276323 LOG=N Review URL: https://codereview.chromium.org/230443004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20656 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- include/v8.h | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/include/v8.h b/include/v8.h index 9d43cd7..04e7703 100644 --- a/include/v8.h +++ b/include/v8.h @@ -316,15 +316,6 @@ template class Handle { return New(isolate, that.val_); } -#ifndef V8_ALLOW_ACCESS_TO_RAW_HANDLE_CONSTRUCTOR - - private: -#endif - /** - * Creates a new handle for the specified value. - */ - V8_INLINE explicit Handle(T* val) : val_(val) {} - private: friend class Utils; template friend class Persistent; @@ -343,6 +334,11 @@ template class Handle { friend class Object; friend class Private; + /** + * Creates a new handle for the specified value. + */ + V8_INLINE explicit Handle(T* val) : val_(val) {} + V8_INLINE static Handle New(Isolate* isolate, T* that); T* val_; @@ -396,12 +392,6 @@ template class Local : public Handle { V8_INLINE static Local New(Isolate* isolate, const PersistentBase& that); -#ifndef V8_ALLOW_ACCESS_TO_RAW_HANDLE_CONSTRUCTOR - - private: -#endif - template V8_INLINE Local(S* that) : Handle(that) { } - private: friend class Utils; template friend class Eternal; @@ -420,6 +410,7 @@ template class Local : public Handle { template friend class PersistentValueMap; template friend class PersistentValueVector; + template V8_INLINE Local(S* that) : Handle(that) { } V8_INLINE static Local New(Isolate* isolate, T* that); }; @@ -729,15 +720,6 @@ template class Persistent : public PersistentBase { // This will be removed. V8_INLINE T* ClearAndLeak(); - // TODO(dcarney): remove -#ifndef V8_ALLOW_ACCESS_TO_RAW_HANDLE_CONSTRUCTOR - - private: -#endif - template V8_INLINE Persistent(S* that) : PersistentBase(that) { } - - V8_INLINE T* operator*() const { return this->val_; } - private: friend class Isolate; friend class Utils; @@ -746,6 +728,8 @@ template class Persistent : public PersistentBase { template friend class Persistent; template friend class ReturnValue; + template V8_INLINE Persistent(S* that) : PersistentBase(that) { } + V8_INLINE T* operator*() const { return this->val_; } template V8_INLINE void Copy(const Persistent& that); }; -- 2.7.4