<!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>[161917] 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/161917">161917</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-13 16:27:49 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the Selector Code Generator for resolving style
https://bugs.webkit.org/show_bug.cgi?id=126199
Reviewed by Ryosuke Niwa.
* css/ElementRuleCollector.cpp:
(WebCore::ElementRuleCollector::ruleMatches):
* css/RuleSet.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorcpp">trunk/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssRuleSeth">trunk/Source/WebCore/css/RuleSet.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161916 => 161917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-14 00:14:23 UTC (rev 161916)
+++ trunk/Source/WebCore/ChangeLog 2014-01-14 00:27:49 UTC (rev 161917)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-01-13 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><ins>+ Use the Selector Code Generator for resolving style
+ https://bugs.webkit.org/show_bug.cgi?id=126199
+
+ Reviewed by Ryosuke Niwa.
+
+ * css/ElementRuleCollector.cpp:
+ (WebCore::ElementRuleCollector::ruleMatches):
+ * css/RuleSet.h:
+
+2014-01-13 Benjamin Poulain <benjamin@webkit.org>
+
</ins><span class="cx"> Update the SelectorQuery code using compiled selector after r161196
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126860
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (161916 => 161917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2014-01-14 00:14:23 UTC (rev 161916)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2014-01-14 00:27:49 UTC (rev 161917)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include "RenderRegion.h"
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "SelectorCheckerFastPath.h"
</span><ins>+#include "SelectorCompiler.h"
</ins><span class="cx"> #include "StyleProperties.h"
</span><span class="cx"> #include "StyledElement.h"
</span><span class="cx">
</span><span class="lines">@@ -292,7 +293,8 @@
</span><span class="cx"> {
</span><span class="cx"> const StyleResolver::State& state = m_state;
</span><span class="cx">
</span><del>- if (ruleData.hasFastCheckableSelector()) {
</del><ins>+ bool fastCheckableSelector = ruleData.hasFastCheckableSelector();
+ if (fastCheckableSelector) {
</ins><span class="cx"> // We know this selector does not include any pseudo elements.
</span><span class="cx"> if (m_pseudoStyleRequest.pseudoId != NOPSEUDO)
</span><span class="cx"> return false;
</span><span class="lines">@@ -302,6 +304,38 @@
</span><span class="cx"> if (!ruleData.hasMultipartSelector())
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+ }
+
+#if ENABLE(CSS_SELECTOR_JIT)
+ void* compiledSelectorChecker = ruleData.compiledSelectorCodeRef().code().executableAddress();
+ if (!compiledSelectorChecker && ruleData.compilationStatus() == SelectorCompilationStatus::NotCompiled) {
+ JSC::VM* vm = document().scriptExecutionContext()->vm();
+ SelectorCompilationStatus compilationStatus;
+ JSC::MacroAssemblerCodeRef compiledSelectorCodeRef;
+ compilationStatus = SelectorCompiler::compileSelector(ruleData.selector(), vm, compiledSelectorCodeRef);
+
+ ruleData.setCompiledSelector(compilationStatus, compiledSelectorCodeRef);
+ compiledSelectorChecker = ruleData.compiledSelectorCodeRef().code().executableAddress();
+ }
+ if (compiledSelectorChecker) {
+ if (m_pseudoStyleRequest.pseudoId != NOPSEUDO)
+ return false;
+
+ if (ruleData.compilationStatus() == SelectorCompilationStatus::SimpleSelectorChecker) {
+ SelectorCompiler::SimpleSelectorChecker selectorChecker = SelectorCompiler::simpleSelectorCheckerFunction(compiledSelectorChecker, ruleData.compilationStatus());
+ return selectorChecker(state.element());
+ }
+ ASSERT(ruleData.compilationStatus() == SelectorCompilationStatus::SelectorCheckerWithCheckingContext);
+
+ SelectorCompiler::SelectorCheckerWithCheckingContext selectorChecker = SelectorCompiler::selectorCheckerFunctionWithCheckingContext(compiledSelectorChecker, ruleData.compilationStatus());
+ SelectorCompiler::CheckingContext context;
+ context.elementStyle = state.style();
+ context.resolvingMode = m_mode;
+ return selectorChecker(state.element(), &context);
+ }
+#endif // ENABLE(CSS_SELECTOR_JIT)
+
+ if (fastCheckableSelector) {
</ins><span class="cx"> if (ruleData.selector()->m_match == CSSSelector::Tag && !SelectorChecker::tagMatches(state.element(), ruleData.selector()->tagQName()))
</span><span class="cx"> return false;
</span><span class="cx"> SelectorCheckerFastPath selectorCheckerFastPath(ruleData.selector(), state.element());
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.h (161916 => 161917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.h 2014-01-14 00:14:23 UTC (rev 161916)
+++ trunk/Source/WebCore/css/RuleSet.h 2014-01-14 00:27:49 UTC (rev 161917)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #define RuleSet_h
</span><span class="cx">
</span><span class="cx"> #include "RuleFeature.h"
</span><ins>+#include "SelectorCompiler.h"
</ins><span class="cx"> #include "StyleRule.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -76,6 +77,16 @@
</span><span class="cx"> static const unsigned maximumIdentifierCount = 4;
</span><span class="cx"> const unsigned* descendantSelectorIdentifierHashes() const { return m_descendantSelectorIdentifierHashes; }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SELECTOR_JIT)
+ SelectorCompilationStatus compilationStatus() const { return m_compilationStatus; }
+ JSC::MacroAssemblerCodeRef compiledSelectorCodeRef() const { return m_compiledSelectorCodeRef; }
+ void setCompiledSelector(SelectorCompilationStatus status, JSC::MacroAssemblerCodeRef codeRef) const
+ {
+ m_compilationStatus = status;
+ m_compiledSelectorCodeRef = codeRef;
+ }
+#endif // ENABLE(CSS_SELECTOR_JIT)
+
</ins><span class="cx"> private:
</span><span class="cx"> StyleRule* m_rule;
</span><span class="cx"> unsigned m_selectorIndex : 13;
</span><span class="lines">@@ -92,9 +103,19 @@
</span><span class="cx"> unsigned m_propertyWhitelistType : 2;
</span><span class="cx"> // Use plain array instead of a Vector to minimize memory overhead.
</span><span class="cx"> unsigned m_descendantSelectorIdentifierHashes[maximumIdentifierCount];
</span><ins>+#if ENABLE(CSS_SELECTOR_JIT)
+ mutable SelectorCompilationStatus m_compilationStatus;
+ mutable JSC::MacroAssemblerCodeRef m_compiledSelectorCodeRef;
+#endif // ENABLE(CSS_SELECTOR_JIT)
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct SameSizeAsRuleData {
</span><ins>+#if ENABLE(CSS_SELECTOR_JIT)
+ unsigned compilationStatus;
+ void* compiledSelectorPointer;
+ void* codeRefPtr;
+#endif // ENABLE(CSS_SELECTOR_JIT)
+
</ins><span class="cx"> void* a;
</span><span class="cx"> unsigned b;
</span><span class="cx"> unsigned c;
</span></span></pre>
</div>
</div>
</body>
</html>