<!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>[164854] 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/164854">164854</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-27 21:54:09 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unify the three call sites of SelectorQueryCache
https://bugs.webkit.org/show_bug.cgi?id=129249
Reviewed by Andreas Kling.
The three call sites of SelectorQueryCache were doing the exact same thing.
That code is mvoed to a new function Document::selectorQueryForString().
Also use String instead of AtomicString for querySelector() and querySelectorAll().
This prevent the call sites from creating AtomicString just for the time of the call.
This causes a tiny slow down on microbenchmarks that continuously query the same string
but has no negative impact on realistic/good test cases (and the bindings are simplified).
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::querySelector):
(WebCore::ContainerNode::querySelectorAll):
* dom/ContainerNode.h:
* dom/Document.cpp:
(WebCore::Document::selectorQueryForString):
* dom/Document.h:
* dom/Element.cpp:
(WebCore::Element::webkitMatchesSelector):
* dom/SelectorQuery.cpp:
(WebCore::SelectorQueryCache::add):
* dom/SelectorQuery.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeh">trunk/Source/WebCore/dom/ContainerNode.h</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="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomSelectorQuerycpp">trunk/Source/WebCore/dom/SelectorQuery.cpp</a></li>
<li><a href="#trunkSourceWebCoredomSelectorQueryh">trunk/Source/WebCore/dom/SelectorQuery.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164853 => 164854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-28 05:53:29 UTC (rev 164853)
+++ trunk/Source/WebCore/ChangeLog 2014-02-28 05:54:09 UTC (rev 164854)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-02-27 Benjamin Poulain <benjamin@webkit.org>
+
+ Unify the three call sites of SelectorQueryCache
+ https://bugs.webkit.org/show_bug.cgi?id=129249
+
+ Reviewed by Andreas Kling.
+
+ The three call sites of SelectorQueryCache were doing the exact same thing.
+ That code is mvoed to a new function Document::selectorQueryForString().
+
+ Also use String instead of AtomicString for querySelector() and querySelectorAll().
+ This prevent the call sites from creating AtomicString just for the time of the call.
+ This causes a tiny slow down on microbenchmarks that continuously query the same string
+ but has no negative impact on realistic/good test cases (and the bindings are simplified).
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::querySelector):
+ (WebCore::ContainerNode::querySelectorAll):
+ * dom/ContainerNode.h:
+ * dom/Document.cpp:
+ (WebCore::Document::selectorQueryForString):
+ * dom/Document.h:
+ * dom/Element.cpp:
+ (WebCore::Element::webkitMatchesSelector):
+ * dom/SelectorQuery.cpp:
+ (WebCore::SelectorQueryCache::add):
+ * dom/SelectorQuery.h:
+
</ins><span class="cx"> 2014-02-27 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> JSC ignores the extra memory cost of HTMLCollection after a major GC
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (164853 => 164854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-02-28 05:53:29 UTC (rev 164853)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-02-28 05:54:09 UTC (rev 164854)
</span><span class="lines">@@ -1071,30 +1071,18 @@
</span><span class="cx"> setAttributeEventListener(eventType, JSLazyEventListener::createForNode(*this, attributeName, attributeValue));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Element* ContainerNode::querySelector(const AtomicString& selectors, ExceptionCode& ec)
</del><ins>+Element* ContainerNode::querySelector(const String& selectors, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (selectors.isEmpty()) {
- ec = SYNTAX_ERR;
- return nullptr;
- }
-
- SelectorQuery* selectorQuery = document().selectorQueryCache().add(selectors, document(), ec);
- if (!selectorQuery)
- return nullptr;
- return selectorQuery->queryFirst(*this);
</del><ins>+ if (SelectorQuery* selectorQuery = document().selectorQueryForString(selectors, ec))
+ return selectorQuery->queryFirst(*this);
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<NodeList> ContainerNode::querySelectorAll(const AtomicString& selectors, ExceptionCode& ec)
</del><ins>+RefPtr<NodeList> ContainerNode::querySelectorAll(const String& selectors, ExceptionCode& ec)
</ins><span class="cx"> {
</span><del>- if (selectors.isEmpty()) {
- ec = SYNTAX_ERR;
- return nullptr;
- }
-
- SelectorQuery* selectorQuery = document().selectorQueryCache().add(selectors, document(), ec);
- if (!selectorQuery)
- return nullptr;
- return selectorQuery->queryAll(*this);
</del><ins>+ if (SelectorQuery* selectorQuery = document().selectorQueryForString(selectors, ec))
+ return selectorQuery->queryAll(*this);
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<NodeList> ContainerNode::getElementsByTagName(const AtomicString& localName)
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.h (164853 => 164854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.h 2014-02-28 05:53:29 UTC (rev 164853)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2014-02-28 05:54:09 UTC (rev 164854)
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx">
</span><span class="cx"> RenderElement* renderer() const;
</span><span class="cx">
</span><del>- Element* querySelector(const AtomicString& selectors, ExceptionCode&);
- RefPtr<NodeList> querySelectorAll(const AtomicString& selectors, ExceptionCode&);
</del><ins>+ Element* querySelector(const String& selectors, ExceptionCode&);
+ RefPtr<NodeList> querySelectorAll(const String& selectors, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<NodeList> getElementsByTagName(const AtomicString&);
</span><span class="cx"> PassRefPtr<NodeList> getElementsByTagNameNS(const AtomicString& namespaceURI, const AtomicString& localName);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (164853 => 164854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-02-28 05:53:29 UTC (rev 164853)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-02-28 05:54:09 UTC (rev 164854)
</span><span class="lines">@@ -752,11 +752,16 @@
</span><span class="cx"> return m_imagesByUsemap.getElementByLowercasedUsemap(name, *this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SelectorQueryCache& Document::selectorQueryCache()
</del><ins>+SelectorQuery* Document::selectorQueryForString(const String& selectorString, ExceptionCode& ec)
</ins><span class="cx"> {
</span><ins>+ if (selectorString.isEmpty()) {
+ ec = SYNTAX_ERR;
+ return nullptr;
+ }
+
</ins><span class="cx"> if (!m_selectorQueryCache)
</span><span class="cx"> m_selectorQueryCache = std::make_unique<SelectorQueryCache>();
</span><del>- return *m_selectorQueryCache;
</del><ins>+ return m_selectorQueryCache->add(selectorString, *this, ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaQueryMatcher& Document::mediaQueryMatcher()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (164853 => 164854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-02-28 05:53:29 UTC (rev 164853)
+++ trunk/Source/WebCore/dom/Document.h 2014-02-28 05:54:09 UTC (rev 164854)
</span><span class="lines">@@ -137,6 +137,7 @@
</span><span class="cx"> class ScriptElementData;
</span><span class="cx"> class ScriptRunner;
</span><span class="cx"> class SecurityOrigin;
</span><ins>+class SelectorQuery;
</ins><span class="cx"> class SelectorQueryCache;
</span><span class="cx"> class SerializedScriptValue;
</span><span class="cx"> class SegmentedString;
</span><span class="lines">@@ -306,7 +307,7 @@
</span><span class="cx"> void removeImageElementByLowercasedUsemap(const AtomicStringImpl&, HTMLImageElement&);
</span><span class="cx"> HTMLImageElement* imageElementByLowercasedUsemap(const AtomicStringImpl&) const;
</span><span class="cx">
</span><del>- SelectorQueryCache& selectorQueryCache();
</del><ins>+ SelectorQuery* selectorQueryForString(const String&, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> // DOM methods & attributes for Document
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (164853 => 164854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-02-28 05:53:29 UTC (rev 164853)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-02-28 05:54:09 UTC (rev 164854)
</span><span class="lines">@@ -2365,12 +2365,7 @@
</span><span class="cx">
</span><span class="cx"> bool Element::webkitMatchesSelector(const String& selector, ExceptionCode& ec)
</span><span class="cx"> {
</span><del>- if (selector.isEmpty()) {
- ec = SYNTAX_ERR;
- return false;
- }
-
- SelectorQuery* selectorQuery = document().selectorQueryCache().add(selector, document(), ec);
</del><ins>+ SelectorQuery* selectorQuery = document().selectorQueryForString(selector, ec);
</ins><span class="cx"> return selectorQuery && selectorQuery->matches(*this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomSelectorQuerycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SelectorQuery.cpp (164853 => 164854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SelectorQuery.cpp 2014-02-28 05:53:29 UTC (rev 164853)
+++ trunk/Source/WebCore/dom/SelectorQuery.cpp 2014-02-28 05:54:09 UTC (rev 164854)
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> m_selectors.initialize(m_selectorList);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SelectorQuery* SelectorQueryCache::add(const AtomicString& selectors, Document& document, ExceptionCode& ec)
</del><ins>+SelectorQuery* SelectorQueryCache::add(const String& selectors, Document& document, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> auto it = m_entries.find(selectors);
</span><span class="cx"> if (it != m_entries.end())
</span></span></pre></div>
<a id="trunkSourceWebCoredomSelectorQueryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/SelectorQuery.h (164853 => 164854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/SelectorQuery.h 2014-02-28 05:53:29 UTC (rev 164853)
+++ trunk/Source/WebCore/dom/SelectorQuery.h 2014-02-28 05:54:09 UTC (rev 164854)
</span><span class="lines">@@ -98,11 +98,11 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- SelectorQuery* add(const AtomicString&, Document&, ExceptionCode&);
</del><ins>+ SelectorQuery* add(const String&, Document&, ExceptionCode&);
</ins><span class="cx"> void invalidate();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- HashMap<AtomicString, std::unique_ptr<SelectorQuery>> m_entries;
</del><ins>+ HashMap<String, std::unique_ptr<SelectorQuery>> m_entries;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline bool SelectorQuery::matches(Element& element) const
</span></span></pre>
</div>
</div>
</body>
</html>