| Index: Source/bindings/v8/V8PerContextData.cpp
|
| diff --git a/Source/bindings/v8/V8PerContextData.cpp b/Source/bindings/v8/V8PerContextData.cpp
|
| index bd1f190c5b247c0efe609a2026c46e18635eb63a..059c4ad0bf5894b4636c753e14fda12d23171241 100644
|
| --- a/Source/bindings/v8/V8PerContextData.cpp
|
| +++ b/Source/bindings/v8/V8PerContextData.cpp
|
| @@ -68,7 +68,7 @@ public:
|
|
|
| V8PerContextData* perContextData() const { return m_perContextData; }
|
| void setPerContextData(V8PerContextData* data) { m_perContextData = data; }
|
| - DOMWrapperWorld* world() const { return m_world.get(); }
|
| + DOMWrapperWorld& world() const { return *m_world; }
|
| v8::Handle<v8::Context> context() const { return m_context.newLocal(m_isolate); }
|
|
|
| private:
|
| @@ -78,6 +78,7 @@ private:
|
| , m_perContextData(0)
|
| , m_world(world)
|
| {
|
| + ASSERT(m_world);
|
| m_context.setWeak(this, &V8PerContextDataHolder::weakCallback);
|
| context->SetAlignedPointerInEmbedderData(v8ContextPerContextDataIndex, this);
|
| }
|
| @@ -130,10 +131,9 @@ V8PerContextData* V8PerContextData::from(v8::Handle<v8::Context> context)
|
| return V8PerContextDataHolder::from(context)->perContextData();
|
| }
|
|
|
| -DOMWrapperWorld* V8PerContextData::world(v8::Handle<v8::Context> context)
|
| +DOMWrapperWorld& V8PerContextData::world(v8::Handle<v8::Context> context)
|
| {
|
| - DOMWrapperWorld* world = V8PerContextDataHolder::from(context)->world();
|
| - ASSERT(world);
|
| + DOMWrapperWorld& world = V8PerContextDataHolder::from(context)->world();
|
| return world;
|
| }
|
|
|
|
|