<!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>[161010] 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/161010">161010</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-23 12:21:28 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add id matching to the Selector Code Generator
https://bugs.webkit.org/show_bug.cgi?id=126154
Reviewed by Antti Koivisto.
Compile matching for #id selectors. IDs are Atomic String so it is just a matter
of comparing the pointers.
No attempt is made at optimizing for the double #id case because such problem
do not really happen outside tests.
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorFragment::SelectorFragment):
(WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
(WebCore::SelectorCompiler::SelectorCodeGenerator::compile):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementDataMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasId):
* dom/Element.h:
(WebCore::Element::elementDataMemoryOffset):
* dom/ElementData.h:
(WebCore::ElementData::idForStyleResolutionMemoryOffset):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomElementDatah">trunk/Source/WebCore/dom/ElementData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161009 => 161010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-23 19:51:38 UTC (rev 161009)
+++ trunk/Source/WebCore/ChangeLog 2013-12-23 20:21:28 UTC (rev 161010)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2013-12-23 Benjamin Poulain <benjamin@webkit.org>
+
+ Add id matching to the Selector Code Generator
+ https://bugs.webkit.org/show_bug.cgi?id=126154
+
+ Reviewed by Antti Koivisto.
+
+ Compile matching for #id selectors. IDs are Atomic String so it is just a matter
+ of comparing the pointers.
+
+ No attempt is made at optimizing for the double #id case because such problem
+ do not really happen outside tests.
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorFragment::SelectorFragment):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::compile):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatching):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementDataMatching):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasId):
+ * dom/Element.h:
+ (WebCore::Element::elementDataMemoryOffset):
+ * dom/ElementData.h:
+ (WebCore::ElementData::idForStyleResolutionMemoryOffset):
+
</ins><span class="cx"> 2013-12-23 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Update custom setter implementations to perform type checks
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (161009 => 161010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2013-12-23 19:51:38 UTC (rev 161009)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2013-12-23 20:21:28 UTC (rev 161010)
</span><span class="lines">@@ -87,7 +87,8 @@
</span><span class="cx"> : traversalBacktrackingAction(BacktrackingAction::NoBacktracking)
</span><span class="cx"> , matchingBacktrackingAction(BacktrackingAction::NoBacktracking)
</span><span class="cx"> , backtrackingFlags(0)
</span><del>- , tagName(0)
</del><ins>+ , tagName(nullptr)
+ , id(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> FragmentRelation relationToLeftFragment;
</span><span class="lines">@@ -98,6 +99,7 @@
</span><span class="cx"> unsigned char backtrackingFlags;
</span><span class="cx">
</span><span class="cx"> const QualifiedName* tagName;
</span><ins>+ const AtomicString* id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef JSC::MacroAssembler Assembler;
</span><span class="lines">@@ -133,7 +135,9 @@
</span><span class="cx">
</span><span class="cx"> // Element properties matchers.
</span><span class="cx"> void generateElementMatching(Assembler::JumpList& failureCases, const SelectorFragment&);
</span><ins>+ void generateElementDataMatching(Assembler::JumpList& failureCases, const SelectorFragment&);
</ins><span class="cx"> void generateElementHasTagName(Assembler::JumpList& failureCases, const QualifiedName& nameToMatch);
</span><ins>+ void generateElementHasId(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const AtomicString& idToMatch);
</ins><span class="cx">
</span><span class="cx"> Assembler m_assembler;
</span><span class="cx"> RegisterAllocator m_registerAllocator;
</span><span class="lines">@@ -142,6 +146,7 @@
</span><span class="cx">
</span><span class="cx"> FunctionType m_functionType;
</span><span class="cx"> Vector<SelectorFragment, 8> m_selectorFragments;
</span><ins>+ bool m_selectorCannotMatchAnything;
</ins><span class="cx">
</span><span class="cx"> StackAllocator::StackReference m_checkingContextStackReference;
</span><span class="cx">
</span><span class="lines">@@ -189,6 +194,7 @@
</span><span class="cx"> inline SelectorCodeGenerator::SelectorCodeGenerator(const CSSSelector* rootSelector)
</span><span class="cx"> : m_stackAllocator(m_assembler)
</span><span class="cx"> , m_functionType(FunctionType::SimpleSelectorChecker)
</span><ins>+ , m_selectorCannotMatchAnything(false)
</ins><span class="cx"> #if CSS_SELECTOR_JIT_DEBUGGING
</span><span class="cx"> , m_originalSelector(rootSelector)
</span><span class="cx"> #endif
</span><span class="lines">@@ -205,8 +211,16 @@
</span><span class="cx"> ASSERT(!fragment.tagName);
</span><span class="cx"> fragment.tagName = &(selector->tagQName());
</span><span class="cx"> break;
</span><ins>+ case CSSSelector::Id: {
+ const AtomicString& id = selector->value();
+ if (fragment.id) {
+ if (id != *fragment.id)
+ goto InconsistentSelector;
+ } else
+ fragment.id = &(selector->value());
+ break;
+ }
</ins><span class="cx"> case CSSSelector::Unknown:
</span><del>- case CSSSelector::Id:
</del><span class="cx"> case CSSSelector::Class:
</span><span class="cx"> case CSSSelector::Exact:
</span><span class="cx"> case CSSSelector::Set:
</span><span class="lines">@@ -242,14 +256,16 @@
</span><span class="cx"> computeBacktrackingInformation();
</span><span class="cx">
</span><span class="cx"> return;
</span><del>-
</del><ins>+InconsistentSelector:
+ m_functionType = FunctionType::SimpleSelectorChecker;
+ m_selectorCannotMatchAnything = true;
</ins><span class="cx"> CannotHandleSelector:
</span><span class="cx"> m_selectorFragments.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline SelectorCompilationStatus SelectorCodeGenerator::compile(JSC::VM* vm, JSC::MacroAssemblerCodeRef& codeRef)
</span><span class="cx"> {
</span><del>- if (m_selectorFragments.isEmpty())
</del><ins>+ if (m_selectorFragments.isEmpty() && !m_selectorCannotMatchAnything)
</ins><span class="cx"> return SelectorCompilationStatus::CannotCompile;
</span><span class="cx">
</span><span class="cx"> m_registerAllocator.allocateRegister(elementAddressRegister);
</span><span class="lines">@@ -284,12 +300,14 @@
</span><span class="cx"> m_registerAllocator.deallocateRegister(elementAddressRegister);
</span><span class="cx">
</span><span class="cx"> if (m_functionType == FunctionType::SimpleSelectorChecker) {
</span><del>- // Success.
- m_assembler.move(Assembler::TrustedImm32(1), returnRegister);
- m_assembler.ret();
</del><ins>+ if (!m_selectorCannotMatchAnything) {
+ // Success.
+ m_assembler.move(Assembler::TrustedImm32(1), returnRegister);
+ m_assembler.ret();
+ }
</ins><span class="cx">
</span><span class="cx"> // Failure.
</span><del>- if (!failureCases.empty()) {
</del><ins>+ if (m_selectorCannotMatchAnything || !failureCases.empty()) {
</ins><span class="cx"> failureCases.link(&m_assembler);
</span><span class="cx"> m_assembler.move(Assembler::TrustedImm32(0), returnRegister);
</span><span class="cx"> m_assembler.ret();
</span><span class="lines">@@ -724,8 +742,25 @@
</span><span class="cx"> {
</span><span class="cx"> if (fragment.tagName)
</span><span class="cx"> generateElementHasTagName(failureCases, *(fragment.tagName));
</span><ins>+ generateElementDataMatching(failureCases, fragment);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void SelectorCodeGenerator::generateElementDataMatching(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
+{
+ if (!fragment.id)
+ return;
+
+ // Generate:
+ // elementDataAddress = element->elementData();
+ // if (!elementDataAddress)
+ // failure!
+ LocalRegister elementDataAddress(m_registerAllocator);
+ m_assembler.loadPtr(Assembler::Address(elementAddressRegister, Element::elementDataMemoryOffset()), elementDataAddress);
+ failureCases.append(m_assembler.branchTestPtr(Assembler::Zero, elementDataAddress));
+
+ generateElementHasId(failureCases, elementDataAddress, *fragment.id);
+}
+
</ins><span class="cx"> inline void SelectorCodeGenerator::generateElementHasTagName(Assembler::JumpList& failureCases, const QualifiedName& nameToMatch)
</span><span class="cx"> {
</span><span class="cx"> if (nameToMatch == anyQName())
</span><span class="lines">@@ -752,6 +787,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SelectorCodeGenerator::generateElementHasId(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const AtomicString& idToMatch)
+{
+ // Compare the pointers of the AtomicStringImpl from idForStyleResolution with the reference idToMatch.
+ LocalRegister idToMatchRegister(m_registerAllocator);
+ m_assembler.move(Assembler::TrustedImmPtr(idToMatch.impl()), idToMatchRegister);
+ failureCases.append(m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(elementDataAddress, ElementData::idForStyleResolutionMemoryOffset()), idToMatchRegister));
+}
+
</ins><span class="cx"> }; // namespace SelectorCompiler.
</span><span class="cx"> }; // namespace WebCore.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (161009 => 161010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2013-12-23 19:51:38 UTC (rev 161009)
+++ trunk/Source/WebCore/dom/Element.h 2013-12-23 20:21:28 UTC (rev 161010)
</span><span class="lines">@@ -293,6 +293,7 @@
</span><span class="cx"> void stripScriptingAttributes(Vector<Attribute>&) const;
</span><span class="cx">
</span><span class="cx"> const ElementData* elementData() const { return m_elementData.get(); }
</span><ins>+ static ptrdiff_t elementDataMemoryOffset() { return OBJECT_OFFSETOF(Element, m_elementData); }
</ins><span class="cx"> UniqueElementData& ensureUniqueElementData();
</span><span class="cx">
</span><span class="cx"> void synchronizeAllAttributes() const;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementData.h (161009 => 161010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementData.h 2013-12-23 19:51:38 UTC (rev 161009)
+++ trunk/Source/WebCore/dom/ElementData.h 2013-12-23 20:21:28 UTC (rev 161010)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> const SpaceSplitString& classNames() const { return m_classNames; }
</span><span class="cx">
</span><span class="cx"> const AtomicString& idForStyleResolution() const { return m_idForStyleResolution; }
</span><ins>+ static ptrdiff_t idForStyleResolutionMemoryOffset() { return OBJECT_OFFSETOF(ElementData, m_idForStyleResolution); }
</ins><span class="cx"> void setIdForStyleResolution(const AtomicString& newId) const { m_idForStyleResolution = newId; }
</span><span class="cx">
</span><span class="cx"> const StyleProperties* inlineStyle() const { return m_inlineStyle.get(); }
</span></span></pre>
</div>
</div>
</body>
</html>