Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: include/AdblockPlus/JsValue.h

Issue 6584950149087232: Issue 1280 - Update v8 (Closed)
Patch Set: get rid of auto and fix friends of JsValue Created Oct. 31, 2014, 5:11 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 10 matching lines...) Expand all
21 #include <stdint.h> 21 #include <stdint.h>
22 #include <string> 22 #include <string>
23 #include <vector> 23 #include <vector>
24 #include "tr1_memory.h" 24 #include "tr1_memory.h"
25 #include "V8ValueHolder.h" 25 #include "V8ValueHolder.h"
26 26
27 namespace v8 27 namespace v8
28 { 28 {
29 class Value; 29 class Value;
30 template<class T> class Handle; 30 template<class T> class Handle;
31 template<class T> class Local;
31 } 32 }
32 33
33 namespace AdblockPlus 34 namespace AdblockPlus
34 { 35 {
35 class JsValue; 36 class JsValue;
36 class JsEngine; 37 class JsEngine;
37 38
38 typedef std::tr1::shared_ptr<JsEngine> JsEnginePtr; 39 typedef std::tr1::shared_ptr<JsEngine> JsEnginePtr;
39 40
40 /** 41 /**
41 * Shared smart pointer to a `JsValue` instance. 42 * Shared smart pointer to a `JsValue` instance.
42 */ 43 */
43 typedef std::tr1::shared_ptr<JsValue> JsValuePtr; 44 typedef std::tr1::shared_ptr<JsValue> JsValuePtr;
44 45
45 /** 46 /**
46 * List of JavaScript values. 47 * List of JavaScript values.
47 */ 48 */
48 typedef std::vector<AdblockPlus::JsValuePtr> JsValueList; 49 typedef std::vector<AdblockPlus::JsValuePtr> JsValueList;
49 50
50 /** 51 /**
51 * Wrapper for JavaScript values. 52 * Wrapper for JavaScript values.
52 * See `JsEngine` for creating `JsValue` objects. 53 * See `JsEngine` for creating `JsValue` objects.
53 */ 54 */
54 class JsValue 55 class JsValue
55 { 56 {
56 friend class JsEngine; 57 friend class JsEngine;
58 protected:
59 JsValue(const JsValuePtr& value);
57 public: 60 public:
58 JsValue(JsValuePtr value);
59 virtual ~JsValue(); 61 virtual ~JsValue();
60 62
61 bool IsUndefined() const; 63 bool IsUndefined() const;
62 bool IsNull() const; 64 bool IsNull() const;
63 bool IsString() const; 65 bool IsString() const;
64 bool IsNumber() const; 66 bool IsNumber() const;
65 bool IsBool() const; 67 bool IsBool() const;
66 bool IsObject() const; 68 bool IsObject() const;
67 bool IsArray() const; 69 bool IsArray() const;
68 bool IsFunction() const; 70 bool IsFunction() const;
(...skipping 18 matching lines...) Expand all
87 89
88 //@{ 90 //@{
89 /** 91 /**
90 * Sets a property value if this is an object (see `IsObject()`). 92 * Sets a property value if this is an object (see `IsObject()`).
91 * @param name Property name. 93 * @param name Property name.
92 * @param val Property value. 94 * @param val Property value.
93 */ 95 */
94 void SetProperty(const std::string& name, const std::string& val); 96 void SetProperty(const std::string& name, const std::string& val);
95 void SetProperty(const std::string& name, int64_t val); 97 void SetProperty(const std::string& name, int64_t val);
96 void SetProperty(const std::string& name, bool val); 98 void SetProperty(const std::string& name, bool val);
97 void SetProperty(const std::string& name, JsValuePtr value); 99 void SetProperty(const std::string& name, const JsValuePtr& value);
98 inline void SetProperty(const std::string& name, const char* val) 100 inline void SetProperty(const std::string& name, const char* val)
99 { 101 {
100 SetProperty(name, std::string(val)); 102 SetProperty(name, std::string(val));
101 } 103 }
102 inline void SetProperty(const std::string& name, int val) 104 inline void SetProperty(const std::string& name, int val)
103 { 105 {
104 SetProperty(name, static_cast<int64_t>(val)); 106 SetProperty(name, static_cast<int64_t>(val));
105 } 107 }
106 //@} 108 //@}
107 109
108 /** 110 /**
109 * Returns the value's class name, e.g.\ _Array_ for arrays 111 * Returns the value's class name, e.g.\ _Array_ for arrays
110 * (see `IsArray()`). 112 * (see `IsArray()`).
111 * Technically, this is the name of the function that was used as a 113 * Technically, this is the name of the function that was used as a
112 * constructor. 114 * constructor.
113 * @return Class name of the value. 115 * @return Class name of the value.
114 */ 116 */
115 std::string GetClass() const; 117 std::string GetClass() const;
116 118
117 /** 119 /**
118 * Invokes the value as a function (see `IsFunction()`). 120 * Invokes the value as a function (see `IsFunction()`).
119 * @param params Optional list of parameters. 121 * @param params Optional list of parameters.
120 * @param thisPtr Optional `this` value. 122 * @param thisPtr Optional `this` value.
121 * @return Value returned by the function. 123 * @return Value returned by the function.
122 */ 124 */
123 JsValuePtr Call(const JsValueList& params = JsValueList(), 125 JsValuePtr Call(const JsValueList& params = JsValueList(),
124 AdblockPlus::JsValuePtr thisPtr = AdblockPlus::JsValuePtr()) const; 126 AdblockPlus::JsValuePtr thisPtr = AdblockPlus::JsValuePtr()) const;
125 127
128 v8::Local<v8::Value> UnwrapValue() const;
129 private:
130 JsValue(const JsEnginePtr& jsEngine, v8::Handle<v8::Value> value);
131 void SetProperty(const std::string& name, v8::Handle<v8::Value> val);
126 protected: 132 protected:
127 JsValue(JsEnginePtr jsEngine, v8::Handle<v8::Value> value);
128 void SetProperty(const std::string& name, v8::Handle<v8::Value> val);
129
130 JsEnginePtr jsEngine; 133 JsEnginePtr jsEngine;
134 private:
Wladimir Palant 2014/11/01 22:30:25 Nit: Why not merge the two private sections?
sergei 2014/11/03 12:58:19 merged
131 V8ValueHolder<v8::Value> value; 135 V8ValueHolder<v8::Value> value;
132 }; 136 };
133 } 137 }
134 138
135 #endif 139 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld