[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [42018] trunk
From: darin () apple ! com
Date: 2009-03-26 22:31:49
Message-ID: 20090326223151.4F2AA12FDB58 () beta ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[42018] trunk</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/42018">42018</a></dd> \
<dt>Author</dt> <dd>darin@apple.com</dd> <dt>Date</dt> <dd>2009-03-26 15:31:48 -0700 \
(Thu, 26 Mar 2009)</dd> </dl>
<h3>Log Message</h3>
<pre>WebCore:
2009-03-26 Darin Adler <darin@apple.com>
Reviewed by Geoff Garen.
Renamed JSUnprotectedEventListener to JSEventListener.
And related renames.
Soon Geoff will make all JavaScript event listeners use mark instead
of protect, so there's no need to emphasize "unprotected".
* bindings/js/JSDOMApplicationCacheCustom.cpp:
(WebCore::JSDOMApplicationCache::mark):
(WebCore::JSDOMApplicationCache::addEventListener):
(WebCore::JSDOMApplicationCache::removeEventListener):
* bindings/js/JSDOMGlobalObject.cpp:
(WebCore::JSDOMGlobalObject::~JSDOMGlobalObject):
(WebCore::JSDOMGlobalObject::findJSEventListener):
(WebCore::JSDOMGlobalObject::findOrCreateJSEventListener):
(WebCore::JSDOMGlobalObject::jsEventListeners):
(WebCore::JSDOMGlobalObject::jsInlineEventListeners):
* bindings/js/JSDOMGlobalObject.h:
* bindings/js/JSDOMWindowBase.h:
* bindings/js/JSEventListener.cpp:
(WebCore::JSEventListener::JSEventListener):
(WebCore::JSEventListener::~JSEventListener):
(WebCore::JSEventListener::listenerObj):
(WebCore::JSEventListener::globalObject):
(WebCore::JSEventListener::clearGlobalObject):
(WebCore::JSEventListener::mark):
* bindings/js/JSEventListener.h:
(WebCore::JSEventListener::create):
* bindings/js/JSMessagePortCustom.cpp:
(WebCore::JSMessagePort::mark):
(WebCore::JSMessagePort::addEventListener):
(WebCore::JSMessagePort::removeEventListener):
* bindings/js/JSWorkerContextCustom.cpp:
(WebCore::JSWorkerContext::mark):
(WebCore::JSWorkerContext::addEventListener):
(WebCore::JSWorkerContext::removeEventListener):
* bindings/js/JSWorkerCustom.cpp:
(WebCore::JSWorker::mark):
(WebCore::JSWorker::addEventListener):
(WebCore::JSWorker::removeEventListener):
* bindings/js/JSXMLHttpRequestCustom.cpp:
(WebCore::JSXMLHttpRequest::mark):
(WebCore::JSXMLHttpRequest::addEventListener):
(WebCore::JSXMLHttpRequest::removeEventListener):
* bindings/js/JSXMLHttpRequestUploadCustom.cpp:
(WebCore::JSXMLHttpRequestUpload::mark):
(WebCore::JSXMLHttpRequestUpload::addEventListener):
(WebCore::JSXMLHttpRequestUpload::removeEventListener):
* bindings/scripts/CodeGeneratorJS.pm:
All just renaming.
WebKitTools:
2009-03-26 Darin Adler <darin@apple.com>
Reviewed by Geoff Garen.
* Scripts/do-webcore-rename:Update for rename of JSUnprotectedEventListener \
to JSEventListener.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebindingsjsJSDOMApplicationCacheCustomcpp">trunk/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSDOMGlobalObjectcpp">trunk/WebCore/bindings/js/JSDOMGlobalObject.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSDOMGlobalObjecth">trunk/WebCore/bindings/js/JSDOMGlobalObject.h</a></li>
<li><a href="#trunkWebCorebindingsjsJSDOMWindowBaseh">trunk/WebCore/bindings/js/JSDOMWindowBase.h</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="#trunkWebCorebindingsjsJSMessagePortCustomcpp">trunk/WebCore/bindings/js/JSMessagePortCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSWorkerContextCustomcpp">trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSWorkerCustomcpp">trunk/WebCore/bindings/js/JSWorkerCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSXMLHttpRequestCustomcpp">trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsjsJSXMLHttpRequestUploadCustomcpp">trunk/WebCore/bindings/js/JSXMLHttpRequestUploadCustom.cpp</a></li>
<li><a href="#trunkWebCorebindingsscriptsCodeGeneratorJSpm">trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsScriptsdowebcorerename">trunk/WebKitTools/Scripts/do-webcore-rename</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (42017 => 42018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2009-03-26 22:21:26 UTC (rev 42017)
+++ trunk/WebCore/ChangeLog 2009-03-26 22:31:48 UTC (rev 42018)
</span><span class="lines">@@ -2,6 +2,60 @@
</span><span class="cx">
</span><span class="cx"> Reviewed by Geoff Garen.
</span><span class="cx">
</span><ins>+ Renamed JSUnprotectedEventListener to JSEventListener.
+ And related renames.
+
+ Soon Geoff will make all JavaScript event listeners use mark instead
+ of protect, so there's no need to emphasize "unprotected".
+
+ * bindings/js/JSDOMApplicationCacheCustom.cpp:
+ (WebCore::JSDOMApplicationCache::mark):
+ (WebCore::JSDOMApplicationCache::addEventListener):
+ (WebCore::JSDOMApplicationCache::removeEventListener):
+ * bindings/js/JSDOMGlobalObject.cpp:
+ (WebCore::JSDOMGlobalObject::~JSDOMGlobalObject):
+ (WebCore::JSDOMGlobalObject::findJSEventListener):
+ (WebCore::JSDOMGlobalObject::findOrCreateJSEventListener):
+ (WebCore::JSDOMGlobalObject::jsEventListeners):
+ (WebCore::JSDOMGlobalObject::jsInlineEventListeners):
+ * bindings/js/JSDOMGlobalObject.h:
+ * bindings/js/JSDOMWindowBase.h:
+ * bindings/js/JSEventListener.cpp:
+ (WebCore::JSEventListener::JSEventListener):
+ (WebCore::JSEventListener::~JSEventListener):
+ (WebCore::JSEventListener::listenerObj):
+ (WebCore::JSEventListener::globalObject):
+ (WebCore::JSEventListener::clearGlobalObject):
+ (WebCore::JSEventListener::mark):
+ * bindings/js/JSEventListener.h:
+ (WebCore::JSEventListener::create):
+ * bindings/js/JSMessagePortCustom.cpp:
+ (WebCore::JSMessagePort::mark):
+ (WebCore::JSMessagePort::addEventListener):
+ (WebCore::JSMessagePort::removeEventListener):
+ * bindings/js/JSWorkerContextCustom.cpp:
+ (WebCore::JSWorkerContext::mark):
+ (WebCore::JSWorkerContext::addEventListener):
+ (WebCore::JSWorkerContext::removeEventListener):
+ * bindings/js/JSWorkerCustom.cpp:
+ (WebCore::JSWorker::mark):
+ (WebCore::JSWorker::addEventListener):
+ (WebCore::JSWorker::removeEventListener):
+ * bindings/js/JSXMLHttpRequestCustom.cpp:
+ (WebCore::JSXMLHttpRequest::mark):
+ (WebCore::JSXMLHttpRequest::addEventListener):
+ (WebCore::JSXMLHttpRequest::removeEventListener):
+ * bindings/js/JSXMLHttpRequestUploadCustom.cpp:
+ (WebCore::JSXMLHttpRequestUpload::mark):
+ (WebCore::JSXMLHttpRequestUpload::addEventListener):
+ (WebCore::JSXMLHttpRequestUpload::removeEventListener):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ All just renaming.
+
+2009-03-26 Darin Adler <darin@apple.com>
+
+ Reviewed by Geoff Garen.
+
</ins><span class="cx"> Renamed JSEventListener to JSProtectedEventListener.
</span><span class="cx"> And related renames.
</span><span class="cx">
</span><span class="lines">@@ -37,6 +91,7 @@
</span><span class="cx"> * bindings/js/JSSVGElementInstanceCustom.cpp:
</span><span class="cx"> (WebCore::JSSVGElementInstance::addEventListener):
</span><span class="cx"> \
(WebCore::JSSVGElementInstance::removeEventListener): </span><ins>+ * \
bindings/scripts/CodeGeneratorJS.pm: </ins><span class="cx"> All just \
renaming. </span><span class="cx">
</span><span class="cx"> 2009-03-26 Dan Bernstein <mitz@apple.com>
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSDOMApplicationCacheCustomcpp"></a>
<div class="modfile"><h4>Modified: \
trunk/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp (42017 => 42018)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp 2009-03-26 22:21:26 UTC \
(rev 42017)
+++ trunk/WebCore/bindings/js/JSDOMApplicationCacheCustom.cpp 2009-03-26 22:31:48 UTC \
(rev 42018) </span><span class="lines">@@ -46,28 +46,28 @@
</span><span class="cx"> {
</span><span class="cx"> DOMObject::mark();
</span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onchecking())) </del><ins>+ \
if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->onchecking())) </ins><span class="cx"> \
listener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onerror())) </del><ins>+ \
if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->onerror())) </ins><span class="cx"> \
listener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onnoupdate())) </del><ins>+ \
if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->onnoupdate())) </ins><span class="cx"> \
listener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->ondownloading())) \
</del><ins>+ if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->ondownloading())) </ins><span \
class="cx"> listener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onprogress())) </del><ins>+ \
if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->onprogress())) </ins><span class="cx"> \
listener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onupdateready())) \
</del><ins>+ if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->onupdateready())) </ins><span \
class="cx"> listener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->oncached())) </del><ins>+ \
if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->oncached())) </ins><span class="cx"> \
listener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onobsolete())) </del><ins>+ \
if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->onobsolete())) </ins><span class="cx"> \
listener->mark(); </span><span class="cx">
</span><span class="cx"> typedef DOMApplicationCache::EventListenersMap \
EventListenersMap; </span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> EventListenersMap& eventListeners = \
m_impl->eventListeners(); </span><span class="cx"> for \
(EventListenersMap::iterator mapIter = eventListeners.begin(); mapIter != \
eventListeners.end(); ++mapIter) { </span><span class="cx"> for \
(ListenerVector::iterator vecIter = mapIter->second.begin(); vecIter != \
mapIter->second.end(); ++vecIter) { </span><del>- \
JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(vecIter->get()); </del><ins>+ \
JSEventListener* listener = static_cast<JSEventListener*>(vecIter->get()); \
</ins><span class="cx"> listener->mark(); </span><span class="cx"> \
} </span><span class="cx"> }
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> JSDOMGlobalObject* globalObject = \
toJSDOMGlobalObject(impl()->scriptExecutionContext()); </span><span class="cx"> \
if (!globalObject) </span><span class="cx"> return jsUndefined();
</span><del>- RefPtr<JSUnprotectedEventListener> listener = \
globalObject->findOrCreateJSUnprotectedEventListener(exec, args.at(exec, 1)); \
</del><ins>+ RefPtr<JSEventListener> listener = \
globalObject->findOrCreateJSEventListener(exec, args.at(exec, 1)); </ins><span \
class="cx"> if (!listener) </span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->addEventListener(args.at(exec, \
0).toString(exec), listener.release(), args.at(exec, 2).toBoolean(exec)); \
</span><span class="lines">@@ -141,7 +141,7 @@ </span><span class="cx"> \
JSDOMGlobalObject* globalObject = \
toJSDOMGlobalObject(impl()->scriptExecutionContext()); </span><span class="cx"> \
if (!globalObject) </span><span class="cx"> return jsUndefined();
</span><del>- JSUnprotectedEventListener* listener = \
globalObject->findJSUnprotectedEventListener(exec, args.at(exec, 1)); </del><ins>+ \
JSEventListener* listener = globalObject->findJSEventListener(exec, args.at(exec, \
1)); </ins><span class="cx"> if (!listener)
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->removeEventListener(args.at(exec, \
0).toString(exec), listener, args.at(exec, 2).toBoolean(exec)); \
</span></span></pre></div> <a id="trunkWebCorebindingsjsJSDOMGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSDOMGlobalObject.cpp \
(42017 => 42018)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSDOMGlobalObject.cpp 2009-03-26 \
22:21:26 UTC (rev 42017)
+++ trunk/WebCore/bindings/js/JSDOMGlobalObject.cpp 2009-03-26 22:31:48 UTC (rev \
42018) </span><span class="lines">@@ -60,13 +60,13 @@
</span><span class="cx"> for (; i1 != e1; ++i1)
</span><span class="cx"> i1->second->clearGlobalObject();
</span><span class="cx">
</span><del>- UnprotectedListenersMap::iterator i2 = \
d()->jsUnprotectedEventListeners.begin();
- UnprotectedListenersMap::iterator e2 = \
d()->jsUnprotectedEventListeners.end(); </del><ins>+ JSListenersMap::iterator \
i2 = d()->jsEventListeners.begin(); + JSListenersMap::iterator e2 = \
d()->jsEventListeners.end(); </ins><span class="cx"> for (; i2 != e2; ++i2)
</span><span class="cx"> i2->second->clearGlobalObject();
</span><span class="cx">
</span><del>- i2 = d()->jsUnprotectedInlineEventListeners.begin();
- e2 = d()->jsUnprotectedInlineEventListeners.end();
</del><ins>+ i2 = d()->jsInlineEventListeners.begin();
+ e2 = d()->jsInlineEventListeners.end();
</ins><span class="cx"> for (; i2 != e2; ++i2)
</span><span class="cx"> i2->second->clearGlobalObject();
</span><span class="cx"> }
</span><span class="lines">@@ -107,25 +107,25 @@
</span><span class="cx"> return JSProtectedEventListener::create(asObject(val), \
this, isInline).get(); </span><span class="cx"> }
</span><span class="cx">
</span><del>-JSUnprotectedEventListener* \
JSDOMGlobalObject::findJSUnprotectedEventListener(ExecState*, JSValuePtr val, bool \
isInline) </del><ins>+JSEventListener* \
JSDOMGlobalObject::findJSEventListener(ExecState*, JSValuePtr val, bool isInline) \
</ins><span class="cx"> { </span><span class="cx"> if (!val.isObject())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- UnprotectedListenersMap& listeners = isInline ? \
d()->jsUnprotectedInlineEventListeners : d()->jsUnprotectedEventListeners; \
</del><ins>+ JSListenersMap& listeners = isInline ? \
d()->jsInlineEventListeners : d()->jsEventListeners; </ins><span class="cx"> \
return listeners.get(asObject(val)); </span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<JSUnprotectedEventListener> \
JSDOMGlobalObject::findOrCreateJSUnprotectedEventListener(ExecState* exec, JSValuePtr \
val, bool isInline) </del><ins>+PassRefPtr<JSEventListener> \
JSDOMGlobalObject::findOrCreateJSEventListener(ExecState* exec, JSValuePtr val, bool \
isInline) </ins><span class="cx"> {
</span><del>- if (JSUnprotectedEventListener* listener = \
findJSUnprotectedEventListener(exec, val, isInline)) </del><ins>+ if \
(JSEventListener* listener = findJSEventListener(exec, val, isInline)) </ins><span \
class="cx"> return listener; </span><span class="cx">
</span><span class="cx"> if (!val.isObject())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- // The JSUnprotectedEventListener constructor adds it to our \
jsUnprotectedEventListeners map.
- return JSUnprotectedEventListener::create(asObject(val), this, isInline).get();
</del><ins>+ // The JSEventListener constructor adds it to our jsEventListeners \
map. + return JSEventListener::create(asObject(val), this, isInline).get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSDOMGlobalObject::ProtectedListenersMap& \
JSDOMGlobalObject::jsProtectedEventListeners() </span><span class="lines">@@ -138,14 \
+138,14 @@ </span><span class="cx"> return \
d()->jsProtectedInlineEventListeners; </span><span class="cx"> }
</span><span class="cx">
</span><del>-JSDOMGlobalObject::UnprotectedListenersMap& \
JSDOMGlobalObject::jsUnprotectedEventListeners() \
</del><ins>+JSDOMGlobalObject::JSListenersMap& \
JSDOMGlobalObject::jsEventListeners() </ins><span class="cx"> {
</span><del>- return d()->jsUnprotectedEventListeners;
</del><ins>+ return d()->jsEventListeners;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSDOMGlobalObject::UnprotectedListenersMap& \
JSDOMGlobalObject::jsUnprotectedInlineEventListeners() \
</del><ins>+JSDOMGlobalObject::JSListenersMap& \
JSDOMGlobalObject::jsInlineEventListeners() </ins><span class="cx"> {
</span><del>- return d()->jsUnprotectedInlineEventListeners;
</del><ins>+ return d()->jsInlineEventListeners;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSDOMGlobalObject::setCurrentEvent(Event* evt)
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSDOMGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSDOMGlobalObject.h \
(42017 => 42018)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSDOMGlobalObject.h 2009-03-26 \
22:21:26 UTC (rev 42017)
+++ trunk/WebCore/bindings/js/JSDOMGlobalObject.h 2009-03-26 22:31:48 UTC (rev 42018)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> class Event;
</span><span class="cx"> class JSProtectedEventListener;
</span><del>- class JSUnprotectedEventListener;
</del><ins>+ class JSEventListener;
</ins><span class="cx"> class ScriptExecutionContext;
</span><span class="cx">
</span><span class="cx"> typedef HashMap<const JSC::ClassInfo*, \
RefPtr<JSC::Structure> > JSDOMStructureMap; </span><span class="lines">@@ \
-60,18 +60,18 @@ </span><span class="cx"> \
PassRefPtr<JSProtectedEventListener> \
findOrCreateJSProtectedEventListener(JSC::ExecState*, JSC::JSValuePtr, bool isInline \
= false); </span><span class="cx">
</span><span class="cx"> // Finds a wrapper of a GC-unprotected JS \
EventListener, returns 0 if no existing one. </span><del>- \
JSUnprotectedEventListener* findJSUnprotectedEventListener(JSC::ExecState*, \
JSC::JSValuePtr, bool isInline = false); </del><ins>+ JSEventListener* \
findJSEventListener(JSC::ExecState*, JSC::JSValuePtr, bool isInline = false); \
</ins><span class="cx"> </span><span class="cx"> // Finds or creates a \
wrapper of a JS EventListener. JS EventListener object is *NOT* GC-protected. \
</span><del>- PassRefPtr<JSUnprotectedEventListener> \
findOrCreateJSUnprotectedEventListener(JSC::ExecState*, JSC::JSValuePtr, bool \
isInline = false); </del><ins>+ PassRefPtr<JSEventListener> \
findOrCreateJSEventListener(JSC::ExecState*, JSC::JSValuePtr, bool isInline = false); \
</ins><span class="cx"> </span><span class="cx"> typedef \
HashMap<JSC::JSObject*, JSProtectedEventListener*> ProtectedListenersMap; \
</span><del>- typedef HashMap<JSC::JSObject*, \
JSUnprotectedEventListener*> UnprotectedListenersMap; </del><ins>+ typedef \
HashMap<JSC::JSObject*, JSEventListener*> JSListenersMap; </ins><span \
class="cx"> </span><span class="cx"> ProtectedListenersMap& \
jsProtectedEventListeners(); </span><span class="cx"> \
ProtectedListenersMap& jsProtectedInlineEventListeners(); </span><del>- \
UnprotectedListenersMap& jsUnprotectedEventListeners();
- UnprotectedListenersMap& jsUnprotectedInlineEventListeners();
</del><ins>+ JSListenersMap& jsEventListeners();
+ JSListenersMap& jsInlineEventListeners();
</ins><span class="cx">
</span><span class="cx"> void setCurrentEvent(Event*);
</span><span class="cx"> Event* currentEvent();
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx">
</span><span class="cx"> JSDOMGlobalObject::ProtectedListenersMap \
jsProtectedEventListeners; </span><span class="cx"> \
JSDOMGlobalObject::ProtectedListenersMap jsProtectedInlineEventListeners; \
</span><del>- JSDOMGlobalObject::UnprotectedListenersMap \
jsUnprotectedEventListeners;
- JSDOMGlobalObject::UnprotectedListenersMap \
jsUnprotectedInlineEventListeners; </del><ins>+ \
JSDOMGlobalObject::JSListenersMap jsEventListeners; + \
JSDOMGlobalObject::JSListenersMap jsInlineEventListeners; </ins><span class="cx">
</span><span class="cx"> Event* evt;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSDOMWindowBaseh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSDOMWindowBase.h (42017 \
=> 42018)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSDOMWindowBase.h 2009-03-26 \
22:21:26 UTC (rev 42017)
+++ trunk/WebCore/bindings/js/JSDOMWindowBase.h 2009-03-26 22:31:48 UTC (rev 42018)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> class JSDOMWindowShell;
</span><span class="cx"> class JSProtectedEventListener;
</span><span class="cx"> class JSLocation;
</span><del>- class JSUnprotectedEventListener;
</del><ins>+ class JSEventListener;
</ins><span class="cx"> class ScheduledAction;
</span><span class="cx"> class SecurityOrigin;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSEventListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSEventListener.cpp \
(42017 => 42018)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSEventListener.cpp 2009-03-26 \
22:21:26 UTC (rev 42017)
+++ trunk/WebCore/bindings/js/JSEventListener.cpp 2009-03-26 22:31:48 UTC (rev 42018)
</span><span class="lines">@@ -143,43 +143,43 @@
</span><span class="cx">
</span><span class="cx"> // \
------------------------------------------------------------------------- \
</span><span class="cx"> \
</span><del>-JSUnprotectedEventListener::JSUnprotectedEventListener(JSObject* \
listener, JSDOMGlobalObject* globalObject, bool isInline) \
</del><ins>+JSEventListener::JSEventListener(JSObject* listener, JSDOMGlobalObject* \
globalObject, bool isInline) </ins><span class="cx"> : \
JSAbstractEventListener(isInline) </span><span class="cx"> , m_listener(listener)
</span><span class="cx"> , m_globalObject(globalObject)
</span><span class="cx"> {
</span><span class="cx"> if (m_listener) {
</span><del>- JSDOMWindow::UnprotectedListenersMap& listeners = isInline
- ? globalObject->jsUnprotectedInlineEventListeners() : \
globalObject->jsUnprotectedEventListeners(); </del><ins>+ \
JSDOMWindow::JSListenersMap& listeners = isInline + ? \
globalObject->jsInlineEventListeners() : globalObject->jsEventListeners(); \
</ins><span class="cx"> listeners.set(m_listener, this); </span><span \
class="cx"> } </span><span class="cx"> }
</span><span class="cx">
</span><del>-JSUnprotectedEventListener::~JSUnprotectedEventListener()
</del><ins>+JSEventListener::~JSEventListener()
</ins><span class="cx"> {
</span><span class="cx"> if (m_listener && m_globalObject) {
</span><del>- JSDOMWindow::UnprotectedListenersMap& listeners = isInline()
- ? m_globalObject->jsUnprotectedInlineEventListeners() : \
m_globalObject->jsUnprotectedEventListeners(); </del><ins>+ \
JSDOMWindow::JSListenersMap& listeners = isInline() + ? \
m_globalObject->jsInlineEventListeners() : m_globalObject->jsEventListeners(); \
</ins><span class="cx"> listeners.remove(m_listener); </span><span \
class="cx"> } </span><span class="cx"> }
</span><span class="cx">
</span><del>-JSObject* JSUnprotectedEventListener::listenerObj() const
</del><ins>+JSObject* JSEventListener::listenerObj() const
</ins><span class="cx"> {
</span><span class="cx"> return m_listener;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSDOMGlobalObject* JSUnprotectedEventListener::globalObject() const
</del><ins>+JSDOMGlobalObject* JSEventListener::globalObject() const
</ins><span class="cx"> {
</span><span class="cx"> return m_globalObject;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSUnprotectedEventListener::clearGlobalObject()
</del><ins>+void JSEventListener::clearGlobalObject()
</ins><span class="cx"> {
</span><span class="cx"> m_globalObject = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSUnprotectedEventListener::mark()
</del><ins>+void JSEventListener::mark()
</ins><span class="cx"> {
</span><span class="cx"> if (m_listener && !m_listener->marked())
</span><span class="cx"> m_listener->mark();
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSEventListenerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSEventListener.h (42017 \
=> 42018)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSEventListener.h 2009-03-26 \
22:21:26 UTC (rev 42017)
+++ trunk/WebCore/bindings/js/JSEventListener.h 2009-03-26 22:31:48 UTC (rev 42018)
</span><span class="lines">@@ -47,13 +47,13 @@
</span><span class="cx"> bool m_isInline;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class JSUnprotectedEventListener : public JSAbstractEventListener {
</del><ins>+ class JSEventListener : public JSAbstractEventListener {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<JSUnprotectedEventListener> \
create(JSC::JSObject* listener, JSDOMGlobalObject* globalObject, bool isInline) \
</del><ins>+ static PassRefPtr<JSEventListener> create(JSC::JSObject* \
listener, JSDOMGlobalObject* globalObject, bool isInline) </ins><span class="cx"> \
{ </span><del>- return adoptRef(new JSUnprotectedEventListener(listener, \
globalObject, isInline)); </del><ins>+ return adoptRef(new \
JSEventListener(listener, globalObject, isInline)); </ins><span class="cx"> }
</span><del>- virtual ~JSUnprotectedEventListener();
</del><ins>+ virtual ~JSEventListener();
</ins><span class="cx">
</span><span class="cx"> virtual JSC::JSObject* listenerObj() const;
</span><span class="cx"> virtual JSDOMGlobalObject* globalObject() const;
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> void mark();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- JSUnprotectedEventListener(JSC::JSObject* listener, \
JSDOMGlobalObject*, bool isInline); </del><ins>+ \
JSEventListener(JSC::JSObject* listener, JSDOMGlobalObject*, bool isInline); \
</ins><span class="cx"> </span><span class="cx"> JSC::JSObject* m_listener;
</span><span class="cx"> JSDOMGlobalObject* m_globalObject;
</span></span></pre></div>
<a id="trunkWebCorebindingsjsJSMessagePortCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSMessagePortCustom.cpp \
(42017 => 42018)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSMessagePortCustom.cpp 2009-03-26 \
22:21:26 UTC (rev 42017)
+++ trunk/WebCore/bindings/js/JSMessagePortCustom.cpp 2009-03-26 22:31:48 UTC (rev \
42018) </span><span class="lines">@@ -42,10 +42,10 @@
</span><span class="cx"> {
</span><span class="cx"> DOMObject::mark();
</span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onmessage())) </del><ins>+ \
if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->onmessage())) </ins><span class="cx"> \
listener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onclose())) </del><ins>+ \
if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->onclose())) </ins><span class="cx"> \
listener->mark(); </span><span class="cx">
</span><span class="cx"> if (MessagePort* entangledPort = \
m_impl->entangledPort()) { </span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> EventListenersMap& eventListeners = \
m_impl->eventListeners(); </span><span class="cx"> for \
(EventListenersMap::iterator mapIter = eventListeners.begin(); mapIter != \
eventListeners.end(); ++mapIter) { </span><span class="cx"> for \
(ListenerVector::iterator vecIter = mapIter->second.begin(); vecIter != \
mapIter->second.end(); ++vecIter) { </span><del>- \
JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(vecIter->get()); </del><ins>+ \
JSEventListener* listener = static_cast<JSEventListener*>(vecIter->get()); \
</ins><span class="cx"> listener->mark(); </span><span class="cx"> \
} </span><span class="cx"> }
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> JSDOMGlobalObject* globalObject = \
toJSDOMGlobalObject(impl()->scriptExecutionContext()); </span><span class="cx"> \
if (!globalObject) </span><span class="cx"> return jsUndefined();
</span><del>- RefPtr<JSUnprotectedEventListener> listener = \
globalObject->findOrCreateJSUnprotectedEventListener(exec, args.at(exec, 1)); \
</del><ins>+ RefPtr<JSEventListener> listener = \
globalObject->findOrCreateJSEventListener(exec, args.at(exec, 1)); </ins><span \
class="cx"> if (!listener) </span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->addEventListener(args.at(exec, \
0).toString(exec), listener.release(), args.at(exec, 2).toBoolean(exec)); \
</span><span class="lines">@@ -90,7 +90,7 @@ </span><span class="cx"> \
JSDOMGlobalObject* globalObject = \
toJSDOMGlobalObject(impl()->scriptExecutionContext()); </span><span class="cx"> \
if (!globalObject) </span><span class="cx"> return jsUndefined();
</span><del>- JSUnprotectedEventListener* listener = \
globalObject->findJSUnprotectedEventListener(exec, args.at(exec, 1)); </del><ins>+ \
JSEventListener* listener = globalObject->findJSEventListener(exec, args.at(exec, \
1)); </ins><span class="cx"> if (!listener)
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->removeEventListener(args.at(exec, \
0).toString(exec), listener, args.at(exec, 2).toBoolean(exec)); \
</span></span></pre></div> <a \
id="trunkWebCorebindingsjsJSWorkerContextCustomcpp"></a> <div \
class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp \
(42017 => 42018)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp 2009-03-26 \
22:21:26 UTC (rev 42017)
+++ trunk/WebCore/bindings/js/JSWorkerContextCustom.cpp 2009-03-26 22:31:48 UTC (rev \
42018) </span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> markActiveObjectsForContext(*globalData(), \
scriptExecutionContext()); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(impl()->onmessage())) </del><ins>+ \
if (JSEventListener* listener = \
static_cast<JSEventListener*>(impl()->onmessage())) </ins><span class="cx"> \
listener->mark(); </span><span class="cx">
</span><span class="cx"> typedef WorkerContext::EventListenersMap \
EventListenersMap; </span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> EventListenersMap& eventListeners = \
impl()->eventListeners(); </span><span class="cx"> for \
(EventListenersMap::iterator mapIter = eventListeners.begin(); mapIter != \
eventListeners.end(); ++mapIter) { </span><span class="cx"> for \
(ListenerVector::iterator vecIter = mapIter->second.begin(); vecIter != \
mapIter->second.end(); ++vecIter) { </span><del>- \
JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(vecIter->get()); </del><ins>+ \
JSEventListener* listener = static_cast<JSEventListener*>(vecIter->get()); \
</ins><span class="cx"> listener->mark(); </span><span class="cx"> \
} </span><span class="cx"> }
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> JSValuePtr JSWorkerContext::addEventListener(ExecState* \
exec, const ArgList& args) </span><span class="cx"> {
</span><del>- RefPtr<JSUnprotectedEventListener> listener = \
findOrCreateJSUnprotectedEventListener(exec, args.at(exec, 1)); </del><ins>+ \
RefPtr<JSEventListener> listener = findOrCreateJSEventListener(exec, \
args.at(exec, 1)); </ins><span class="cx"> if (!listener)
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->addEventListener(args.at(exec, \
0).toString(exec), listener.release(), args.at(exec, 2).toBoolean(exec)); \
</span><span class="lines">@@ -111,7 +111,7 @@ </span><span class="cx">
</span><span class="cx"> JSValuePtr JSWorkerContext::removeEventListener(ExecState* \
exec, const ArgList& args) </span><span class="cx"> {
</span><del>- JSUnprotectedEventListener* listener = \
findJSUnprotectedEventListener(exec, args.at(exec, 1)); </del><ins>+ \
JSEventListener* listener = findJSEventListener(exec, args.at(exec, 1)); </ins><span \
class="cx"> if (!listener) </span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->removeEventListener(args.at(exec, \
0).toString(exec), listener, args.at(exec, 2).toBoolean(exec)); \
</span></span></pre></div> <a id="trunkWebCorebindingsjsJSWorkerCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSWorkerCustom.cpp \
(42017 => 42018)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/js/JSWorkerCustom.cpp 2009-03-26 \
22:21:26 UTC (rev 42017)
+++ trunk/WebCore/bindings/js/JSWorkerCustom.cpp 2009-03-26 22:31:48 UTC (rev 42018)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx"> {
</span><span class="cx"> DOMObject::mark();
</span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onmessage())) </del><ins>+ \
if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->onmessage())) </ins><span class="cx"> \
listener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onerror())) </del><ins>+ \
if (JSEventListener* listener = \
static_cast<JSEventListener*>(m_impl->onerror())) </ins><span class="cx"> \
listener->mark(); </span><span class="cx">
</span><span class="cx"> typedef Worker::EventListenersMap EventListenersMap;
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> EventListenersMap& eventListeners = \
m_impl->eventListeners(); </span><span class="cx"> for \
(EventListenersMap::iterator mapIter = eventListeners.begin(); mapIter != \
eventListeners.end(); ++mapIter) { </span><span class="cx"> for \
(ListenerVector::iterator vecIter = mapIter->second.begin(); vecIter != \
mapIter->second.end(); ++vecIter) { </span><del>- \
JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(vecIter->get()); </del><ins>+ \
JSEventListener* listener = static_cast<JSEventListener*>(vecIter->get()); \
</ins><span class="cx"> listener->mark(); </span><span class="cx"> \
} </span><span class="cx"> }
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> JSDOMGlobalObject* globalObject = \
toJSDOMGlobalObject(impl()->scriptExecutionContext()); </span><span class="cx"> \
if (!globalObject) </span><span class="cx"> return jsUndefined();
</span><del>- RefPtr<JSUnprotectedEventListener> listener = \
globalObject->findOrCreateJSUnprotectedEventListener(exec, args.at(exec, 1)); \
</del><ins>+ RefPtr<JSEventListener> listener = \
globalObject->findOrCreateJSEventListener(exec, args.at(exec, 1)); </ins><span \
class="cx"> if (!listener) </span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->addEventListener(args.at(exec, \
0).toString(exec), listener.release(), args.at(exec, 2).toBoolean(exec)); \
</span><span class="lines">@@ -75,7 +75,7 @@ </span><span class="cx"> \
JSDOMGlobalObject* globalObject = \
toJSDOMGlobalObject(impl()->scriptExecutionContext()); </span><span class="cx"> \
if (!globalObject) </span><span class="cx"> return jsUndefined();
</span><del>- JSUnprotectedEventListener* listener = \
globalObject->findJSUnprotectedEventListener(exec, args.at(exec, 1)); </del><ins>+ \
JSEventListener* listener = globalObject->findJSEventListener(exec, args.at(exec, \
1)); </ins><span class="cx"> if (!listener)
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->removeEventListener(args.at(exec, \
0).toString(exec), listener, args.at(exec, 2).toBoolean(exec)); \
</span></span></pre></div> <a \
id="trunkWebCorebindingsjsJSXMLHttpRequestCustomcpp"></a> <div \
class="modfile"><h4>Modified: trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp \
(42017 => 42018)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp 2009-03-26 22:21:26 UTC (rev \
42017)
+++ trunk/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp 2009-03-26 22:31:48 UTC (rev \
42018) </span><span class="lines">@@ -59,22 +59,22 @@
</span><span class="cx"> wrapper->mark();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* onReadyStateChangeListener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onreadystatechange())) \
</del><ins>+ if (JSEventListener* onReadyStateChangeListener = \
static_cast<JSEventListener*>(m_impl->onreadystatechange())) </ins><span \
class="cx"> onReadyStateChangeListener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* onAbortListener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onabort())) </del><ins>+ \
if (JSEventListener* onAbortListener = \
static_cast<JSEventListener*>(m_impl->onabort())) </ins><span class="cx"> \
onAbortListener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* onErrorListener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onerror())) </del><ins>+ \
if (JSEventListener* onErrorListener = \
static_cast<JSEventListener*>(m_impl->onerror())) </ins><span class="cx"> \
onErrorListener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* onLoadListener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onload())) </del><ins>+ \
if (JSEventListener* onLoadListener = \
static_cast<JSEventListener*>(m_impl->onload())) </ins><span class="cx"> \
onLoadListener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* onLoadStartListener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onloadstart())) \
</del><ins>+ if (JSEventListener* onLoadStartListener = \
static_cast<JSEventListener*>(m_impl->onloadstart())) </ins><span \
class="cx"> onLoadStartListener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* onProgressListener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onprogress())) </del><ins>+ \
if (JSEventListener* onProgressListener = \
static_cast<JSEventListener*>(m_impl->onprogress())) </ins><span class="cx"> \
onProgressListener->mark(); </span><span class="cx">
</span><span class="cx"> typedef XMLHttpRequest::EventListenersMap \
EventListenersMap; </span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> EventListenersMap& eventListeners = \
m_impl->eventListeners(); </span><span class="cx"> for \
(EventListenersMap::iterator mapIter = eventListeners.begin(); mapIter != \
eventListeners.end(); ++mapIter) { </span><span class="cx"> for \
(ListenerVector::iterator vecIter = mapIter->second.begin(); vecIter != \
mapIter->second.end(); ++vecIter) { </span><del>- \
JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(vecIter->get()); </del><ins>+ \
JSEventListener* listener = static_cast<JSEventListener*>(vecIter->get()); \
</ins><span class="cx"> listener->mark(); </span><span class="cx"> \
} </span><span class="cx"> }
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> JSDOMGlobalObject* globalObject = \
toJSDOMGlobalObject(impl()->scriptExecutionContext()); </span><span class="cx"> \
if (!globalObject) </span><span class="cx"> return jsUndefined();
</span><del>- RefPtr<JSUnprotectedEventListener> listener = \
globalObject->findOrCreateJSUnprotectedEventListener(exec, args.at(exec, 1)); \
</del><ins>+ RefPtr<JSEventListener> listener = \
globalObject->findOrCreateJSEventListener(exec, args.at(exec, 1)); </ins><span \
class="cx"> if (!listener) </span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->addEventListener(args.at(exec, \
0).toString(exec), listener.release(), args.at(exec, 2).toBoolean(exec)); \
</span><span class="lines">@@ -193,7 +193,7 @@ </span><span class="cx"> \
JSDOMGlobalObject* globalObject = \
toJSDOMGlobalObject(impl()->scriptExecutionContext()); </span><span class="cx"> \
if (!globalObject) </span><span class="cx"> return jsUndefined();
</span><del>- JSUnprotectedEventListener* listener = \
globalObject->findJSUnprotectedEventListener(exec, args.at(exec, 1)); </del><ins>+ \
JSEventListener* listener = globalObject->findJSEventListener(exec, args.at(exec, \
1)); </ins><span class="cx"> if (!listener)
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->removeEventListener(args.at(exec, \
0).toString(exec), listener, args.at(exec, 2).toBoolean(exec)); \
</span></span></pre></div> <a \
id="trunkWebCorebindingsjsJSXMLHttpRequestUploadCustomcpp"></a> <div \
class="modfile"><h4>Modified: \
trunk/WebCore/bindings/js/JSXMLHttpRequestUploadCustom.cpp (42017 => 42018)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/WebCore/bindings/js/JSXMLHttpRequestUploadCustom.cpp 2009-03-26 22:21:26 UTC \
(rev 42017)
+++ trunk/WebCore/bindings/js/JSXMLHttpRequestUploadCustom.cpp 2009-03-26 22:31:48 \
UTC (rev 42018) </span><span class="lines">@@ -51,19 +51,19 @@
</span><span class="cx"> wrapper->mark();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* onAbortListener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onabort())) </del><ins>+ \
if (JSEventListener* onAbortListener = \
static_cast<JSEventListener*>(m_impl->onabort())) </ins><span class="cx"> \
onAbortListener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* onErrorListener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onerror())) </del><ins>+ \
if (JSEventListener* onErrorListener = \
static_cast<JSEventListener*>(m_impl->onerror())) </ins><span class="cx"> \
onErrorListener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* onLoadListener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onload())) </del><ins>+ \
if (JSEventListener* onLoadListener = \
static_cast<JSEventListener*>(m_impl->onload())) </ins><span class="cx"> \
onLoadListener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* onLoadStartListener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onloadstart())) \
</del><ins>+ if (JSEventListener* onLoadStartListener = \
static_cast<JSEventListener*>(m_impl->onloadstart())) </ins><span \
class="cx"> onLoadStartListener->mark(); </span><span class="cx">
</span><del>- if (JSUnprotectedEventListener* onProgressListener = \
static_cast<JSUnprotectedEventListener*>(m_impl->onprogress())) </del><ins>+ \
if (JSEventListener* onProgressListener = \
static_cast<JSEventListener*>(m_impl->onprogress())) </ins><span class="cx"> \
onProgressListener->mark(); </span><span class="cx">
</span><span class="cx"> typedef XMLHttpRequestUpload::EventListenersMap \
EventListenersMap; </span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> EventListenersMap& eventListeners = \
m_impl->eventListeners(); </span><span class="cx"> for \
(EventListenersMap::iterator mapIter = eventListeners.begin(); mapIter != \
eventListeners.end(); ++mapIter) { </span><span class="cx"> for \
(ListenerVector::iterator vecIter = mapIter->second.begin(); vecIter != \
mapIter->second.end(); ++vecIter) { </span><del>- \
JSUnprotectedEventListener* listener = \
static_cast<JSUnprotectedEventListener*>(vecIter->get()); </del><ins>+ \
JSEventListener* listener = static_cast<JSEventListener*>(vecIter->get()); \
</ins><span class="cx"> listener->mark(); </span><span class="cx"> \
} </span><span class="cx"> }
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> JSDOMGlobalObject* globalObject = \
toJSDOMGlobalObject(impl()->scriptExecutionContext()); </span><span class="cx"> \
if (!globalObject) </span><span class="cx"> return jsUndefined();
</span><del>- RefPtr<JSUnprotectedEventListener> listener = \
globalObject->findOrCreateJSUnprotectedEventListener(exec, args.at(exec, 1)); \
</del><ins>+ RefPtr<JSEventListener> listener = \
globalObject->findOrCreateJSEventListener(exec, args.at(exec, 1)); </ins><span \
class="cx"> if (!listener) </span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->addEventListener(args.at(exec, \
0).toString(exec), listener.release(), args.at(exec, 2).toBoolean(exec)); \
</span><span class="lines">@@ -94,7 +94,7 @@ </span><span class="cx"> \
JSDOMGlobalObject* globalObject = \
toJSDOMGlobalObject(impl()->scriptExecutionContext()); </span><span class="cx"> \
if (!globalObject) </span><span class="cx"> return jsUndefined();
</span><del>- JSUnprotectedEventListener* listener = \
globalObject->findJSUnprotectedEventListener(exec, args.at(exec, 1)); </del><ins>+ \
JSEventListener* listener = globalObject->findJSEventListener(exec, args.at(exec, \
1)); </ins><span class="cx"> if (!listener)
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> impl()->removeEventListener(args.at(exec, \
0).toString(exec), listener, args.at(exec, 2).toBoolean(exec)); \
</span></span></pre></div> <a id="trunkWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm \
(42017 => 42018)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm 2009-03-26 \
22:21:26 UTC (rev 42017)
+++ trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm 2009-03-26 22:31:48 UTC (rev \
42018) </span><span class="lines">@@ -1092,7 +1092,7 @@
</span><span class="cx"> if \
($attribute->signature->extendedAttributes->{"ProtectedListener"}) \
{ </span><span class="cx"> $listenerType = \
"JSProtectedEventListener"; </span><span class="cx"> } \
else { </span><del>- $listenerType = \
"JSUnprotectedEventListener"; </del><ins>+ \
$listenerType = "JSEventListener"; </ins><span class="cx"> \
} </span><span class="cx"> push(@implContent, " \
UNUSED_PARAM(exec);\n"); </span><span class="cx"> \
push(@implContent, " $implClassName* imp = \
static_cast<$implClassName*>(static_cast<$className*>(asObject(slot.slotBase()))->impl());\n");
</span><span class="lines">@@ -1223,7 +1223,7 @@
</span><span class="cx"> if \
($attribute->signature->extendedAttributes->{"ProtectedListener"}) \
{ </span><span class="cx"> $listenerType = \
"JSProtectedEventListener"; </span><span class="cx"> \
} else { </span><del>- $listenerType = \
"JSUnprotectedEventListener"; </del><ins>+ \
$listenerType = "JSEventListener"; </ins><span class="cx"> \
} </span><span class="cx"> if \
($dataNode->extendedAttributes->{"ExtendsDOMGlobalObject"}) { \
</span><span class="cx"> push(@implContent, " \
JSDOMGlobalObject* globalObject = \
static_cast<$className*>(thisObject);\n"); </span></span></pre></div>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (42017 => 42018)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog 2009-03-26 22:21:26 UTC (rev \
42017)
+++ trunk/WebKitTools/ChangeLog 2009-03-26 22:31:48 UTC (rev 42018)
</span><span class="lines">@@ -2,6 +2,13 @@
</span><span class="cx">
</span><span class="cx"> Reviewed by Geoff Garen.
</span><span class="cx">
</span><ins>+ * Scripts/do-webcore-rename:Update for rename of \
JSUnprotectedEventListener to + JSEventListener.
+
+2009-03-26 Darin Adler <darin@apple.com>
+
+ Reviewed by Geoff Garen.
+
</ins><span class="cx"> * Scripts/do-webcore-rename: Update for rename of \
JSEventListener to </span><span class="cx"> JSProtectedEventListener. This \
includes all the related renames, but </span><span class="cx"> not that one \
because that one renames the file. </span></span></pre></div>
<a id="trunkWebKitToolsScriptsdowebcorerename"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/Scripts/do-webcore-rename (42017 \
=> 42018)</h4> <pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/Scripts/do-webcore-rename 2009-03-26 \
22:21:26 UTC (rev 42017)
+++ trunk/WebKitTools/Scripts/do-webcore-rename 2009-03-26 22:31:48 UTC (rev 42018)
</span><span class="lines">@@ -68,11 +68,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> my %renames = (
</span><del>- "findJSEventListener" => \
"findJSProtectedEventListener",
- "findOrCreateJSEventListener" => \
"findOrCreateJSProtectedEventListener",
- "ListenersMap" => "ProtectedListenersMap",
- "jsEventListeners" => "jsProtectedEventListeners",
- "jsInlineEventListeners" => \
"jsProtectedInlineEventListeners", </del><ins>+ \
"JSUnprotectedEventListener" => "JSEventListener", + \
"findJSUnprotectedEventListener" => "findJSEventListener", + \
"findOrCreateJSUnprotectedEventListener" => \
"findOrCreateJSEventListener", + "UnprotectedListenersMap" \
=> "JSListenersMap", + "jsUnprotectedEventListeners" => \
"jsEventListeners", + "jsUnprotectedInlineEventListeners" \
=> "jsInlineEventListeners", </ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> my %renamesContemplatedForTheFuture = (
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic