Issue 1280 - Update v8

include/AdblockPlus/V8ValueHolder.h

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 15 matching lines @@
   template<class T> class Handle;
   template<class T> class Persistent;
 }
 
 namespace AdblockPlus
 {
   template<class T>
   class V8ValueHolder
   {
   public:
+    typedef typename v8::Persistent<T> V8Persistent;
     V8ValueHolder()
     {
-      reset(0, v8::Persistent<T>());
-    }
-    V8ValueHolder(V8ValueHolder& value)
-    {
-      reset(value.isolate, static_cast<v8::Handle<T> >(value));
-    }
-    V8ValueHolder(v8::Isolate* isolate, v8::Persistent<T> value)
-    {
-      reset(isolate, value);
+      reset();
     }
     V8ValueHolder(v8::Isolate* isolate, v8::Handle<T> value)
     {
       reset(isolate, value);
     }
     ~V8ValueHolder()
     {
       if (this->value.get())
       {
         this->value->Dispose(this->isolate);
         this->value.reset(0);
       }
     }
-    void reset(v8::Isolate* isolate, v8::Persistent<T> value)
+    void reset(v8::Isolate* isolate, v8::Handle<T> value)
+    {
+        reset(isolate, std::auto_ptr<V8Persistent>(new V8Persistent(isolate, value)));

[Wladimir Palant, 2014/11/01 22:30:25]

Nit: two spaces for indentation please.

[sergei, 2014/11/03 12:58:19]

fixed

+    }
+    void reset(v8::Isolate* isolate = 0, std::auto_ptr<V8Persistent> value = std::auto_ptr<V8Persistent>(new V8Persistent()))
     {
       if (this->value.get())
       {
         this->value->Dispose(this->isolate);
         this->value.reset(0);
       }
 
-      if (!value.IsEmpty())
+      if (!value->IsEmpty())
       {
         this->isolate = isolate;
-        this->value.reset(new v8::Persistent<T>(value));
+        this->value = value;
       }
     }
 
-    void reset(v8::Isolate* isolate, v8::Handle<T> value)
-    {
-      reset(isolate, v8::Persistent<T>::New(isolate, value));
-    }
-
-    T* operator->() const
-    {
-      return **value;
-    }
-    operator v8::Handle<T>() const
-    {
-      return *value;
-    }
-    operator v8::Persistent<T>() const
+    operator V8Persistent&() const
     {
       return *value;
     }
   private:
     v8::Isolate* isolate;
-    std::auto_ptr<v8::Persistent<T> > value;
+    std::auto_ptr<V8Persistent> value;
   };
 }
 
 #endif