<!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>[167574] 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/167574">167574</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-20 14:28:51 -0700 (Sun, 20 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Compile the pseudo class :target
https://bugs.webkit.org/show_bug.cgi?id=131904
Reviewed by Andreas Kling.
The pseudo class :target is trivial, it just compare the current element with
Document::cssTarget().
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::addPseudoType):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatching):
(WebCore::SelectorCompiler::getDocument):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueExactMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsTarget):
* dom/Document.h:
(WebCore::Document::cssTargetMemoryOffset):</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="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167573 => 167574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-20 20:54:17 UTC (rev 167573)
+++ trunk/Source/WebCore/ChangeLog 2014-04-20 21:28:51 UTC (rev 167574)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-04-20 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><ins>+ Compile the pseudo class :target
+ https://bugs.webkit.org/show_bug.cgi?id=131904
+
+ Reviewed by Andreas Kling.
+
+ The pseudo class :target is trivial, it just compare the current element with
+ Document::cssTarget().
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::addPseudoType):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatching):
+ (WebCore::SelectorCompiler::getDocument):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueExactMatching):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsTarget):
+ * dom/Document.h:
+ (WebCore::Document::cssTargetMemoryOffset):
+
+2014-04-20 Benjamin Poulain <benjamin@webkit.org>
+
</ins><span class="cx"> Rename the CSSSelector PseudoType to PseudoClassType
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131907
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (167573 => 167574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-04-20 20:54:17 UTC (rev 167573)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-04-20 21:28:51 UTC (rev 167574)
</span><span class="lines">@@ -190,6 +190,7 @@
</span><span class="cx"> void generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*>& classNames);
</span><span class="cx"> void generateElementIsLink(Assembler::JumpList& failureCases);
</span><span class="cx"> void generateElementIsNthChild(Assembler::JumpList& failureCases, const SelectorFragment&);
</span><ins>+ void generateElementIsTarget(Assembler::JumpList& failureCases);
</ins><span class="cx">
</span><span class="cx"> // Helpers.
</span><span class="cx"> Assembler::Jump jumpIfNotResolvingStyle(Assembler::RegisterID checkingContextRegister);
</span><span class="lines">@@ -318,6 +319,7 @@
</span><span class="cx"> return FunctionType::SimpleSelectorChecker;
</span><span class="cx">
</span><span class="cx"> case CSSSelector::PseudoClassLink:
</span><ins>+ case CSSSelector::PseudoClassTarget:
</ins><span class="cx"> fragment.pseudoClasses.add(type);
</span><span class="cx"> return FunctionType::SimpleSelectorChecker;
</span><span class="cx">
</span><span class="lines">@@ -1166,6 +1168,9 @@
</span><span class="cx"> if (fragment.pseudoClasses.contains(CSSSelector::PseudoClassLink))
</span><span class="cx"> generateElementIsLink(failureCases);
</span><span class="cx">
</span><ins>+ if (fragment.pseudoClasses.contains(CSSSelector::PseudoTarget))
+ generateElementIsTarget(failureCases);
+
</ins><span class="cx"> if (fragment.tagName)
</span><span class="cx"> generateElementHasTagName(failureCases, *(fragment.tagName));
</span><span class="cx">
</span><span class="lines">@@ -1512,6 +1517,12 @@
</span><span class="cx"> return assembler.branchTest32(condition, Assembler::Address(documentAddress, Document::documentClassesMemoryOffset()), Assembler::TrustedImm32(Document::isHTMLDocumentClassFlag()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void getDocument(Assembler& assembler, Assembler::RegisterID element, Assembler::RegisterID output)
+{
+ assembler.loadPtr(Assembler::Address(element, Node::treeScopeMemoryOffset()), output);
+ assembler.loadPtr(Assembler::Address(output, TreeScope::documentScopeMemoryOffset()), output);
+}
+
</ins><span class="cx"> void SelectorCodeGenerator::generateElementAttributeValueExactMatching(Assembler::JumpList& failureCases, Assembler::RegisterID currentAttributeAddress, const AtomicString& expectedValue, bool canDefaultToCaseSensitiveValueMatch)
</span><span class="cx"> {
</span><span class="cx"> LocalRegister expectedValueRegister(m_registerAllocator);
</span><span class="lines">@@ -1528,12 +1539,9 @@
</span><span class="cx"> failureCases.append(testIsHTMLFlagOnNode(Assembler::Zero, m_assembler, elementAddressRegister));
</span><span class="cx">
</span><span class="cx"> {
</span><del>- LocalRegister scratchRegister(m_registerAllocator);
- // scratchRegister = pointer to treeScope.
- m_assembler.loadPtr(Assembler::Address(elementAddressRegister, Node::treeScopeMemoryOffset()), scratchRegister);
- // scratchRegister = pointer to document.
- m_assembler.loadPtr(Assembler::Address(scratchRegister, TreeScope::documentScopeMemoryOffset()), scratchRegister);
- failureCases.append(testIsHTMLClassOnDocument(Assembler::Zero, m_assembler, scratchRegister));
</del><ins>+ LocalRegister document(m_registerAllocator);
+ getDocument(m_assembler, elementAddressRegister, document);
+ failureCases.append(testIsHTMLClassOnDocument(Assembler::Zero, m_assembler, document));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LocalRegister valueStringImpl(m_registerAllocator);
</span><span class="lines">@@ -2035,6 +2043,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SelectorCodeGenerator::generateElementIsTarget(Assembler::JumpList& failureCases)
+{
+ LocalRegister document(m_registerAllocator);
+ getDocument(m_assembler, elementAddressRegister, document);
+ failureCases.append(m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(document, Document::cssTargetMemoryOffset()), elementAddressRegister));
+}
+
</ins><span class="cx"> }; // namespace SelectorCompiler.
</span><span class="cx"> }; // namespace WebCore.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (167573 => 167574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-04-20 20:54:17 UTC (rev 167573)
+++ trunk/Source/WebCore/dom/Document.h 2014-04-20 21:28:51 UTC (rev 167574)
</span><span class="lines">@@ -755,7 +755,8 @@
</span><span class="cx"> // Updates for :target (CSS3 selector).
</span><span class="cx"> void setCSSTarget(Element*);
</span><span class="cx"> Element* cssTarget() const { return m_cssTarget; }
</span><del>-
</del><ins>+ static ptrdiff_t cssTargetMemoryOffset() { return OBJECT_OFFSETOF(Document, m_cssTarget); }
+
</ins><span class="cx"> void scheduleForcedStyleRecalc();
</span><span class="cx"> void scheduleStyleRecalc();
</span><span class="cx"> void unscheduleStyleRecalc();
</span></span></pre>
</div>
</div>
</body>
</html>