<!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>[161041] 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/161041">161041</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-23 17:22:49 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add the pseudo class :focus to the Selector Code Generator
https://bugs.webkit.org/show_bug.cgi?id=126189
Reviewed by Ryosuke Niwa.
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::addPseudoType):
(WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsFocused):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161040 => 161041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-24 01:17:07 UTC (rev 161040)
+++ trunk/Source/WebCore/ChangeLog 2013-12-24 01:22:49 UTC (rev 161041)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-23 Benjamin Poulain <benjamin@webkit.org>
+
+ Add the pseudo class :focus to the Selector Code Generator
+ https://bugs.webkit.org/show_bug.cgi?id=126189
+
+ Reviewed by Ryosuke Niwa.
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::addPseudoType):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::SelectorCodeGenerator):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementMatching):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsFocused):
+
</ins><span class="cx"> 2013-12-23 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove boolean argument from Element::setChildrenAffectBy* methods
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (161040 => 161041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2013-12-24 01:17:07 UTC (rev 161040)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2013-12-24 01:22:49 UTC (rev 161041)
</span><span class="lines">@@ -79,7 +79,8 @@
</span><span class="cx">
</span><span class="cx"> enum class FunctionType {
</span><span class="cx"> SimpleSelectorChecker,
</span><del>- SelectorCheckerWithCheckingContext
</del><ins>+ SelectorCheckerWithCheckingContext,
+ CannotCompile
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct SelectorFragment {
</span><span class="lines">@@ -101,6 +102,7 @@
</span><span class="cx"> const QualifiedName* tagName;
</span><span class="cx"> const AtomicString* id;
</span><span class="cx"> Vector<const AtomicStringImpl*, 1> classNames;
</span><ins>+ HashSet<unsigned> pseudoClasses;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef JSC::MacroAssembler Assembler;
</span><span class="lines">@@ -140,6 +142,7 @@
</span><span class="cx"> void generateElementHasTagName(Assembler::JumpList& failureCases, const QualifiedName& nameToMatch);
</span><span class="cx"> void generateElementHasId(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const AtomicString& idToMatch);
</span><span class="cx"> void generateElementHasClasses(Assembler::JumpList& failureCases, const LocalRegister& elementDataAddress, const Vector<const AtomicStringImpl*>& classNames);
</span><ins>+ void generateElementIsFocused(Assembler::JumpList& failureCases);
</ins><span class="cx">
</span><span class="cx"> Assembler m_assembler;
</span><span class="cx"> RegisterAllocator m_registerAllocator;
</span><span class="lines">@@ -193,6 +196,23 @@
</span><span class="cx"> return FragmentRelation::Descendant;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline FunctionType mostRestrictiveFunctionType(FunctionType a, FunctionType b)
+{
+ return std::max(a, b);
+}
+
+static inline FunctionType addPseudoType(CSSSelector::PseudoType type, HashSet<unsigned>& pseudoClasses)
+{
+ switch (type) {
+ case CSSSelector::PseudoFocus:
+ pseudoClasses.add(CSSSelector::PseudoFocus);
+ return FunctionType::SimpleSelectorChecker;
+ default:
+ break;
+ }
+ return FunctionType::CannotCompile;
+}
+
</ins><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><span class="lines">@@ -225,12 +245,16 @@
</span><span class="cx"> case CSSSelector::Class:
</span><span class="cx"> fragment.classNames.append(selector->value().impl());
</span><span class="cx"> break;
</span><ins>+ case CSSSelector::PseudoClass:
+ m_functionType = mostRestrictiveFunctionType(m_functionType, addPseudoType(selector->pseudoType(), fragment.pseudoClasses));
+ if (m_functionType == FunctionType::CannotCompile)
+ goto CannotHandleSelector;
+ break;
</ins><span class="cx"> case CSSSelector::Unknown:
</span><span class="cx"> case CSSSelector::Exact:
</span><span class="cx"> case CSSSelector::Set:
</span><span class="cx"> case CSSSelector::List:
</span><span class="cx"> case CSSSelector::Hyphen:
</span><del>- case CSSSelector::PseudoClass:
</del><span class="cx"> case CSSSelector::PseudoElement:
</span><span class="cx"> case CSSSelector::Contain:
</span><span class="cx"> case CSSSelector::Begin:
</span><span class="lines">@@ -746,6 +770,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (fragment.tagName)
</span><span class="cx"> generateElementHasTagName(failureCases, *(fragment.tagName));
</span><ins>+
+ if (fragment.pseudoClasses.contains(CSSSelector::PseudoFocus))
+ generateElementIsFocused(failureCases);
+
</ins><span class="cx"> generateElementDataMatching(failureCases, fragment);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -837,6 +865,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SelectorCodeGenerator::generateElementIsFocused(Assembler::JumpList& failureCases)
+{
+ Assembler::RegisterID elementAddress = elementAddressRegister;
+ FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);
+ functionCall.setFunctionAddress(SelectorChecker::matchesFocusPseudoClass);
+ functionCall.setFirstArgument(elementAddress);
+ failureCases.append(functionCall.callAndBranchOnCondition(Assembler::Zero));
+}
+
</ins><span class="cx"> }; // namespace SelectorCompiler.
</span><span class="cx"> }; // namespace WebCore.
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>