Issue 1280 - Update v8

include/AdblockPlus/JsValue.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 10 matching lines @@
 #include <stdint.h>
 #include <string>
 #include <vector>
 #include "tr1_memory.h"
 #include "V8ValueHolder.h"
 
 namespace v8
 {
   class Value;
   template<class T> class Handle;
+  template<class T> class Local;
 }
 
 namespace AdblockPlus
 {
   class JsValue;
   class JsEngine;
 
   typedef std::tr1::shared_ptr<JsEngine> JsEnginePtr;
 
   /**
    * Shared smart pointer to a `JsValue` instance.
    */
   typedef std::tr1::shared_ptr<JsValue> JsValuePtr;
 
   /**
    * List of JavaScript values.
    */
   typedef std::vector<AdblockPlus::JsValuePtr> JsValueList;
 
   /**
    * Wrapper for JavaScript values.
    * See `JsEngine` for creating `JsValue` objects.
    */
   class JsValue
   {
     friend class JsEngine;
+  protected:
+    JsValue(const JsValuePtr& value);

[Felix Dahlke, 2014/10/31 16:30:15]

There's already a protected block below, why not move that there?

[sergei, 2014/10/31 17:14:17]

Sure, I can move. Do we have something in some style guide regarding it? Like
firstly public, protected and private methods then variables with the same
visibility order?

[Felix Dahlke, 2014/11/01 04:45:40]

No, wasn't necessary to have that in the style so far, Mozilla doesn't have it
either. It's more about consistency with the surrounding code: JsValue.h (and
any other header in libadblockplus at least) only have one
public/protected/private block each.

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

Merged

   public:
-    JsValue(JsValuePtr value);
     virtual ~JsValue();
 
     bool IsUndefined() const;
     bool IsNull() const;
     bool IsString() const;
     bool IsNumber() const;
     bool IsBool() const;
     bool IsObject() const;
     bool IsArray() const;
     bool IsFunction() const;
@@ skipping 18 matching lines @@
 
     //@{
     /**
      * Sets a property value if this is an object (see `IsObject()`).
      * @param name Property name.
      * @param val Property value.
      */
     void SetProperty(const std::string& name, const std::string& val);
     void SetProperty(const std::string& name, int64_t val);
     void SetProperty(const std::string& name, bool val);
-    void SetProperty(const std::string& name, JsValuePtr value);
+    void SetProperty(const std::string& name, const JsValuePtr& value);
     inline void SetProperty(const std::string& name, const char* val)
     {
       SetProperty(name, std::string(val));
     }
     inline void SetProperty(const std::string& name, int val)
     {
       SetProperty(name, static_cast<int64_t>(val));
     }
     //@}
 
     /**
      * Returns the value's class name, e.g.\ _Array_ for arrays
      * (see `IsArray()`).
      * Technically, this is the name of the function that was used as a
      * constructor.
      * @return Class name of the value.
      */
     std::string GetClass() const;
 
     /**
      * Invokes the value as a function (see `IsFunction()`).
      * @param params Optional list of parameters.
      * @param thisPtr Optional `this` value.
      * @return Value returned by the function.
      */
     JsValuePtr Call(const JsValueList& params = JsValueList(),
         AdblockPlus::JsValuePtr thisPtr = AdblockPlus::JsValuePtr()) const;
 
+    v8::Local<v8::Value> UnwrapValue() const;
+  private:

[Felix Dahlke, 2014/10/31 16:30:15]

Same here, why add another private block when there's one below?

+    JsValue(const JsEnginePtr& jsEngine, v8::Handle<v8::Value> value);
+    void SetProperty(const std::string& name, v8::Handle<v8::Value> val);
   protected:
-    JsValue(JsEnginePtr jsEngine, v8::Handle<v8::Value> value);
-    void SetProperty(const std::string& name, v8::Handle<v8::Value> val);
-
     JsEnginePtr jsEngine;
+  private:
     V8ValueHolder<v8::Value> value;
   };
 }
 
 #endif