<!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>[173190] trunk/Source/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/173190">173190</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-09-02 15:47:37 -0700 (Tue, 02 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use references in public EventSender functions
https://bugs.webkit.org/show_bug.cgi?id=136463
Reviewed by Dan Bates.
Passing nullptr to EventSender shouldn't be allowed.
No new tests because there is no behavior change.
* dom/EventSender.h:
(WebCore::EventSender::hasPendingEvents):
(WebCore::EventSender<T>::dispatchEventSoon):
(WebCore::EventSender<T>::cancelEvent):
(WebCore::EventSender<T>::dispatchPendingEvents):
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::~HTMLLinkElement):
(WebCore::HTMLLinkElement::notifyLoadedSheetAndAllCriticalSubresources):
* html/HTMLStyleElement.cpp:
(WebCore::HTMLStyleElement::~HTMLStyleElement):
(WebCore::HTMLStyleElement::notifyLoadedSheetAndAllCriticalSubresources):
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::~ImageLoader):
(WebCore::ImageLoader::setImageWithoutConsideringPendingLoadEvent):
(WebCore::ImageLoader::updateFromElement):
(WebCore::ImageLoader::notifyFinished):
(WebCore::ImageLoader::dispatchPendingBeforeLoadEvent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomEventSenderh">trunk/Source/WebCore/dom/EventSender.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLStyleElementcpp">trunk/Source/WebCore/html/HTMLStyleElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderImageLoadercpp">trunk/Source/WebCore/loader/ImageLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173189 => 173190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-02 22:45:05 UTC (rev 173189)
+++ trunk/Source/WebCore/ChangeLog 2014-09-02 22:47:37 UTC (rev 173190)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-09-02 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Use references in public EventSender functions
+ https://bugs.webkit.org/show_bug.cgi?id=136463
+
+ Reviewed by Dan Bates.
+
+ Passing nullptr to EventSender shouldn't be allowed.
+
+ No new tests because there is no behavior change.
+
+ * dom/EventSender.h:
+ (WebCore::EventSender::hasPendingEvents):
+ (WebCore::EventSender<T>::dispatchEventSoon):
+ (WebCore::EventSender<T>::cancelEvent):
+ (WebCore::EventSender<T>::dispatchPendingEvents):
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::~HTMLLinkElement):
+ (WebCore::HTMLLinkElement::notifyLoadedSheetAndAllCriticalSubresources):
+ * html/HTMLStyleElement.cpp:
+ (WebCore::HTMLStyleElement::~HTMLStyleElement):
+ (WebCore::HTMLStyleElement::notifyLoadedSheetAndAllCriticalSubresources):
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::~ImageLoader):
+ (WebCore::ImageLoader::setImageWithoutConsideringPendingLoadEvent):
+ (WebCore::ImageLoader::updateFromElement):
+ (WebCore::ImageLoader::notifyFinished):
+ (WebCore::ImageLoader::dispatchPendingBeforeLoadEvent):
+
</ins><span class="cx"> 2014-09-02 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Exclude touch and gesture files when building without ENABLE_TOUCH_EVENTS
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventSender.h (173189 => 173190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/EventSender.h 2014-09-02 22:45:05 UTC (rev 173189)
+++ trunk/Source/WebCore/dom/EventSender.h 2014-09-02 22:47:37 UTC (rev 173190)
</span><span class="lines">@@ -37,14 +37,14 @@
</span><span class="cx"> explicit EventSender(const AtomicString& eventType);
</span><span class="cx">
</span><span class="cx"> const AtomicString& eventType() const { return m_eventType; }
</span><del>- void dispatchEventSoon(T*);
- void cancelEvent(T*);
</del><ins>+ void dispatchEventSoon(T&);
+ void cancelEvent(T&);
</ins><span class="cx"> void dispatchPendingEvents();
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>- bool hasPendingEvents(T* sender) const
</del><ins>+ bool hasPendingEvents(T& sender) const
</ins><span class="cx"> {
</span><del>- return m_dispatchSoonList.find(sender) != notFound || m_dispatchingList.find(sender) != notFound;
</del><ins>+ return m_dispatchSoonList.find(&sender) != notFound || m_dispatchingList.find(&sender) != notFound;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -63,26 +63,24 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> void EventSender<T>::dispatchEventSoon(T* sender)
</del><ins>+template<typename T> void EventSender<T>::dispatchEventSoon(T& sender)
</ins><span class="cx"> {
</span><del>- m_dispatchSoonList.append(sender);
</del><ins>+ m_dispatchSoonList.append(&sender);
</ins><span class="cx"> if (!m_timer.isActive())
</span><span class="cx"> m_timer.startOneShot(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> void EventSender<T>::cancelEvent(T* sender)
</del><ins>+template<typename T> void EventSender<T>::cancelEvent(T& sender)
</ins><span class="cx"> {
</span><span class="cx"> // Remove instances of this sender from both lists.
</span><span class="cx"> // Use loops because we allow multiple instances to get into the lists.
</span><del>- size_t size = m_dispatchSoonList.size();
- for (size_t i = 0; i < size; ++i) {
- if (m_dispatchSoonList[i] == sender)
- m_dispatchSoonList[i] = 0;
</del><ins>+ for (auto& event : m_dispatchSoonList) {
+ if (event == &sender)
+ event = nullptr;
</ins><span class="cx"> }
</span><del>- size = m_dispatchingList.size();
- for (size_t i = 0; i < size; ++i) {
- if (m_dispatchingList[i] == sender)
- m_dispatchingList[i] = 0;
</del><ins>+ for (auto& event : m_dispatchingList) {
+ if (event == &sender)
+ event = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -99,10 +97,9 @@
</span><span class="cx"> m_dispatchSoonList.checkConsistency();
</span><span class="cx">
</span><span class="cx"> m_dispatchingList.swap(m_dispatchSoonList);
</span><del>- size_t size = m_dispatchingList.size();
- for (size_t i = 0; i < size; ++i) {
- if (T* sender = m_dispatchingList[i]) {
- m_dispatchingList[i] = 0;
</del><ins>+ for (auto& event : m_dispatchingList) {
+ if (T* sender = event) {
+ event = nullptr;
</ins><span class="cx"> sender->dispatchPendingEvent(this);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (173189 => 173190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2014-09-02 22:45:05 UTC (rev 173189)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2014-09-02 22:47:37 UTC (rev 173190)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> if (inDocument())
</span><span class="cx"> document().styleSheetCollection().removeStyleSheetCandidateNode(*this);
</span><span class="cx">
</span><del>- linkLoadEventSender().cancelEvent(this);
</del><ins>+ linkLoadEventSender().cancelEvent(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLLinkElement::setDisabledState(bool disabled)
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> if (m_firedLoad)
</span><span class="cx"> return;
</span><span class="cx"> m_loadedSheet = !errorOccurred;
</span><del>- linkLoadEventSender().dispatchEventSoon(this);
</del><ins>+ linkLoadEventSender().dispatchEventSoon(*this);
</ins><span class="cx"> m_firedLoad = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLStyleElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLStyleElement.cpp (173189 => 173190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLStyleElement.cpp 2014-09-02 22:45:05 UTC (rev 173189)
+++ trunk/Source/WebCore/html/HTMLStyleElement.cpp 2014-09-02 22:47:37 UTC (rev 173190)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> // Therefore we can't ASSERT(m_scopedStyleRegistrationState == NotRegistered).
</span><span class="cx"> m_styleSheetOwner.clearDocumentData(document(), *this);
</span><span class="cx">
</span><del>- styleLoadEventSender().cancelEvent(this);
</del><ins>+ styleLoadEventSender().cancelEvent(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<HTMLStyleElement> HTMLStyleElement::create(const QualifiedName& tagName, Document& document, bool createdByParser)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> if (m_firedLoad)
</span><span class="cx"> return;
</span><span class="cx"> m_loadedSheet = !errorOccurred;
</span><del>- styleLoadEventSender().dispatchEventSoon(this);
</del><ins>+ styleLoadEventSender().dispatchEventSoon(*this);
</ins><span class="cx"> m_firedLoad = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (173189 => 173190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.cpp 2014-09-02 22:45:05 UTC (rev 173189)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp 2014-09-02 22:47:37 UTC (rev 173190)
</span><span class="lines">@@ -105,17 +105,17 @@
</span><span class="cx"> if (m_image)
</span><span class="cx"> m_image->removeClient(this);
</span><span class="cx">
</span><del>- ASSERT(m_hasPendingBeforeLoadEvent || !beforeLoadEventSender().hasPendingEvents(this));
</del><ins>+ ASSERT(m_hasPendingBeforeLoadEvent || !beforeLoadEventSender().hasPendingEvents(*this));
</ins><span class="cx"> if (m_hasPendingBeforeLoadEvent)
</span><del>- beforeLoadEventSender().cancelEvent(this);
</del><ins>+ beforeLoadEventSender().cancelEvent(*this);
</ins><span class="cx">
</span><del>- ASSERT(m_hasPendingLoadEvent || !loadEventSender().hasPendingEvents(this));
</del><ins>+ ASSERT(m_hasPendingLoadEvent || !loadEventSender().hasPendingEvents(*this));
</ins><span class="cx"> if (m_hasPendingLoadEvent)
</span><del>- loadEventSender().cancelEvent(this);
</del><ins>+ loadEventSender().cancelEvent(*this);
</ins><span class="cx">
</span><del>- ASSERT(m_hasPendingErrorEvent || !errorEventSender().hasPendingEvents(this));
</del><ins>+ ASSERT(m_hasPendingErrorEvent || !errorEventSender().hasPendingEvents(*this));
</ins><span class="cx"> if (m_hasPendingErrorEvent)
</span><del>- errorEventSender().cancelEvent(this);
</del><ins>+ errorEventSender().cancelEvent(*this);
</ins><span class="cx">
</span><span class="cx"> // If the ImageLoader is being destroyed but it is still protecting its image-loading Element,
</span><span class="cx"> // remove that protection here.
</span><span class="lines">@@ -139,15 +139,15 @@
</span><span class="cx"> if (newImage != oldImage) {
</span><span class="cx"> m_image = newImage;
</span><span class="cx"> if (m_hasPendingBeforeLoadEvent) {
</span><del>- beforeLoadEventSender().cancelEvent(this);
</del><ins>+ beforeLoadEventSender().cancelEvent(*this);
</ins><span class="cx"> m_hasPendingBeforeLoadEvent = false;
</span><span class="cx"> }
</span><span class="cx"> if (m_hasPendingLoadEvent) {
</span><del>- loadEventSender().cancelEvent(this);
</del><ins>+ loadEventSender().cancelEvent(*this);
</ins><span class="cx"> m_hasPendingLoadEvent = false;
</span><span class="cx"> }
</span><span class="cx"> if (m_hasPendingErrorEvent) {
</span><del>- errorEventSender().cancelEvent(this);
</del><ins>+ errorEventSender().cancelEvent(*this);
</ins><span class="cx"> m_hasPendingErrorEvent = false;
</span><span class="cx"> }
</span><span class="cx"> m_imageComplete = true;
</span><span class="lines">@@ -205,24 +205,24 @@
</span><span class="cx"> if (!newImage && !pageIsBeingDismissed(document)) {
</span><span class="cx"> m_failedLoadURL = attr;
</span><span class="cx"> m_hasPendingErrorEvent = true;
</span><del>- errorEventSender().dispatchEventSoon(this);
</del><ins>+ errorEventSender().dispatchEventSoon(*this);
</ins><span class="cx"> } else
</span><span class="cx"> clearFailedLoadURL();
</span><span class="cx"> } else if (!attr.isNull()) {
</span><span class="cx"> // Fire an error event if the url is empty.
</span><span class="cx"> m_failedLoadURL = attr;
</span><span class="cx"> m_hasPendingErrorEvent = true;
</span><del>- errorEventSender().dispatchEventSoon(this);
</del><ins>+ errorEventSender().dispatchEventSoon(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedImage* oldImage = m_image.get();
</span><span class="cx"> if (newImage != oldImage) {
</span><span class="cx"> if (m_hasPendingBeforeLoadEvent) {
</span><del>- beforeLoadEventSender().cancelEvent(this);
</del><ins>+ beforeLoadEventSender().cancelEvent(*this);
</ins><span class="cx"> m_hasPendingBeforeLoadEvent = false;
</span><span class="cx"> }
</span><span class="cx"> if (m_hasPendingLoadEvent) {
</span><del>- loadEventSender().cancelEvent(this);
</del><ins>+ loadEventSender().cancelEvent(*this);
</ins><span class="cx"> m_hasPendingLoadEvent = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> // this load and we should not cancel the event.
</span><span class="cx"> // FIXME: If both previous load and this one got blocked with an error, we can receive one error event instead of two.
</span><span class="cx"> if (m_hasPendingErrorEvent && newImage) {
</span><del>- errorEventSender().cancelEvent(this);
</del><ins>+ errorEventSender().cancelEvent(*this);
</ins><span class="cx"> m_hasPendingErrorEvent = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> if (!document.hasListenerType(Document::BEFORELOAD_LISTENER))
</span><span class="cx"> dispatchPendingBeforeLoadEvent();
</span><span class="cx"> else
</span><del>- beforeLoadEventSender().dispatchEventSoon(this);
</del><ins>+ beforeLoadEventSender().dispatchEventSoon(*this);
</ins><span class="cx"> } else
</span><span class="cx"> updateRenderer();
</span><span class="cx">
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> setImageWithoutConsideringPendingLoadEvent(0);
</span><span class="cx">
</span><span class="cx"> m_hasPendingErrorEvent = true;
</span><del>- errorEventSender().dispatchEventSoon(this);
</del><ins>+ errorEventSender().dispatchEventSoon(*this);
</ins><span class="cx">
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Cross-origin image load denied by Cross-Origin Resource Sharing policy.")));
</span><span class="cx"> element().document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage);
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- loadEventSender().dispatchEventSoon(this);
</del><ins>+ loadEventSender().dispatchEventSoon(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderImageResource* ImageLoader::renderImageResource()
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> m_image = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- loadEventSender().cancelEvent(this);
</del><ins>+ loadEventSender().cancelEvent(*this);
</ins><span class="cx"> m_hasPendingLoadEvent = false;
</span><span class="cx">
</span><span class="cx"> if (isHTMLObjectElement(element()))
</span></span></pre>
</div>
</div>
</body>
</html>