Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Unified Diff: gin/wrappable.cc

Issue 107113005: Gin: Consolidate all the Converter<Wrappable> subclasses. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ok Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gin/wrappable.cc
diff --git a/gin/wrappable.cc b/gin/wrappable.cc
index e9217baa7e213fcd6f38578155e2560b73cad6ae..0338211070af79b655a04895d2114135becd4b35 100644
--- a/gin/wrappable.cc
+++ b/gin/wrappable.cc
@@ -17,9 +17,9 @@ Wrappable::~Wrappable() {
}
v8::Handle<v8::Object> Wrappable::GetWrapper(v8::Isolate* isolate) {
- v8::Handle<v8::Value> wrapper = ConvertToV8(isolate, this);
- DCHECK(wrapper->IsObject());
- return v8::Handle<v8::Object>::Cast(wrapper);
+ if (wrapper_.IsEmpty())
+ CreateWrapper(isolate);
+ return v8::Local<v8::Object>::New(isolate, wrapper_);
}
void Wrappable::WeakCallback(
@@ -43,26 +43,4 @@ v8::Handle<v8::Object> Wrappable::CreateWrapper(v8::Isolate* isolate) {
return wrapper;
}
-v8::Handle<v8::Value> Converter<Wrappable*>::ToV8(v8::Isolate* isolate,
- Wrappable* val) {
- if (val->wrapper_.IsEmpty())
- return val->CreateWrapper(isolate);
- return v8::Local<v8::Object>::New(isolate, val->wrapper_);
-}
-
-bool Converter<Wrappable*>::FromV8(v8::Isolate* isolate,
- v8::Handle<v8::Value> val, Wrappable** out) {
- if (!val->IsObject())
- return false;
- v8::Handle<v8::Object> obj = v8::Handle<v8::Object>::Cast(val);
- WrapperInfo* info = WrapperInfo::From(obj);
- if (!info)
- return false;
- void* pointer = obj->GetAlignedPointerFromInternalField(kEncodedValueIndex);
- Wrappable* wrappable = static_cast<Wrappable*>(pointer);
- CHECK(wrappable->GetWrapperInfo() == info); // Security check for cast above.
- *out = wrappable;
- return true;
-}
-
} // namespace gin
« gin/wrappable.h ('K') | « gin/wrappable.h ('k') | gin/wrappable_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698