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

Delta Between Two Patch Sets: include/AdblockPlus/JsValue.h

Issue 6584950149087232: Issue 1280 - Update v8 (Closed)
Left Patch Set: get rid of auto and fix friends of JsValue Created Oct. 31, 2014, 4:10 p.m.
Right Patch Set: revert not critical chanegs in JsValue ctr Created Nov. 3, 2014, 2:49 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « createsolution.bat ('k') | include/AdblockPlus/V8ValueHolder.h » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 */ 48 */
49 typedef std::vector<AdblockPlus::JsValuePtr> JsValueList; 49 typedef std::vector<AdblockPlus::JsValuePtr> JsValueList;
50 50
51 /** 51 /**
52 * Wrapper for JavaScript values. 52 * Wrapper for JavaScript values.
53 * See `JsEngine` for creating `JsValue` objects. 53 * See `JsEngine` for creating `JsValue` objects.
54 */ 54 */
55 class JsValue 55 class JsValue
56 { 56 {
57 friend class JsEngine; 57 friend class JsEngine;
58 protected:
59 JsValue(const JsValuePtr& value);
Felix Dahlke 2014/10/31 16:30:15 There's already a protected block below, why not m
sergei 2014/10/31 17:14:17 Sure, I can move. Do we have something in some sty
Felix Dahlke 2014/11/01 04:45:40 No, wasn't necessary to have that in the style so
sergei 2014/11/03 12:58:19 Merged
60 public: 58 public:
61 virtual ~JsValue(); 59 virtual ~JsValue();
62 60
63 bool IsUndefined() const; 61 bool IsUndefined() const;
64 bool IsNull() const; 62 bool IsNull() const;
65 bool IsString() const; 63 bool IsString() const;
66 bool IsNumber() const; 64 bool IsNumber() const;
67 bool IsBool() const; 65 bool IsBool() const;
68 bool IsObject() const; 66 bool IsObject() const;
69 bool IsArray() const; 67 bool IsArray() const;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 /** 117 /**
120 * Invokes the value as a function (see `IsFunction()`). 118 * Invokes the value as a function (see `IsFunction()`).
121 * @param params Optional list of parameters. 119 * @param params Optional list of parameters.
122 * @param thisPtr Optional `this` value. 120 * @param thisPtr Optional `this` value.
123 * @return Value returned by the function. 121 * @return Value returned by the function.
124 */ 122 */
125 JsValuePtr Call(const JsValueList& params = JsValueList(), 123 JsValuePtr Call(const JsValueList& params = JsValueList(),
126 AdblockPlus::JsValuePtr thisPtr = AdblockPlus::JsValuePtr()) const; 124 AdblockPlus::JsValuePtr thisPtr = AdblockPlus::JsValuePtr()) const;
127 125
128 v8::Local<v8::Value> UnwrapValue() const; 126 v8::Local<v8::Value> UnwrapValue() const;
129 private:
Felix Dahlke 2014/10/31 16:30:15 Same here, why add another private block when ther
130 JsValue(const JsEnginePtr& jsEngine, v8::Handle<v8::Value> value);
131 void SetProperty(const std::string& name, v8::Handle<v8::Value> val);
132 protected: 127 protected:
128 JsValue(JsValuePtr value);
133 JsEnginePtr jsEngine; 129 JsEnginePtr jsEngine;
134 private: 130 private:
131 JsValue(JsEnginePtr jsEngine, v8::Handle<v8::Value> value);
132 void SetProperty(const std::string& name, v8::Handle<v8::Value> val);
135 V8ValueHolder<v8::Value> value; 133 V8ValueHolder<v8::Value> value;
136 }; 134 };
137 } 135 }
138 136
139 #endif 137 #endif
LEFTRIGHT

Powered by Google App Engine
This is Rietveld