Index: Source/bindings/templates/interface.h |
diff --git a/Source/bindings/templates/interface.h b/Source/bindings/templates/interface.h |
index d29a30aa36789ee52faba89d6ce534261b03e2c6..504157dbeb50a09547c97fbce392bd9e5bd57539 100644 |
--- a/Source/bindings/templates/interface.h |
+++ b/Source/bindings/templates/interface.h |
@@ -48,7 +48,7 @@ class Dictionary; |
{% if named_constructor %} |
class {{v8_class}}Constructor { |
public: |
- static v8::Handle<v8::FunctionTemplate> domTemplate(v8::Isolate*, WrapperWorldType); |
+ static v8::Handle<v8::FunctionTemplate> domTemplate(v8::Isolate*); |
static const WrapperTypeInfo wrapperTypeInfo; |
}; |
@@ -57,7 +57,7 @@ class {{v8_class}} { |
public: |
static bool hasInstance(v8::Handle<v8::Value>, v8::Isolate*); |
static v8::Handle<v8::Object> findInstanceInPrototypeChain(v8::Handle<v8::Value>, v8::Isolate*); |
- static v8::Handle<v8::FunctionTemplate> domTemplate(v8::Isolate*, WrapperWorldType); |
+ static v8::Handle<v8::FunctionTemplate> domTemplate(v8::Isolate*); |
static {{cpp_class}}* toNative(v8::Handle<v8::Object> object) |
{ |
return fromInternalPointer(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex)); |
@@ -75,7 +75,7 @@ public: |
static EventTarget* toEventTarget(v8::Handle<v8::Object>); |
{% endif %} |
{% if interface_name == 'Window' %} |
- static v8::Handle<v8::ObjectTemplate> getShadowObjectTemplate(v8::Isolate*, WrapperWorldType); |
+ static v8::Handle<v8::ObjectTemplate> getShadowObjectTemplate(v8::Isolate*); |
{% endif %} |
{% for method in methods if method.is_custom %} |
{% filter conditional(method.conditional_string) %} |
@@ -257,7 +257,7 @@ inline void v8SetReturnValue(const CallbackInfo& callbackInfo, {{cpp_class}}* im |
template<typename CallbackInfo> |
inline void v8SetReturnValueForMainWorld(const CallbackInfo& callbackInfo, {{cpp_class}}* impl) |
{ |
- ASSERT(worldType(callbackInfo.GetIsolate()) == MainWorld); |
+ ASSERT(DOMWrapperWorld::current(callbackInfo.GetIsolate())->isMainWorld()); |
if (UNLIKELY(!impl)) { |
v8SetReturnValueNull(callbackInfo); |
return; |