Merge 113086 - [v8] Fix memory leak in V8LazyEventListener

Source/WebCore/bindings/v8/V8LazyEventListener.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 32 matching lines @@
 #include "V8HTMLFormElement.h"
 #include "V8HiddenPropertyName.h"
 #include "V8Node.h"
 #include "V8Proxy.h"
 #include "WorldContextHandle.h"
 
 #include <wtf/StdLibExtras.h>
 
 namespace WebCore {
 
-V8LazyEventListener::V8LazyEventListener(const AtomicString& functionName, const AtomicString& eventParameterName, const String& code, const String sourceURL, const TextPosition& position, PassRefPtr<Node> node, const WorldContextHandle& worldContext)
+V8LazyEventListener::V8LazyEventListener(const AtomicString& functionName, const AtomicString& eventParameterName, const String& code, const String sourceURL, const TextPosition& position, Node* node, const WorldContextHandle& worldContext)
     : V8AbstractEventListener(true, worldContext)
     , m_functionName(functionName)
     , m_eventParameterName(eventParameterName)
     , m_code(code)
     , m_sourceURL(sourceURL)
     , m_node(node)
-    , m_formElement(0)
     , m_position(position)
 {
-    if (m_node && m_node->isHTMLElement())
-        m_formElement = static_cast<HTMLElement*>(m_node.get())->form();
 }
 
 template<typename T>
 v8::Handle<v8::Object> toObjectWrapper(T* domObject)
 {
     if (!domObject)
         return v8::Object::New();
     v8::Handle<v8::Value> value = toV8(domObject);
     if (value.IsEmpty())
         return v8::Object::New();
@@ skipping 83 matching lines @@
     // Call v8::Script::Run() directly to avoid an erroneous call to V8RecursionScope::didLeaveScriptContext().
     // FIXME: Remove this code when we stop doing the 'with' hack above.
     v8::Local<v8::Value> value = script->Run();
     if (value.IsEmpty())
         return;
 
     // Call the outer function to get the inner function.
     ASSERT(value->IsFunction());
     v8::Local<v8::Function> intermediateFunction = value.As<v8::Function>();
 
-    v8::Handle<v8::Object> nodeWrapper = toObjectWrapper<Node>(m_node.get());
-    v8::Handle<v8::Object> formWrapper = toObjectWrapper<HTMLFormElement>(m_formElement.get());
+    HTMLFormElement* formElement = 0;
+    if (m_node && m_node->isHTMLElement())
+        formElement = static_cast<HTMLElement*>(m_node)->form();
+
+    v8::Handle<v8::Object> nodeWrapper = toObjectWrapper<Node>(m_node);
+    v8::Handle<v8::Object> formWrapper = toObjectWrapper<HTMLFormElement>(formElement);
     v8::Handle<v8::Object> documentWrapper = toObjectWrapper<Document>(m_node ? m_node->ownerDocument() : 0);
 
-    m_node.clear();
-    m_formElement.clear();
-
     v8::Handle<v8::Value> parameters[3] = { nodeWrapper, formWrapper, documentWrapper };
 
     // Use Call directly to avoid an erroneous call to V8RecursionScope::didLeaveScriptContext().
     // FIXME: Remove this code when we stop doing the 'with' hack above.
     v8::Local<v8::Value> innerValue = intermediateFunction->Call(v8Context->Global(), 3, parameters);
 
     if (innerValue.IsEmpty() || !innerValue->IsFunction())
         return;
 
     v8::Local<v8::Function> wrappedFunction = innerValue.As<v8::Function>();
@@ skipping 20 matching lines @@
         toStringResult.append(m_eventParameterName);
         toStringResult.append(") {\n  ");
         toStringResult.append(m_code);
         toStringResult.append("\n}");
         wrappedFunction->SetHiddenValue(V8HiddenPropertyName::toStringString(), v8ExternalString(toStringResult));
         wrappedFunction->Set(v8::String::NewSymbol("toString"), toStringFunction);
     }
 
     wrappedFunction->SetName(v8::String::New(fromWebCoreString(m_functionName), m_functionName.length()));
 
+    // Since we only parse once, there's no need to keep data used for parsing around anymore.
+    m_functionName = String();
+    m_code = String();
+    m_eventParameterName = String();
+    m_sourceURL = String();
+
     setListenerObject(wrappedFunction);
 }
 
 } // namespace WebCore