2009-04-14 Geoffrey Garen <ggaren@apple.com>

        Used svn merge -r42529:42528 to roll out my last patch because it broke
        the build.

        * bindings/js/JSDOMGlobalObject.cpp:
        (WebCore::JSDOMGlobalObject::~JSDOMGlobalObject):
        (WebCore::JSDOMGlobalObject::findJSProtectedEventListener):
        (WebCore::JSDOMGlobalObject::findOrCreateJSProtectedEventListener):
        (WebCore::JSDOMGlobalObject::jsProtectedEventListeners):
        (WebCore::JSDOMGlobalObject::jsProtectedInlineEventListeners):
        * bindings/js/JSDOMGlobalObject.h:



git-svn-id: svn://svn.chromium.org/blink/trunk@42531 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2009-04-14  Geoffrey Garen  <ggaren@apple.com>
+
+        Used svn merge -r42529:42528 to roll out my last patch because it broke
+        the build.
+
+        * bindings/js/JSDOMGlobalObject.cpp:
+        (WebCore::JSDOMGlobalObject::~JSDOMGlobalObject):
+        (WebCore::JSDOMGlobalObject::findJSProtectedEventListener):
+        (WebCore::JSDOMGlobalObject::findOrCreateJSProtectedEventListener):
+        (WebCore::JSDOMGlobalObject::jsProtectedEventListeners):
+        (WebCore::JSDOMGlobalObject::jsProtectedInlineEventListeners):
+        * bindings/js/JSDOMGlobalObject.h:
+
 2009-04-14  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Sam Weinig.

third_party/WebKit/WebCore/bindings/js/JSDOMGlobalObject.cpp

@@ -52,6 +52,17 @@ JSDOMGlobalObject::JSDOMGlobalObject(PassRefPtr<Structure> structure, JSDOMGloba
 
 JSDOMGlobalObject::~JSDOMGlobalObject()
 {
+    // Clear any backpointers to the window
+    ProtectedListenersMap::iterator i1 = d()->jsProtectedEventListeners.begin();
+    ProtectedListenersMap::iterator e1 = d()->jsProtectedEventListeners.end();
+    for (; i1 != e1; ++i1)
+        i1->second->clearGlobalObject();
+
+    i1 = d()->jsProtectedInlineEventListeners.begin();
+    e1 = d()->jsProtectedInlineEventListeners.end();
+    for (; i1 != e1; ++i1)
+        i1->second->clearGlobalObject();
+
     JSListenersMap::iterator i2 = d()->jsEventListeners.begin();
     JSListenersMap::iterator e2 = d()->jsEventListeners.end();
     for (; i2 != e2; ++i2)
@@ -78,6 +89,27 @@ void JSDOMGlobalObject::mark()
     }
 }
 
+JSProtectedEventListener* JSDOMGlobalObject::findJSProtectedEventListener(JSValuePtr val, bool isInline)
+{
+    if (!val.isObject())
+        return 0;
+    JSObject* object = asObject(val);
+    ProtectedListenersMap& listeners = isInline ? d()->jsProtectedInlineEventListeners : d()->jsProtectedEventListeners;
+    return listeners.get(object);
+}
+
+PassRefPtr<JSProtectedEventListener> JSDOMGlobalObject::findOrCreateJSProtectedEventListener(JSValuePtr val, bool isInline)
+{
+    if (JSProtectedEventListener* listener = findJSProtectedEventListener(val, isInline))
+        return listener;
+
+    if (!val.isObject())
+        return 0;
+
+    // The JSProtectedEventListener constructor adds it to our jsProtectedEventListeners map.
+    return JSProtectedEventListener::create(asObject(val), this, isInline).get();
+}
+
 JSEventListener* JSDOMGlobalObject::findJSEventListener(JSValuePtr val, bool isInline)
 {
     if (!val.isObject())
@@ -99,6 +131,16 @@ PassRefPtr<JSEventListener> JSDOMGlobalObject::findOrCreateJSEventListener(JSVal
     return JSEventListener::create(asObject(val), this, isInline).get();
 }
 
+JSDOMGlobalObject::ProtectedListenersMap& JSDOMGlobalObject::jsProtectedEventListeners()
+{
+    return d()->jsProtectedEventListeners;
+}
+
+JSDOMGlobalObject::ProtectedListenersMap& JSDOMGlobalObject::jsProtectedInlineEventListeners()
+{
+    return d()->jsProtectedInlineEventListeners;
+}
+
 JSDOMGlobalObject::JSListenersMap& JSDOMGlobalObject::jsEventListeners()
 {
     return d()->jsEventListeners;

third_party/WebKit/WebCore/bindings/js/JSDOMGlobalObject.h

@@ -32,6 +32,7 @@
 namespace WebCore {
 
     class Event;
+    class JSProtectedEventListener;
     class JSEventListener;
     class ScriptExecutionContext;
 
@@ -52,14 +53,23 @@ namespace WebCore {
 
         virtual ScriptExecutionContext* scriptExecutionContext() const = 0;
 
+        // Finds a wrapper of a JS EventListener, returns 0 if no existing one.
+        JSProtectedEventListener* findJSProtectedEventListener(JSC::JSValuePtr, bool isInline = false);
+
+        // Finds or creates a wrapper of a JS EventListener. JS EventListener object is GC-protected.
+        PassRefPtr<JSProtectedEventListener> findOrCreateJSProtectedEventListener(JSC::JSValuePtr, bool isInline = false);
+
         // Finds a wrapper of a GC-unprotected JS EventListener, returns 0 if no existing one.
         JSEventListener* findJSEventListener(JSC::JSValuePtr, bool isInline = false);
 
         // Finds or creates a wrapper of a JS EventListener. JS EventListener object is *NOT* GC-protected.
         PassRefPtr<JSEventListener> findOrCreateJSEventListener(JSC::JSValuePtr, bool isInline = false);
 
+        typedef HashMap<JSC::JSObject*, JSProtectedEventListener*> ProtectedListenersMap;
         typedef HashMap<JSC::JSObject*, JSEventListener*> JSListenersMap;
 
+        ProtectedListenersMap& jsProtectedEventListeners();
+        ProtectedListenersMap& jsProtectedInlineEventListeners();
         JSListenersMap& jsEventListeners();
         JSListenersMap& jsInlineEventListeners();
 
@@ -75,6 +85,8 @@ namespace WebCore {
             JSDOMStructureMap structures;
             JSDOMConstructorMap constructors;
 
+            JSDOMGlobalObject::ProtectedListenersMap jsProtectedEventListeners;
+            JSDOMGlobalObject::ProtectedListenersMap jsProtectedInlineEventListeners;
             JSDOMGlobalObject::JSListenersMap jsEventListeners;
             JSDOMGlobalObject::JSListenersMap jsInlineEventListeners;