Index: trunk/Source/bindings/v8/V8PerContextData.cpp |
=================================================================== |
--- trunk/Source/bindings/v8/V8PerContextData.cpp (revision 170423) |
+++ trunk/Source/bindings/v8/V8PerContextData.cpp (working copy) |
@@ -68,7 +68,7 @@ |
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 @@ |
, m_perContextData(0) |
, m_world(world) |
{ |
+ ASSERT(m_world); |
m_context.setWeak(this, &V8PerContextDataHolder::weakCallback); |
context->SetAlignedPointerInEmbedderData(v8ContextPerContextDataIndex, this); |
} |
@@ -130,10 +131,9 @@ |
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; |
} |