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

Unified Diff: include/AdblockPlus/V8ValueHolder.h

Issue 6584950149087232: Issue 1280 - Update v8 (Closed)
Patch Set: get rid of auto and fix friends of JsValue Created Oct. 31, 2014, 5:06 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/AdblockPlus/JsValue.h ('k') | libadblockplus.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/AdblockPlus/V8ValueHolder.h
===================================================================
--- a/include/AdblockPlus/V8ValueHolder.h
+++ b/include/AdblockPlus/V8ValueHolder.h
@@ -33,17 +33,10 @@
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)
{
@@ -57,7 +50,11 @@
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)));
+ }
+ void reset(v8::Isolate* isolate = 0, std::auto_ptr<V8Persistent> value = std::auto_ptr<V8Persistent>(new V8Persistent()))
{
if (this->value.get())
{
@@ -65,33 +62,20 @@
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;
};
}
« no previous file with comments | « include/AdblockPlus/JsValue.h ('k') | libadblockplus.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld