<!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>[82340] 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/82340">82340</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2011-03-29 15:46:53 -0700 (Tue, 29 Mar 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>2011-03-29  Geoff Pike  <gpike@chromium.org>

        Reviewed by Dimitri Glazkov.

        In HitTestResult objects, initialize the ListHashSet<RefPtr<Node> >
        lazily.  In my informal testing it seems to be used hardly at all, so
        it's wasteful to create it eagerly.  Initializing a ListHashSet
        is expensive because a ListHashSet initially has space for 256
        elements, and that space is memset to 0.

        This change should improve performance but have no impact on
        correctness.  On x86-64, for example, the change cuts the
        cost of HitTestResult(IntPoint()) in EventHandler::mouseMoved()
        from ~1700 cycles to ~300 cycles.

        * rendering/HitTestResult.cpp:
        (WebCore::HitTestResult::HitTestResult): copy *m_rectBasedTestResult if m_rectBasedTestResult isn't 0
        (WebCore::HitTestResult::operator=): copy *m_rectBasedTestResult if m_rectBasedTestResult isn't 0
        (WebCore::HitTestResult::addNodeToRectBasedTestResult): use mutableRectBasedTestResult() rather than m_rectBasedTestResult
        (WebCore::HitTestResult::append): append *(other.m_rectBasedTestResult) if other.m_rectBasedTestResult isn't 0
        * rendering/HitTestResult.h:
        (WebCore::HitTestResult::rectBasedTestResult): Add a typedef for ListHashSet<RefPtr<Node> > to ease readability.  Change m_rectBasedTestResult from ListHashSet<RefPtr<Node> > to an OwnPtr of same.  Modify rectBasedTestResult() and add mutableRectBasedTestResult().</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResultcpp">trunk/Source/WebCore/rendering/HitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResulth">trunk/Source/WebCore/rendering/HitTestResult.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (82339 => 82340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2011-03-29 22:45:58 UTC (rev 82339)
+++ trunk/Source/WebCore/ChangeLog      2011-03-29 22:46:53 UTC (rev 82340)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2011-03-29  Geoff Pike  <gpike@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        In HitTestResult objects, initialize the ListHashSet<RefPtr<Node> >
+        lazily.  In my informal testing it seems to be used hardly at all, so
+        it's wasteful to create it eagerly.  Initializing a ListHashSet
+        is expensive because a ListHashSet initially has space for 256
+        elements, and that space is memset to 0.
+
+        This change should improve performance but have no impact on
+        correctness.  On x86-64, for example, the change cuts the
+        cost of HitTestResult(IntPoint()) in EventHandler::mouseMoved()
+        from ~1700 cycles to ~300 cycles.
+
+        * rendering/HitTestResult.cpp:
+        (WebCore::HitTestResult::HitTestResult): copy *m_rectBasedTestResult if m_rectBasedTestResult isn't 0
+        (WebCore::HitTestResult::operator=): copy *m_rectBasedTestResult if m_rectBasedTestResult isn't 0
+        (WebCore::HitTestResult::addNodeToRectBasedTestResult): use mutableRectBasedTestResult() rather than m_rectBasedTestResult
+        (WebCore::HitTestResult::append): append *(other.m_rectBasedTestResult) if other.m_rectBasedTestResult isn't 0
+        * rendering/HitTestResult.h:
+        (WebCore::HitTestResult::rectBasedTestResult): Add a typedef for ListHashSet<RefPtr<Node> > to ease readability.  Change m_rectBasedTestResult from ListHashSet<RefPtr<Node> > to an OwnPtr of same.  Modify rectBasedTestResult() and add mutableRectBasedTestResult().
+
</ins><span class="cx"> 2011-03-29  Timothy Hatcher  <timothy@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Update the order of the context menu to better match AppKit on Mac.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (82339 => 82340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.cpp 2011-03-29 22:45:58 UTC (rev 82339)
+++ trunk/Source/WebCore/rendering/HitTestResult.cpp    2011-03-29 22:46:53 UTC (rev 82340)
</span><span class="lines">@@ -95,16 +95,17 @@
</span><span class="cx">     , m_scrollbar(other.scrollbar())
</span><span class="cx">     , m_isOverWidget(other.isOverWidget())
</span><span class="cx"> {
</span><del>-    // Only copy the padding and ListHashSet in case of rect hit test.
</del><ins>+    // Only copy the padding and NodeSet in case of rect hit test.
</ins><span class="cx">     // Copying the later is rather expensive.
</span><span class="cx">     if ((m_isRectBased = other.isRectBasedTest())) {
</span><span class="cx">         m_topPadding = other.m_topPadding;
</span><span class="cx">         m_rightPadding = other.m_rightPadding;
</span><span class="cx">         m_bottomPadding = other.m_bottomPadding;
</span><span class="cx">         m_leftPadding = other.m_leftPadding;
</span><del>-        m_rectBasedTestResult = other.rectBasedTestResult();
</del><span class="cx">     } else
</span><span class="cx">         m_topPadding = m_rightPadding = m_bottomPadding = m_leftPadding = 0;
</span><ins>+
+    m_rectBasedTestResult = adoptPtr(other.m_rectBasedTestResult ? new NodeSet(*other.m_rectBasedTestResult) : 0);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> HitTestResult::~HitTestResult()
</span><span class="lines">@@ -120,16 +121,17 @@
</span><span class="cx">     m_innerURLElement = other.URLElement();
</span><span class="cx">     m_scrollbar = other.scrollbar();
</span><span class="cx">     m_isOverWidget = other.isOverWidget();
</span><del>-    // Only copy the padding and ListHashSet in case of rect hit test.
</del><ins>+    // Only copy the padding and NodeSet in case of rect hit test.
</ins><span class="cx">     // Copying the later is rather expensive.
</span><span class="cx">     if ((m_isRectBased = other.isRectBasedTest())) {
</span><span class="cx">         m_topPadding = other.m_topPadding;
</span><span class="cx">         m_rightPadding = other.m_rightPadding;
</span><span class="cx">         m_bottomPadding = other.m_bottomPadding;
</span><span class="cx">         m_leftPadding = other.m_leftPadding;
</span><del>-        m_rectBasedTestResult = other.rectBasedTestResult();
</del><span class="cx">     } else
</span><span class="cx">         m_topPadding = m_rightPadding = m_bottomPadding = m_leftPadding = 0;
</span><ins>+
+    m_rectBasedTestResult = adoptPtr(other.m_rectBasedTestResult ? new NodeSet(*other.m_rectBasedTestResult) : 0);
</ins><span class="cx">     return *this;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -540,7 +542,7 @@
</span><span class="cx">         return true;
</span><span class="cx"> 
</span><span class="cx">     node = node->shadowAncestorNode();
</span><del>-    m_rectBasedTestResult.add(node);
</del><ins>+    mutableRectBasedTestResult().add(node);
</ins><span class="cx"> 
</span><span class="cx">     return !rect.contains(rectForPoint(x, y));
</span><span class="cx"> }
</span><span class="lines">@@ -557,7 +559,7 @@
</span><span class="cx">         return true;
</span><span class="cx"> 
</span><span class="cx">     node = node->shadowAncestorNode();
</span><del>-    m_rectBasedTestResult.add(node);
</del><ins>+    mutableRectBasedTestResult().add(node);
</ins><span class="cx"> 
</span><span class="cx">     return !rect.contains(rectForPoint(x, y));
</span><span class="cx"> }
</span><span class="lines">@@ -575,10 +577,11 @@
</span><span class="cx">         m_isOverWidget = other.isOverWidget();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    const ListHashSet<RefPtr<Node> >& list = other.rectBasedTestResult();
-    ListHashSet<RefPtr<Node> >::const_iterator last = list.end();
-    for (ListHashSet<RefPtr<Node> >::const_iterator it = list.begin(); it != last; ++it)
-        m_rectBasedTestResult.add(it->get());
</del><ins>+    if (other.m_rectBasedTestResult) {
+        NodeSet& set = mutableRectBasedTestResult();
+        for (NodeSet::const_iterator it = other.m_rectBasedTestResult->begin(), last = other.m_rectBasedTestResult->end(); it != last; ++it)
+            set.add(it->get());
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> IntRect HitTestResult::rectForPoint(const IntPoint& point, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding)
</span><span class="lines">@@ -593,4 +596,18 @@
</span><span class="cx">     return IntRect(actualPoint, actualPadding);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+const HitTestResult::NodeSet& HitTestResult::rectBasedTestResult() const
+{
+    if (!m_rectBasedTestResult)
+        m_rectBasedTestResult = adoptPtr(new NodeSet);
+    return *m_rectBasedTestResult;
+}
+
+HitTestResult::NodeSet& HitTestResult::mutableRectBasedTestResult()
+{
+    if (!m_rectBasedTestResult)
+        m_rectBasedTestResult = adoptPtr(new NodeSet);
+    return *m_rectBasedTestResult;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.h (82339 => 82340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.h   2011-03-29 22:45:58 UTC (rev 82339)
+++ trunk/Source/WebCore/rendering/HitTestResult.h      2011-03-29 22:46:53 UTC (rev 82340)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "TextDirection.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><ins>+#include <wtf/OwnPtr.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -44,6 +45,8 @@
</span><span class="cx"> 
</span><span class="cx"> class HitTestResult {
</span><span class="cx"> public:
</span><ins>+    typedef ListHashSet<RefPtr<Node> > NodeSet;
+
</ins><span class="cx">     HitTestResult();
</span><span class="cx">     HitTestResult(const IntPoint&);
</span><span class="cx">     // Pass non-negative padding values to perform a rect-based hit test.
</span><span class="lines">@@ -112,10 +115,15 @@
</span><span class="cx">     // enclosed by the boundaries of a node.
</span><span class="cx">     bool addNodeToRectBasedTestResult(Node*, int x, int y, const IntRect& = IntRect());
</span><span class="cx">     bool addNodeToRectBasedTestResult(Node*, int x, int y, const FloatRect&);
</span><del>-    const ListHashSet<RefPtr<Node> >& rectBasedTestResult() const { return m_rectBasedTestResult; }
</del><span class="cx">     void append(const HitTestResult&);
</span><span class="cx"> 
</span><ins>+    // If m_rectBasedTestResult is 0 then set it to a new NodeSet. Return *m_rectBasedTestResult. Lazy allocation makes
+    // sense because the NodeSet is seldom necessary, and it's somewhat expensive to allocate and initialize. This method does
+    // the same thing as mutableRectBasedTestResult(), but here the return value is const.
+    const NodeSet& rectBasedTestResult() const;
+
</ins><span class="cx"> private:
</span><ins>+    NodeSet& mutableRectBasedTestResult(); // See above.
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx">     HTMLMediaElement* mediaElement() const;
</span><span class="lines">@@ -134,7 +142,7 @@
</span><span class="cx">     int m_rightPadding;
</span><span class="cx">     int m_bottomPadding;
</span><span class="cx">     int m_leftPadding;
</span><del>-    ListHashSet<RefPtr<Node> > m_rectBasedTestResult;
</del><ins>+    mutable OwnPtr<NodeSet> m_rectBasedTestResult;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> inline IntRect HitTestResult::rectForPoint(int x, int y) const
</span></span></pre>
</div>
</div>

</body>
</html>