Index: Source/bindings/v8/V8Binding.cpp |
diff --git a/Source/bindings/v8/V8Binding.cpp b/Source/bindings/v8/V8Binding.cpp |
index c16f74ae3245c2764ed5ea45f4731a9eff974060..998c8508c81e787527c338160e8df03b60bdeedf 100644 |
--- a/Source/bindings/v8/V8Binding.cpp |
+++ b/Source/bindings/v8/V8Binding.cpp |
@@ -539,8 +539,14 @@ DOMWrapperWorld* isolatedWorldForIsolate(v8::Isolate* isolate) |
return 0; |
if (!DOMWrapperWorld::isolatedWorldsExist()) |
return 0; |
- ASSERT(!v8::Context::GetEntered().IsEmpty()); |
- return DOMWrapperWorld::isolatedWorld(v8::Context::GetEntered()); |
+ ASSERT(v8::Context::InContext()); |
+ return DOMWrapperWorld::isolatedWorld(v8::Context::GetCurrent()); |
haraken
2013/07/18 00:00:29
Why did you make this change?
I guess your new co
adamk
2013/07/18 01:09:14
I can't explain why the old code was using GetEnte
|
+} |
+ |
+v8::Local<v8::Value> getHiddenValueFromMainWorldWrapper(v8::Isolate* isolate, ScriptWrappable* wrappable, v8::Handle<v8::String> key) |
+{ |
+ v8::Local<v8::Object> wrapper = wrappable->newLocalWrapper(isolate); |
+ return !wrapper.IsEmpty() ? wrapper->GetHiddenValue(key) : v8::Local<v8::Value>(); |
haraken
2013/07/18 00:00:29
Nit: I'd prefer:
wrapper.Empty() ? v8::Local<v8::
adamk
2013/07/18 01:09:14
Will do on the next upload.
|
} |
} // namespace WebCore |