Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / bindings / v8 / V8LazyEventListener.cpp

diff --git a/src/third_party/WebKit/Source/bindings/v8/V8LazyEventListener.cpp b/src/third_party/WebKit/Source/bindings/v8/V8LazyEventListener.cpp
index 78f4637..030a1d4 100644 (file)
--- a/src/third_party/WebKit/Source/bindings/v8/V8LazyEventListener.cpp
+++ b/src/third_party/WebKit/Source/bindings/v8/V8LazyEventListener.cpp
@@ -52,7 +52,7 @@
 namespace WebCore {
 
 V8LazyEventListener::V8LazyEventListener(const AtomicString& functionName, const AtomicString& eventParameterName, const String& code, const String sourceURL, const TextPosition& position, Node* node, v8::Isolate* isolate)
-    : V8AbstractEventListener(true, mainThreadNormalWorld(), isolate)
+    : V8AbstractEventListener(true, DOMWrapperWorld::mainWorld(), isolate)
     , m_functionName(functionName)
     , m_eventParameterName(eventParameterName)
     , m_code(code)
@@ -201,19 +201,11 @@ void V8LazyEventListener::prepareListenerObject(ExecutionContext* context)
     // source returned (sometimes a RegExp is applied as well) for some
     // other use. That fails miserably if the actual wrapper source is
     // returned.
-    v8::Handle<v8::FunctionTemplate> toStringTemplate =
-        V8PerIsolateData::current()->lazyEventListenerToStringTemplate();
-    if (toStringTemplate.IsEmpty())
-        toStringTemplate = v8::FunctionTemplate::New(isolate, V8LazyEventListenerToString);
-    v8::Local<v8::Function> toStringFunction;
-    if (!toStringTemplate.IsEmpty())
-        toStringFunction = toStringTemplate->GetFunction();
-    if (!toStringFunction.IsEmpty()) {
-        String toStringString = "function " + m_functionName + "(" + m_eventParameterName + ") {\n  " + m_code + "\n}";
-        setHiddenValue(isolate, wrappedFunction, "toStringString", v8String(isolate, toStringString));
-        wrappedFunction->Set(v8AtomicString(isolate, "toString"), toStringFunction);
-    }
-
+    v8::Local<v8::Function> toStringFunction = v8::Function::New(isolate, V8LazyEventListenerToString);
+    ASSERT(!toStringFunction.IsEmpty());
+    String toStringString = "function " + m_functionName + "(" + m_eventParameterName + ") {\n  " + m_code + "\n}";
+    setHiddenValue(isolate, wrappedFunction, "toStringString", v8String(isolate, toStringString));
+    wrappedFunction->Set(v8AtomicString(isolate, "toString"), toStringFunction);
     wrappedFunction->SetName(v8String(isolate, m_functionName));
 
     // FIXME: Remove the following comment-outs.