Merge Webkit 47001 - 20090810 Vitaly Repeshko <vitalyr@quad.spb.corp.google...

WebCore/bindings/v8/V8ObjectEventListener.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 36 matching lines @@
         if (proxy)
             proxy->objectListeners()->remove(listener);
 
         // Because the listener is no longer in the list, it must be disconnected from the frame to avoid dangling frame pointer
         // in the destructor.
         listener->disconnectFrame();
     }
     listener->disposeListenerObject();
 }
 
-// Object event listeners (such as XmlHttpRequest and MessagePort) are
-// different from listeners on DOM nodes. An object event listener wrapper
-// only holds a weak reference to the JS function. A strong reference can
-// create a cycle.
+// An object event listener wrapper only holds a weak reference to the
+// JS function. A strong reference can create a cycle.
 //
-// The lifetime of these objects is bounded by the life time of its JS
-// wrapper. So we can create a hidden reference from the JS wrapper to
-// to its JS function.
+// The lifetime of these objects is bounded by the life time of the JS
+// wrapper of XHR or Node. So we can create a hidden reference from
+// the JS wrapper to to its JS function.
 //
 //                          (map)
-//              XHR      <----------  JS_wrapper
+//          XHR or Node  <----------  JS_wrapper
 //               |             (hidden) :  ^
-//               V                      V  : (may reachable by closure)
+//               V                      V  : (may be reachable by closure)
 //           V8_listener  --------> JS_function
 //                         (weak)  <-- may create a cycle if it is strong
 //
-// The persistent reference is made weak in the constructor
-// of V8ObjectEventListener.
+// The persistent reference is made weak in the constructor of
+// V8ObjectEventListener.
 
 V8ObjectEventListener::V8ObjectEventListener(Frame* frame, v8::Local<v8::Object> listener, bool isInline)
     : V8EventListener(frame, listener, isInline)
 {
     m_listener.MakeWeak(this, weakObjectEventListenerCallback);
 }
 
 V8ObjectEventListener::~V8ObjectEventListener()
 {
     if (m_frame) {
         ASSERT(!m_listener.IsEmpty());
         V8Proxy* proxy = V8Proxy::retrieve(m_frame);
         if (proxy)
             proxy->objectListeners()->remove(this);
     }
 
     disposeListenerObject();
 }
 
 } // namespace WebCore