<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[42279] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/42279">42279</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2009-04-07 12:51:19 -0700 (Tue, 07 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-04-07  Geoffrey Garen  &lt;ggaren@apple.com&gt;

        Rubber stamped by Sam Weinig.
        
        A little renaming:
        
        function =&gt; jsFunction
        listener =&gt; jsFunction

        * bindings/js/JSEventListener.cpp:
        (WebCore::JSAbstractEventListener::handleEvent):
        (WebCore::JSEventListener::JSEventListener):
        (WebCore::JSEventListener::~JSEventListener):
        (WebCore::JSEventListener::jsFunction):
        (WebCore::JSEventListener::mark):
        (WebCore::JSProtectedEventListener::JSProtectedEventListener):
        (WebCore::JSProtectedEventListener::~JSProtectedEventListener):
        (WebCore::JSProtectedEventListener::jsFunction):
        * bindings/js/JSEventListener.h:
        (WebCore::JSProtectedEventListener::create):
        * bindings/js/JSLazyEventListener.cpp:
        (WebCore::JSLazyEventListener::jsFunction):
        (WebCore::JSLazyEventListener::parseCode):
        * dom/EventListener.h:
        (WebCore::EventListener::jsFunction):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebindingsjsJSEventListenercpp">trunk/WebCore/bindings/js/JSEventListener.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSEventListenerh">trunk/WebCore/bindings/js/JSEventListener.h</a></li>
<li><a href="#trunkWebCorebindingsjsJSLazyEventListenercpp">trunk/WebCore/bindings/js/JSLazyEventListener.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSLazyEventListenerh">trunk/WebCore/bindings/js/JSLazyEventListener.h</a></li>
<li><a href="#trunkWebCorebindingsscriptsCodeGeneratorJSpm">trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkWebCoredomEventListenerh">trunk/WebCore/dom/EventListener.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (42278 => 42279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-04-07 19:49:55 UTC (rev 42278)
+++ trunk/WebCore/ChangeLog        2009-04-07 19:51:19 UTC (rev 42279)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2009-04-07  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
+        Rubber stamped by Sam Weinig.
+        
+        A little renaming:
+        
+        function =&gt; jsFunction
+        listener =&gt; jsFunction
+
+        * bindings/js/JSEventListener.cpp:
+        (WebCore::JSAbstractEventListener::handleEvent):
+        (WebCore::JSEventListener::JSEventListener):
+        (WebCore::JSEventListener::~JSEventListener):
+        (WebCore::JSEventListener::jsFunction):
+        (WebCore::JSEventListener::mark):
+        (WebCore::JSProtectedEventListener::JSProtectedEventListener):
+        (WebCore::JSProtectedEventListener::~JSProtectedEventListener):
+        (WebCore::JSProtectedEventListener::jsFunction):
+        * bindings/js/JSEventListener.h:
+        (WebCore::JSProtectedEventListener::create):
+        * bindings/js/JSLazyEventListener.cpp:
+        (WebCore::JSLazyEventListener::jsFunction):
+        (WebCore::JSLazyEventListener::parseCode):
+        * dom/EventListener.h:
+        (WebCore::EventListener::jsFunction):
+
</ins><span class="cx"> 2009-04-07  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSEventListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSEventListener.cpp (42278 => 42279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSEventListener.cpp        2009-04-07 19:49:55 UTC (rev 42278)
+++ trunk/WebCore/bindings/js/JSEventListener.cpp        2009-04-07 19:51:19 UTC (rev 42279)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> {
</span><span class="cx">     JSLock lock(false);
</span><span class="cx"> 
</span><del>-    JSObject* listener = function();
-    if (!listener)
</del><ins>+    JSObject* jsFunction = this-&gt;jsFunction();
+    if (!jsFunction)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     JSDOMGlobalObject* globalObject = this-&gt;globalObject();
</span><span class="lines">@@ -67,12 +67,12 @@
</span><span class="cx"> 
</span><span class="cx">     ExecState* exec = globalObject-&gt;globalExec();
</span><span class="cx"> 
</span><del>-    JSValuePtr handleEventFunction = listener-&gt;get(exec, Identifier(exec, &quot;handleEvent&quot;));
</del><ins>+    JSValuePtr handleEventFunction = jsFunction-&gt;get(exec, Identifier(exec, &quot;handleEvent&quot;));
</ins><span class="cx">     CallData callData;
</span><span class="cx">     CallType callType = handleEventFunction.getCallData(callData);
</span><span class="cx">     if (callType == CallTypeNone) {
</span><span class="cx">         handleEventFunction = noValue();
</span><del>-        callType = listener-&gt;getCallData(callData);
</del><ins>+        callType = jsFunction-&gt;getCallData(callData);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (callType != CallTypeNone) {
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">         JSValuePtr retval;
</span><span class="cx">         if (handleEventFunction) {
</span><span class="cx">             globalObject-&gt;globalData()-&gt;timeoutChecker.start();
</span><del>-            retval = call(exec, handleEventFunction, callType, callData, listener, args);
</del><ins>+            retval = call(exec, handleEventFunction, callType, callData, jsFunction, args);
</ins><span class="cx">         } else {
</span><span class="cx">             JSValuePtr thisValue;
</span><span class="cx">             if (isWindowEvent)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">             else
</span><span class="cx">                 thisValue = toJS(exec, event-&gt;currentTarget());
</span><span class="cx">             globalObject-&gt;globalData()-&gt;timeoutChecker.start();
</span><del>-            retval = call(exec, listener, callType, callData, thisValue, args);
</del><ins>+            retval = call(exec, jsFunction, callType, callData, thisValue, args);
</ins><span class="cx">         }
</span><span class="cx">         globalObject-&gt;globalData()-&gt;timeoutChecker.stop();
</span><span class="cx"> 
</span><span class="lines">@@ -132,30 +132,30 @@
</span><span class="cx"> 
</span><span class="cx"> // -------------------------------------------------------------------------
</span><span class="cx"> 
</span><del>-JSEventListener::JSEventListener(JSObject* listener, JSDOMGlobalObject* globalObject, bool isInline)
</del><ins>+JSEventListener::JSEventListener(JSObject* function, JSDOMGlobalObject* globalObject, bool isInline)
</ins><span class="cx">     : JSAbstractEventListener(isInline)
</span><del>-    , m_listener(listener)
</del><ins>+    , m_jsFunction(function)
</ins><span class="cx">     , m_globalObject(globalObject)
</span><span class="cx"> {
</span><del>-    if (m_listener) {
</del><ins>+    if (m_jsFunction) {
</ins><span class="cx">         JSDOMWindow::JSListenersMap&amp; listeners = isInline
</span><span class="cx">             ? globalObject-&gt;jsInlineEventListeners() : globalObject-&gt;jsEventListeners();
</span><del>-        listeners.set(m_listener, this);
</del><ins>+        listeners.set(m_jsFunction, this);
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSEventListener::~JSEventListener()
</span><span class="cx"> {
</span><del>-    if (m_listener &amp;&amp; m_globalObject) {
</del><ins>+    if (m_jsFunction &amp;&amp; m_globalObject) {
</ins><span class="cx">         JSDOMWindow::JSListenersMap&amp; listeners = isInline()
</span><span class="cx">             ? m_globalObject-&gt;jsInlineEventListeners() : m_globalObject-&gt;jsEventListeners();
</span><del>-        listeners.remove(m_listener);
</del><ins>+        listeners.remove(m_jsFunction);
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* JSEventListener::function() const
</del><ins>+JSObject* JSEventListener::jsFunction() const
</ins><span class="cx"> {
</span><del>-    return m_listener;
</del><ins>+    return m_jsFunction;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSDOMGlobalObject* JSEventListener::globalObject() const
</span><span class="lines">@@ -170,8 +170,8 @@
</span><span class="cx"> 
</span><span class="cx"> void JSEventListener::mark()
</span><span class="cx"> {
</span><del>-    if (m_listener &amp;&amp; !m_listener-&gt;marked())
-        m_listener-&gt;mark();
</del><ins>+    if (m_jsFunction &amp;&amp; !m_jsFunction-&gt;marked())
+        m_jsFunction-&gt;mark();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #ifndef NDEBUG
</span><span class="lines">@@ -182,13 +182,13 @@
</span><span class="cx"> 
</span><span class="cx"> JSProtectedEventListener::JSProtectedEventListener(JSObject* listener, JSDOMGlobalObject* globalObject, bool isInline)
</span><span class="cx">     : JSAbstractEventListener(isInline)
</span><del>-    , m_listener(listener)
</del><ins>+    , m_jsFunction(listener)
</ins><span class="cx">     , m_globalObject(globalObject)
</span><span class="cx"> {
</span><del>-    if (m_listener) {
</del><ins>+    if (m_jsFunction) {
</ins><span class="cx">         JSDOMWindow::ProtectedListenersMap&amp; listeners = isInline
</span><span class="cx">             ? m_globalObject-&gt;jsProtectedInlineEventListeners() : m_globalObject-&gt;jsProtectedEventListeners();
</span><del>-        listeners.set(m_listener, this);
</del><ins>+        listeners.set(m_jsFunction, this);
</ins><span class="cx">     }
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     eventListenerCounter.increment();
</span><span class="lines">@@ -197,19 +197,19 @@
</span><span class="cx"> 
</span><span class="cx"> JSProtectedEventListener::~JSProtectedEventListener()
</span><span class="cx"> {
</span><del>-    if (m_listener &amp;&amp; m_globalObject) {
</del><ins>+    if (m_jsFunction &amp;&amp; m_globalObject) {
</ins><span class="cx">         JSDOMWindow::ProtectedListenersMap&amp; listeners = isInline()
</span><span class="cx">             ? m_globalObject-&gt;jsProtectedInlineEventListeners() : m_globalObject-&gt;jsProtectedEventListeners();
</span><del>-        listeners.remove(m_listener);
</del><ins>+        listeners.remove(m_jsFunction);
</ins><span class="cx">     }
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     eventListenerCounter.decrement();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* JSProtectedEventListener::function() const
</del><ins>+JSObject* JSProtectedEventListener::jsFunction() const
</ins><span class="cx"> {
</span><del>-    return m_listener;
</del><ins>+    return m_jsFunction;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> JSDOMGlobalObject* JSProtectedEventListener::globalObject() const
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSEventListenerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSEventListener.h (42278 => 42279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSEventListener.h        2009-04-07 19:49:55 UTC (rev 42278)
+++ trunk/WebCore/bindings/js/JSEventListener.h        2009-04-07 19:51:19 UTC (rev 42279)
</span><span class="lines">@@ -56,34 +56,34 @@
</span><span class="cx">         void clearGlobalObject();
</span><span class="cx"> 
</span><span class="cx">     private:
</span><del>-        JSEventListener(JSC::JSObject* listener, JSDOMGlobalObject*, bool isInline);
</del><ins>+        JSEventListener(JSC::JSObject* function, JSDOMGlobalObject*, bool isInline);
</ins><span class="cx"> 
</span><del>-        virtual JSC::JSObject* function() const;
</del><ins>+        virtual JSC::JSObject* jsFunction() const;
</ins><span class="cx">         virtual void mark();
</span><span class="cx">         virtual JSDOMGlobalObject* globalObject() const;
</span><span class="cx"> 
</span><del>-        JSC::JSObject* m_listener;
</del><ins>+        JSC::JSObject* m_jsFunction;
</ins><span class="cx">         JSDOMGlobalObject* m_globalObject;
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     class JSProtectedEventListener : public JSAbstractEventListener {
</span><span class="cx">     public:
</span><del>-        static PassRefPtr&lt;JSProtectedEventListener&gt; create(JSC::JSObject* listener, JSDOMGlobalObject* globalObject, bool isInline)
</del><ins>+        static PassRefPtr&lt;JSProtectedEventListener&gt; create(JSC::JSObject* function, JSDOMGlobalObject* globalObject, bool isInline)
</ins><span class="cx">         {
</span><del>-            return adoptRef(new JSProtectedEventListener(listener, globalObject, isInline));
</del><ins>+            return adoptRef(new JSProtectedEventListener(function, globalObject, isInline));
</ins><span class="cx">         }
</span><span class="cx">         virtual ~JSProtectedEventListener();
</span><span class="cx"> 
</span><span class="cx">         void clearGlobalObject();
</span><span class="cx"> 
</span><span class="cx">     protected:
</span><del>-        JSProtectedEventListener(JSC::JSObject* listener, JSDOMGlobalObject*, bool isInline);
</del><ins>+        JSProtectedEventListener(JSC::JSObject* function, JSDOMGlobalObject*, bool isInline);
</ins><span class="cx"> 
</span><del>-        mutable JSC::ProtectedPtr&lt;JSC::JSObject&gt; m_listener;
</del><ins>+        mutable JSC::ProtectedPtr&lt;JSC::JSObject&gt; m_jsFunction;
</ins><span class="cx">         JSC::ProtectedPtr&lt;JSDOMGlobalObject&gt; m_globalObject;
</span><span class="cx"> 
</span><span class="cx">     private:
</span><del>-        virtual JSC::JSObject* function() const;
</del><ins>+        virtual JSC::JSObject* jsFunction() const;
</ins><span class="cx">         virtual JSDOMGlobalObject* globalObject() const;
</span><span class="cx">     };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSLazyEventListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSLazyEventListener.cpp (42278 => 42279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSLazyEventListener.cpp        2009-04-07 19:49:55 UTC (rev 42278)
+++ trunk/WebCore/bindings/js/JSLazyEventListener.cpp        2009-04-07 19:51:19 UTC (rev 42279)
</span><span class="lines">@@ -49,10 +49,10 @@
</span><span class="cx">         m_lineNumber = 1;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSObject* JSLazyEventListener::function() const
</del><ins>+JSObject* JSLazyEventListener::jsFunction() const
</ins><span class="cx"> {
</span><span class="cx">     parseCode();
</span><del>-    return m_listener;
</del><ins>+    return m_jsFunction;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static inline JSValuePtr eventParameterName(JSLazyEventListener::LazyEventListenerType type, ExecState* exec)
</span><span class="lines">@@ -96,15 +96,15 @@
</span><span class="cx"> 
</span><span class="cx">     // FIXME: Passing the document's URL to construct is not always correct, since this event listener might
</span><span class="cx">     // have been added with setAttribute from a script, and we should pass String() in that case.
</span><del>-    m_listener = constructFunction(exec, args, Identifier(exec, m_functionName), sourceURL, m_lineNumber); // FIXME: is globalExec ok?
</del><ins>+    m_jsFunction = constructFunction(exec, args, Identifier(exec, m_functionName), sourceURL, m_lineNumber); // FIXME: is globalExec ok?
</ins><span class="cx"> 
</span><del>-    JSFunction* listenerAsFunction = static_cast&lt;JSFunction*&gt;(m_listener.get());
</del><ins>+    JSFunction* listenerAsFunction = static_cast&lt;JSFunction*&gt;(m_jsFunction.get());
</ins><span class="cx"> 
</span><span class="cx">     if (exec-&gt;hadException()) {
</span><span class="cx">         exec-&gt;clearException();
</span><span class="cx"> 
</span><span class="cx">         // failed to parse, so let's just make this listener a no-op
</span><del>-        m_listener = 0;
</del><ins>+        m_jsFunction = 0;
</ins><span class="cx">     } else if (m_originalNode) {
</span><span class="cx">         // Add the event's home element to the scope
</span><span class="cx">         // (and the document, and the form - see JSHTMLElement::eventHandlerScope)
</span><span class="lines">@@ -121,10 +121,10 @@
</span><span class="cx">     m_functionName = String();
</span><span class="cx">     m_code = String();
</span><span class="cx"> 
</span><del>-    if (m_listener) {
</del><ins>+    if (m_jsFunction) {
</ins><span class="cx">         ASSERT(isInline());
</span><span class="cx">         JSDOMWindow::ProtectedListenersMap&amp; listeners = m_globalObject-&gt;jsProtectedInlineEventListeners();
</span><del>-        listeners.set(m_listener, const_cast&lt;JSLazyEventListener*&gt;(this));
</del><ins>+        listeners.set(m_jsFunction, const_cast&lt;JSLazyEventListener*&gt;(this));
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSLazyEventListenerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSLazyEventListener.h (42278 => 42279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSLazyEventListener.h        2009-04-07 19:49:55 UTC (rev 42278)
+++ trunk/WebCore/bindings/js/JSLazyEventListener.h        2009-04-07 19:51:19 UTC (rev 42279)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">     private:
</span><span class="cx">         JSLazyEventListener(LazyEventListenerType, const String&amp; functionName, const String&amp; code, JSDOMGlobalObject*, Node*, int lineNumber);
</span><span class="cx"> 
</span><del>-        virtual JSC::JSObject* function() const;
</del><ins>+        virtual JSC::JSObject* jsFunction() const;
</ins><span class="cx">         virtual bool wasCreatedFromMarkup() const { return true; }
</span><span class="cx"> 
</span><span class="cx">         void parseCode() const;
</span></span></pre></div>
<a id="trunkWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm (42278 => 42279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm        2009-04-07 19:49:55 UTC (rev 42278)
+++ trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm        2009-04-07 19:51:19 UTC (rev 42279)
</span><span class="lines">@@ -1118,8 +1118,8 @@
</span><span class="cx">                     push(@implContent, &quot;    UNUSED_PARAM(exec);\n&quot;);
</span><span class="cx">                     push(@implContent, &quot;    $implClassName* imp = static_cast&lt;$implClassName*&gt;(static_cast&lt;$className*&gt;(asObject(slot.slotBase()))-&gt;impl());\n&quot;);
</span><span class="cx">                     push(@implContent, &quot;    if (EventListener* listener = imp-&gt;$implGetterFunctionName()) {\n&quot;);
</span><del>-                    push(@implContent, &quot;        if (JSObject* function = listener-&gt;function())\n&quot;);
-                    push(@implContent, &quot;            return function;\n&quot;);
</del><ins>+                    push(@implContent, &quot;        if (JSObject* jsFunction = listener-&gt;jsFunction())\n&quot;);
+                    push(@implContent, &quot;            return jsFunction;\n&quot;);
</ins><span class="cx">                     push(@implContent, &quot;    }\n&quot;);
</span><span class="cx">                     push(@implContent, &quot;    return jsNull();\n&quot;);
</span><span class="cx">                 } elsif ($attribute-&gt;signature-&gt;type =~ /Constructor$/) {
</span></span></pre></div>
<a id="trunkWebCoredomEventListenerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/dom/EventListener.h (42278 => 42279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/dom/EventListener.h        2009-04-07 19:49:55 UTC (rev 42278)
+++ trunk/WebCore/dom/EventListener.h        2009-04-07 19:51:19 UTC (rev 42279)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">         virtual bool wasCreatedFromMarkup() const { return false; }
</span><span class="cx"> 
</span><span class="cx"> #if USE(JSC)
</span><del>-        virtual JSC::JSObject* function() const { return 0; }
</del><ins>+        virtual JSC::JSObject* jsFunction() const { return 0; }
</ins><span class="cx">         virtual void mark() { }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>