<!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>[166586] 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/166586">166586</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-04-01 08:22:36 -0700 (Tue, 01 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid unnecessary HashSet copies when calling collectInstancesForSVGElement
https://bugs.webkit.org/show_bug.cgi?id=131020
Reviewed by Andreas Kling.
Remove collectInstancesForSVGElement() to avoid HashSet copies when assigning a const
HashSet reference to a non-const HashSet reference. Instead, range-based for-loops are
deployed to iterate directly over the const reference to HashSet that's returned by
SVGElement::instancesForElement(). SVGElement::containingShadowRoot() return value
is checked to see if the iteration should be performed in the first place, preserving
the behavior of collectInstancesForSVGElement().
* svg/SVGElement.cpp:
(WebCore::SVGElement::addEventListener):
(WebCore::SVGElement::removeEventListener):
(WebCore::collectInstancesForSVGElement): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166585 => 166586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-01 15:20:40 UTC (rev 166585)
+++ trunk/Source/WebCore/ChangeLog 2014-04-01 15:22:36 UTC (rev 166586)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-04-01 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Avoid unnecessary HashSet copies when calling collectInstancesForSVGElement
+ https://bugs.webkit.org/show_bug.cgi?id=131020
+
+ Reviewed by Andreas Kling.
+
+ Remove collectInstancesForSVGElement() to avoid HashSet copies when assigning a const
+ HashSet reference to a non-const HashSet reference. Instead, range-based for-loops are
+ deployed to iterate directly over the const reference to HashSet that's returned by
+ SVGElement::instancesForElement(). SVGElement::containingShadowRoot() return value
+ is checked to see if the iteration should be performed in the first place, preserving
+ the behavior of collectInstancesForSVGElement().
+
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::addEventListener):
+ (WebCore::SVGElement::removeEventListener):
+ (WebCore::collectInstancesForSVGElement): Deleted.
+
+2014-04-01 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Move the attributes HashMap out of the parseAttributes function
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131019
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (166585 => 166586)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2014-04-01 15:20:40 UTC (rev 166585)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2014-04-01 15:22:36 UTC (rev 166586)
</span><span class="lines">@@ -535,17 +535,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void collectInstancesForSVGElement(SVGElement* element, HashSet<SVGElementInstance*>& instances)
-{
- ASSERT(element);
- if (element->containingShadowRoot())
- return;
-
- ASSERT(!element->instanceUpdatesBlocked());
-
- instances = element->instancesForElement();
-}
-
</del><span class="cx"> bool SVGElement::addEventListener(const AtomicString& eventType, PassRefPtr<EventListener> prpListener, bool useCapture)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<EventListener> listener = prpListener;
</span><span class="lines">@@ -554,15 +543,16 @@
</span><span class="cx"> if (!Node::addEventListener(eventType, listener, useCapture))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (containingShadowRoot())
+ return true;
+
</ins><span class="cx"> // Add event listener to all shadow tree DOM element instances
</span><del>- HashSet<SVGElementInstance*> instances;
- collectInstancesForSVGElement(this, instances);
- const HashSet<SVGElementInstance*>::const_iterator end = instances.end();
- for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) {
- ASSERT((*it)->shadowTreeElement());
- ASSERT((*it)->correspondingElement() == this);
</del><ins>+ ASSERT(!element->instanceUpdatesBlocked());
+ for (auto& instance : instancesForElement()) {
+ ASSERT(instance->shadowTreeElement());
+ ASSERT(instance->correspondingElement() == this);
</ins><span class="cx">
</span><del>- bool result = (*it)->shadowTreeElement()->Node::addEventListener(eventType, listener, useCapture);
</del><ins>+ bool result = instance->shadowTreeElement()->Node::addEventListener(eventType, listener, useCapture);
</ins><span class="cx"> ASSERT_UNUSED(result, result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -571,9 +561,7 @@
</span><span class="cx">
</span><span class="cx"> bool SVGElement::removeEventListener(const AtomicString& eventType, EventListener* listener, bool useCapture)
</span><span class="cx"> {
</span><del>- HashSet<SVGElementInstance*> instances;
- collectInstancesForSVGElement(this, instances);
- if (instances.isEmpty())
</del><ins>+ if (containingShadowRoot())
</ins><span class="cx"> return Node::removeEventListener(eventType, listener, useCapture);
</span><span class="cx">
</span><span class="cx"> // EventTarget::removeEventListener creates a PassRefPtr around the given EventListener
</span><span class="lines">@@ -588,11 +576,11 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Remove event listener from all shadow tree DOM element instances
</span><del>- const HashSet<SVGElementInstance*>::const_iterator end = instances.end();
- for (HashSet<SVGElementInstance*>::const_iterator it = instances.begin(); it != end; ++it) {
- ASSERT((*it)->correspondingElement() == this);
</del><ins>+ ASSERT(!element->instanceUpdatesBlocked());
+ for (auto& instance : instancesForElement()) {
+ ASSERT(instance->correspondingElement() == this);
</ins><span class="cx">
</span><del>- SVGElement* shadowTreeElement = (*it)->shadowTreeElement();
</del><ins>+ SVGElement* shadowTreeElement = instance->shadowTreeElement();
</ins><span class="cx"> ASSERT(shadowTreeElement);
</span><span class="cx">
</span><span class="cx"> if (shadowTreeElement->Node::removeEventListener(eventType, listener, useCapture))
</span></span></pre>
</div>
</div>
</body>
</html>