| Index: Source/bindings/v8/V8Binding.cpp
|
| diff --git a/Source/bindings/v8/V8Binding.cpp b/Source/bindings/v8/V8Binding.cpp
|
| index c16f74ae3245c2764ed5ea45f4731a9eff974060..01dab2120fc6761c5d6d796097dc79ea754bcbb3 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());
|
| +}
|
| +
|
| +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() ? v8::Local<v8::Value>() : wrapper->GetHiddenValue(key);
|
| }
|
|
|
| } // namespace WebCore
|
|
|