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

Delta Between Two Patch Sets: src/JsValue.cpp

Issue 29393589: Issue 5013 - Make more methods const.- introduced JsConstValuePtr and JsConstValueList- JsValue:… (Closed) Base URL: https://hg.adblockplus.org/libadblockplus/
Left Patch Set: Now mostly use the single param Call() overload Created March 24, 2017, 2:10 p.m.
Right Patch Set: Rebased on master Created March 24, 2017, 2:40 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 | « src/FilterEngine.cpp ('k') | src/Notification.cpp » ('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 <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2017 eyeo GmbH 3 * Copyright (C) 2006-2017 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 132
133 std::vector<std::string> AdblockPlus::JsValue::GetOwnPropertyNames() const 133 std::vector<std::string> AdblockPlus::JsValue::GetOwnPropertyNames() const
134 { 134 {
135 if (!IsObject()) 135 if (!IsObject())
136 throw new std::runtime_error("Attempting to get propert list for a non-objec t"); 136 throw new std::runtime_error("Attempting to get propert list for a non-objec t");
137 137
138 const JsContext context(jsEngine); 138 const JsContext context(jsEngine);
139 v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(UnwrapValue()); 139 v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(UnwrapValue());
140 JsValueList properties = JsValuePtr(new JsValue(jsEngine, object->GetOwnProper tyNames()))->AsList(); 140 JsValueList properties = JsValuePtr(new JsValue(jsEngine, object->GetOwnProper tyNames()))->AsList();
141 std::vector<std::string> result; 141 std::vector<std::string> result;
142 for (JsValueList::iterator it = properties.begin(); it != properties.end(); ++ it) 142 for (const auto& property : properties)
143 result.push_back((*it)->AsString()); 143 result.push_back(property->AsString());
144 return result; 144 return result;
145 } 145 }
146 146
147 147
148 AdblockPlus::JsValuePtr AdblockPlus::JsValue::GetProperty(const std::string& nam e) const 148 AdblockPlus::JsValuePtr AdblockPlus::JsValue::GetProperty(const std::string& nam e) const
149 { 149 {
150 if (!IsObject()) 150 if (!IsObject())
151 throw new std::runtime_error("Attempting to get property of a non-object"); 151 throw new std::runtime_error("Attempting to get property of a non-object");
152 152
153 const JsContext context(jsEngine); 153 const JsContext context(jsEngine);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 { 215 {
216 v8::Local<v8::Context> localContext = v8::Local<v8::Context>::New( 216 v8::Local<v8::Context> localContext = v8::Local<v8::Context>::New(
217 jsEngine->GetIsolate(), *jsEngine->context); 217 jsEngine->GetIsolate(), *jsEngine->context);
218 thisPtr = JsValuePtr(new JsValue(jsEngine, localContext->Global())); 218 thisPtr = JsValuePtr(new JsValue(jsEngine, localContext->Global()));
219 } 219 }
220 if (!thisPtr->IsObject()) 220 if (!thisPtr->IsObject())
221 throw new std::runtime_error("`this` pointer has to be an object"); 221 throw new std::runtime_error("`this` pointer has to be an object");
222 v8::Local<v8::Object> thisObj = v8::Local<v8::Object>::Cast(thisPtr->UnwrapVal ue()); 222 v8::Local<v8::Object> thisObj = v8::Local<v8::Object>::Cast(thisPtr->UnwrapVal ue());
223 223
224 std::vector<v8::Handle<v8::Value>> argv; 224 std::vector<v8::Handle<v8::Value>> argv;
225 for (const auto param : params) 225 for (const auto& param : params)
226 argv.push_back(param->UnwrapValue()); 226 argv.push_back(param->UnwrapValue());
227 227
228 const v8::TryCatch tryCatch; 228 const v8::TryCatch tryCatch;
229 v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue()); 229 v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(UnwrapValue());
230 v8::Local<v8::Value> result = func->Call(thisObj, argv.size(), 230 v8::Local<v8::Value> result = func->Call(thisObj, argv.size(),
231 argv.size() ? &argv.front() : 0); 231 argv.size() ? &argv.front() : 0);
232 232
233 if (tryCatch.HasCaught()) 233 if (tryCatch.HasCaught())
234 throw JsError(tryCatch.Exception(), tryCatch.Message()); 234 throw JsError(tryCatch.Exception(), tryCatch.Message());
235 235
236 return JsValuePtr(new JsValue(jsEngine, result)); 236 return JsValuePtr(new JsValue(jsEngine, result));
237 } 237 }
238 238
239 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsConstValuePtr& arg) c onst 239 AdblockPlus::JsValuePtr AdblockPlus::JsValue::Call(const JsConstValuePtr& arg) c onst
240 { 240 {
241 JsConstValueList params; 241 JsConstValueList params;
242 params.push_back(arg); 242 params.push_back(arg);
243 return Call(params); 243 return Call(params);
244 } 244 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld