Changeset 134666 in webkit

Timestamp:

Nov 14, 2012 2:07:13 PM (11 years ago)

Author:

mark.lam@apple.com

Message:

Fixed regressions due to adding JSEventListener::m_wrapper null checks.
​https://bugs.webkit.org/show_bug.cgi?id=102183.

Reviewed by Geoffrey Garen.

Fixed JSEventListener::operator==() to work within the contract that
when m_wrapper is 0, m_jsFunction is also expected to be 0. Also fixed
some typos in comments.

No new tests.

• bindings/js/JSEventListener.cpp:

(WebCore::JSEventListener::visitJSFunction):
(WebCore::JSEventListener::operator==):

• bindings/js/JSEventListener.h:

(WebCore::JSEventListener::jsFunction):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSEventListener.cpp (modified) (2 diffs)
• bindings/js/JSEventListener.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-14  Mark Lam  <mark.lam@apple.com>
+
+        Fixed regressions due to adding JSEventListener::m_wrapper null checks.
+        https://bugs.webkit.org/show_bug.cgi?id=102183.
+
+        Reviewed by Geoffrey Garen.
+
+        Fixed JSEventListener::operator==() to work within the contract that
+        when m_wrapper is 0, m_jsFunction is also expected to be 0. Also fixed
+        some typos in comments.
+
+        No new tests.
+
+        * bindings/js/JSEventListener.cpp:
+        (WebCore::JSEventListener::visitJSFunction):
+        (WebCore::JSEventListener::operator==):
+        * bindings/js/JSEventListener.h:
+        (WebCore::JSEventListener::jsFunction):
+
 2012-11-14  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebCore/bindings/js/JSEventListener.cpp

@@ -65 +65 @@
 void JSEventListener::visitJSFunction(SlotVisitor& visitor)
 {
-    // If m_wrapper is 0, then jsFunction is zombied, and should never be accessed.
+    // If m_wrapper is 0, then m_jsFunction is zombied, and should never be accessed.
     if (!m_wrapper)
         return;
@@ -164 +164 @@
 bool JSEventListener::operator==(const EventListener& listener)
 {
-    // If m_wrapper is 0, then jsFunction is zombied, and should never be accessed.
-    if (!m_wrapper)
-        return false;
-
-    if (const JSEventListener* jsEventListener = JSEventListener::cast(&listener))
-        return m_jsFunction == jsEventListener->m_jsFunction && m_isAttribute == jsEventListener->m_isAttribute;
+    if (const JSEventListener* jsEventListener = JSEventListener::cast(&listener)) {
+        // If m_wrapper is 0, then m_jsFunction is zombied, and should never be
+        // accessed. m_jsFunction should effectively be 0 in that case.
+        JSC::JSObject* jsFunction = m_wrapper ? m_jsFunction.get() : 0;
+        JSC::JSObject* otherJSFunction = jsEventListener->m_wrapper ?
+            jsEventListener->m_jsFunction.get() : 0;
+        return jsFunction == otherJSFunction && m_isAttribute == jsEventListener->m_isAttribute;
+    }
     return false;
 }

trunk/Source/WebCore/bindings/js/JSEventListener.h

@@ -91 +91 @@
         ASSERT(!m_isolatedWorld->isNormal() || m_wrapper || !m_jsFunction);
 
-        // If m_wrapper is 0, then jsFunction is zombied, and should never be accessed.
+        // If m_wrapper is 0, then m_jsFunction is zombied, and should never be accessed.
         if (!m_wrapper)
             return 0;