<!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>[181615] 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/181615">181615</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-03-16 21:43:52 -0700 (Mon, 16 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Generalize the Document code that maintains a set of nodes with event handlers
https://bugs.webkit.org/show_bug.cgi?id=142762
Reviewed by Zalan Bujtas, Darin Adler.
Document.h defines a TouchEventTargetSet type, which will in future be used for
other event types too (wheel events), so rename it to EventTargetSet.
Take didRemoveEventTargetNode() outside the TOUCH_EVENTS #ifdef, and change it
to take a reference.
* dom/Document.cpp:
(WebCore::Document::prepareForDestruction): References
(WebCore::Document::didAddTouchEventHandler): Ditto.
(WebCore::Document::didRemoveEventTargetNode): Ditto.
* dom/Document.h:
(WebCore::Document::touchEventTargets): No-one calls this; just remove the non
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::~HTMLInputElement): Pass a ref.
(WebCore::HTMLInputElement::didMoveToNewDocument): Pass a ref.
* page/DOMWindow.cpp:
(WebCore::DOMWindow::removeAllEventListeners): Pass a ref.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181614 => 181615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-17 04:41:36 UTC (rev 181614)
+++ trunk/Source/WebCore/ChangeLog 2015-03-17 04:43:52 UTC (rev 181615)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-03-16 Simon Fraser <simon.fraser@apple.com>
+
+ Generalize the Document code that maintains a set of nodes with event handlers
+ https://bugs.webkit.org/show_bug.cgi?id=142762
+
+ Reviewed by Zalan Bujtas, Darin Adler.
+
+ Document.h defines a TouchEventTargetSet type, which will in future be used for
+ other event types too (wheel events), so rename it to EventTargetSet.
+
+ Take didRemoveEventTargetNode() outside the TOUCH_EVENTS #ifdef, and change it
+ to take a reference.
+
+ * dom/Document.cpp:
+ (WebCore::Document::prepareForDestruction): References
+ (WebCore::Document::didAddTouchEventHandler): Ditto.
+ (WebCore::Document::didRemoveEventTargetNode): Ditto.
+ * dom/Document.h:
+ (WebCore::Document::touchEventTargets): No-one calls this; just remove the non
+ #ideffed one.
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::~HTMLInputElement): Pass a ref.
+ (WebCore::HTMLInputElement::didMoveToNewDocument): Pass a ref.
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::removeAllEventListeners): Pass a ref.
+
</ins><span class="cx"> 2015-03-16 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Object Previews in Indexed DB tables
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (181614 => 181615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-03-17 04:41:36 UTC (rev 181614)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-03-17 04:43:52 UTC (rev 181615)
</span><span class="lines">@@ -2239,7 +2239,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (m_touchEventTargets && m_touchEventTargets->size() && parentDocument())
</span><del>- parentDocument()->didRemoveEventTargetNode(this);
</del><ins>+ parentDocument()->didRemoveEventTargetNode(*this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (m_mediaQueryMatcher)
</span><span class="lines">@@ -6012,7 +6012,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (!m_touchEventTargets.get())
</span><del>- m_touchEventTargets = std::make_unique<TouchEventTargetSet>();
</del><ins>+ m_touchEventTargets = std::make_unique<EventTargetSet>();
</ins><span class="cx"> m_touchEventTargets->add(&handler);
</span><span class="cx"> if (Document* parent = parentDocument()) {
</span><span class="cx"> parent->didAddTouchEventHandler(*this);
</span><span class="lines">@@ -6054,16 +6054,19 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Document::didRemoveEventTargetNode(Node& handler)
+{
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>-void Document::didRemoveEventTargetNode(Node* handler)
-{
</del><span class="cx"> if (m_touchEventTargets) {
</span><del>- m_touchEventTargets->removeAll(handler);
- if ((handler == this || m_touchEventTargets->isEmpty()) && parentDocument())
- parentDocument()->didRemoveEventTargetNode(this);
</del><ins>+ m_touchEventTargets->removeAll(&handler);
+ if ((&handler == this || m_touchEventTargets->isEmpty()) && parentDocument())
+ parentDocument()->didRemoveEventTargetNode(*this);
</ins><span class="cx"> }
</span><ins>+#else
+ UNUSED_PARAM(handler);
+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> void Document::updateLastHandledUserGestureTimestamp()
</span><span class="cx"> {
</span><span class="cx"> m_lastHandledUserGestureTimestamp = monotonicallyIncreasingTime();
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (181614 => 181615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-03-17 04:41:36 UTC (rev 181614)
+++ trunk/Source/WebCore/dom/Document.h 2015-03-17 04:43:52 UTC (rev 181615)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> };
</span><span class="cx"> const int numNodeListInvalidationTypes = InvalidateOnAnyAttrChange + 1;
</span><span class="cx">
</span><del>-typedef HashCountedSet<Node*> TouchEventTargetSet;
</del><ins>+typedef HashCountedSet<Node*> EventTargetSet;
</ins><span class="cx">
</span><span class="cx"> enum DocumentClass {
</span><span class="cx"> DefaultDocumentClass = 0,
</span><span class="lines">@@ -1137,15 +1137,16 @@
</span><span class="cx"> void didAddTouchEventHandler(Node&);
</span><span class="cx"> void didRemoveTouchEventHandler(Node&);
</span><span class="cx">
</span><del>-#if ENABLE(TOUCH_EVENTS)
- void didRemoveEventTargetNode(Node*);
-#endif
</del><ins>+ void didRemoveEventTargetNode(Node&);
</ins><span class="cx">
</span><ins>+ const EventTargetSet* touchEventTargets() const
+ {
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>- const TouchEventTargetSet* touchEventTargets() const { return m_touchEventTargets.get(); }
</del><ins>+ return m_touchEventTargets.get();
</ins><span class="cx"> #else
</span><del>- const TouchEventTargetSet* touchEventTargets() const { return 0; }
</del><ins>+ return nullptr;
</ins><span class="cx"> #endif
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> bool visualUpdatesAllowed() const { return m_visualUpdatesAllowed; }
</span><span class="cx">
</span><span class="lines">@@ -1558,7 +1559,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned m_wheelEventHandlerCount;
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>- std::unique_ptr<TouchEventTargetSet> m_touchEventTargets;
</del><ins>+ std::unique_ptr<EventTargetSet> m_touchEventTargets;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> double m_lastHandledUserGestureTimestamp;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (181614 => 181615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2015-03-17 04:41:36 UTC (rev 181614)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2015-03-17 04:43:52 UTC (rev 181615)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> document().formController().checkedRadioButtons().removeButton(this);
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (m_hasTouchEventHandler)
</span><del>- document().didRemoveEventTargetNode(this);
</del><ins>+ document().didRemoveEventTargetNode(*this);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1506,7 +1506,7 @@
</span><span class="cx"> oldDocument->formController().checkedRadioButtons().removeButton(this);
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (m_hasTouchEventHandler)
</span><del>- oldDocument->didRemoveEventTargetNode(this);
</del><ins>+ oldDocument->didRemoveEventTargetNode(*this);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (181614 => 181615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2015-03-17 04:41:36 UTC (rev 181614)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2015-03-17 04:43:52 UTC (rev 181615)
</span><span class="lines">@@ -1933,7 +1933,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> if (Document* document = this->document())
</span><del>- document->didRemoveEventTargetNode(document);
</del><ins>+ document->didRemoveEventTargetNode(*document);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROXIMITY_EVENTS)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (181614 => 181615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-03-17 04:41:36 UTC (rev 181614)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-03-17 04:43:52 UTC (rev 181615)
</span><span class="lines">@@ -1213,13 +1213,14 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const TouchEventTargetSet* touchHandlers = document->touchEventTargets();
</del><ins>+ auto touchHandlers = document->touchEventTargets();
</ins><span class="cx"> if (!touchHandlers)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> unsigned count = 0;
</span><del>- for (TouchEventTargetSet::const_iterator iter = touchHandlers->begin(); iter != touchHandlers->end(); ++iter)
- count += iter->value;
</del><ins>+ for (auto& handler : *touchHandlers)
+ count += handler.value;
+
</ins><span class="cx"> return count;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>