<!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>[173910] trunk</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/173910">173910</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-24 00:56:52 -0700 (Wed, 24 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the style marking from :nth-child()
https://bugs.webkit.org/show_bug.cgi?id=137055
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-09-24
Reviewed by Andreas Kling.
Source/WebCore:
Previously, :nth-child() had to mark the RenderStyle as unique in order
to prevent it from being used for style sharing.
After <a href="http://trac.webkit.org/projects/webkit/changeset/173229">r173229</a>, :nth-child() use the more generic element marking
"StyleIsAffectedByPreviousSibling".
In StyleResolver::canShareStyleWithElement(), StyleIsAffectedByPreviousSibling
is already used to prevent style sharing of those elements, making the "Unique"
flag redundant.
Since it is now useless, remove the style marking from SelectorChecker and the CSS JIT.
Tests: fast/css/nth-child-style-sharing-even.html
fast/css/nth-child-style-sharing-fixed-integer.html
fast/css/nth-child-style-sharing-odd.html
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::checkOne):
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsNthChild):
(WebCore::SelectorCompiler::setElementChildIndexAndUpdateStyle): Deleted.
* rendering/style/RenderStyle.h:
LayoutTests:
Add basic tests for style sharing with :nth-child().
* fast/css/nth-child-style-sharing-even-expected.html: Added.
* fast/css/nth-child-style-sharing-even.html: Added.
* fast/css/nth-child-style-sharing-fixed-integer-expected.html: Added.
* fast/css/nth-child-style-sharing-fixed-integer.html: Added.
* fast/css/nth-child-style-sharing-odd-expected.html: Added.
* fast/css/nth-child-style-sharing-odd.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorecssjitSelectorCompilercpp">trunk/Source/WebCore/cssjit/SelectorCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssnthchildstylesharingevenexpectedhtml">trunk/LayoutTests/fast/css/nth-child-style-sharing-even-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssnthchildstylesharingevenhtml">trunk/LayoutTests/fast/css/nth-child-style-sharing-even.html</a></li>
<li><a href="#trunkLayoutTestsfastcssnthchildstylesharingfixedintegerexpectedhtml">trunk/LayoutTests/fast/css/nth-child-style-sharing-fixed-integer-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssnthchildstylesharingfixedintegerhtml">trunk/LayoutTests/fast/css/nth-child-style-sharing-fixed-integer.html</a></li>
<li><a href="#trunkLayoutTestsfastcssnthchildstylesharingoddexpectedhtml">trunk/LayoutTests/fast/css/nth-child-style-sharing-odd-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssnthchildstylesharingoddhtml">trunk/LayoutTests/fast/css/nth-child-style-sharing-odd.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173909 => 173910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-24 05:10:18 UTC (rev 173909)
+++ trunk/LayoutTests/ChangeLog 2014-09-24 07:56:52 UTC (rev 173910)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-09-24 Benjamin Poulain <bpoulain@apple.com>
+
+ Remove the style marking from :nth-child()
+ https://bugs.webkit.org/show_bug.cgi?id=137055
+
+ Reviewed by Andreas Kling.
+
+ Add basic tests for style sharing with :nth-child().
+
+ * fast/css/nth-child-style-sharing-even-expected.html: Added.
+ * fast/css/nth-child-style-sharing-even.html: Added.
+ * fast/css/nth-child-style-sharing-fixed-integer-expected.html: Added.
+ * fast/css/nth-child-style-sharing-fixed-integer.html: Added.
+ * fast/css/nth-child-style-sharing-odd-expected.html: Added.
+ * fast/css/nth-child-style-sharing-odd.html: Added.
+
</ins><span class="cx"> 2014-09-23 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> The style resolution cache applies properties incorrectly whenever direction != ltr
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssnthchildstylesharingevenexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/nth-child-style-sharing-even-expected.html (0 => 173910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/nth-child-style-sharing-even-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/nth-child-style-sharing-even-expected.html 2014-09-24 07:56:52 UTC (rev 173910)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<style>
+div {
+ background-color: white;
+}
+</style>
+</head>
+<body>
+ <section>
+ <p>This tests basic style sharing with :nth-child(even). If the test pass, lines with the text "green" should have a green background.</p>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ </div>
+ <div style="background-color: lime">
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ </div>
+ </section>
+
+ <section>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ </div>
+ </section>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssnthchildstylesharingevenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/nth-child-style-sharing-even.html (0 => 173910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/nth-child-style-sharing-even.html (rev 0)
+++ trunk/LayoutTests/fast/css/nth-child-style-sharing-even.html 2014-09-24 07:56:52 UTC (rev 173910)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<style>
+div {
+ background-color: white;
+}
+div:nth-child(even) {
+ background-color: lime;
+}
+</style>
+</head>
+<body>
+ <section>
+ <p>This tests basic style sharing with :nth-child(even). If the test pass, lines with the text "green" should have a green background.</p>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ <div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ </div>
+ <div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ </div>
+ </section>
+
+ <section>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ <div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ </div>
+ </section>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssnthchildstylesharingfixedintegerexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/nth-child-style-sharing-fixed-integer-expected.html (0 => 173910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/nth-child-style-sharing-fixed-integer-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/nth-child-style-sharing-fixed-integer-expected.html 2014-09-24 07:56:52 UTC (rev 173910)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<style>
+div {
+ background-color: white;
+}
+</style>
+</head>
+<body>
+ <section>
+ <p>This tests basic style sharing with :nth-child(number). If the test pass, lines with the text "green" should have a green background.</p>
+ <div style="background-color:lime">Green</div>
+ <div>White</div>
+ <div>
+ <div>White</div>
+ <div style="background-color:lime">Green</div>
+ <div>White</div>
+ <div>White</div>
+ <div style="background-color:lime">Green</div>
+ </div>
+ <div style="background-color:lime">
+ <div>White</div>
+ <div style="background-color:lime">Green</div>
+ <div>White</div>
+ <div>White</div>
+ <div style="background-color:lime">Green</div>
+ </div>
+ </section>
+
+ <section>
+ <div>White</div>
+ <div style="background-color:lime">Green</div>
+ <div>White</div>
+ <div>
+ <div>White</div>
+ <div style="background-color:lime">Green</div>
+ <div>White</div>
+ <div>White</div>
+ <div style="background-color:lime">Green</div>
+ </div>
+ <div style="background-color:lime">
+ <div>White</div>
+ <div style="background-color:lime">Green</div>
+ <div>White</div>
+ <div>White</div>
+ <div style="background-color:lime">Green</div>
+ </div>
+ </section>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssnthchildstylesharingfixedintegerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/nth-child-style-sharing-fixed-integer.html (0 => 173910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/nth-child-style-sharing-fixed-integer.html (rev 0)
+++ trunk/LayoutTests/fast/css/nth-child-style-sharing-fixed-integer.html 2014-09-24 07:56:52 UTC (rev 173910)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<style>
+div {
+ background-color: white;
+}
+div:nth-child(2), div:nth-child(5) {
+ background-color: lime;
+}
+</style>
+</head>
+<body>
+ <section>
+ <p>This tests basic style sharing with :nth-child(number). If the test pass, lines with the text "green" should have a green background.</p>
+ <div>Green</div>
+ <div>White</div>
+ <div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>White</div>
+ <div>Green</div>
+ </div>
+ <div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>White</div>
+ <div>Green</div>
+ </div>
+ </section>
+
+ <section>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>White</div>
+ <div>Green</div>
+ </div>
+ <div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>White</div>
+ <div>Green</div>
+ </div>
+ </section>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssnthchildstylesharingoddexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/nth-child-style-sharing-odd-expected.html (0 => 173910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/nth-child-style-sharing-odd-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/nth-child-style-sharing-odd-expected.html 2014-09-24 07:56:52 UTC (rev 173910)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<style>
+div {
+ background-color: white;
+}
+</style>
+</head>
+<body>
+ <section>
+ <p><!-- To avoid styling the description. --></p>
+ <p>This tests basic style sharing with :nth-child(odd). If the test pass, lines with the text "green" should have a green background.</p>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ </div>
+ <div style="background-color: lime">
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ </div>
+ </section>
+
+ <section>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ <div style="background-color: lime">Green</div>
+ <div>White</div>
+ </div>
+ </section>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssnthchildstylesharingoddhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/nth-child-style-sharing-odd.html (0 => 173910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/nth-child-style-sharing-odd.html (rev 0)
+++ trunk/LayoutTests/fast/css/nth-child-style-sharing-odd.html 2014-09-24 07:56:52 UTC (rev 173910)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<style>
+div {
+ background-color: white;
+}
+div:nth-child(odd) {
+ background-color: lime;
+}
+</style>
+</head>
+<body>
+ <section>
+ <p><!-- To avoid styling the description. --></p>
+ <p>This tests basic style sharing with :nth-child(odd). If the test pass, lines with the text "green" should have a green background.</p>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ <div>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ </div>
+ <div>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ </div>
+ </section>
+
+ <section>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ <div>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ <div>Green</div>
+ <div>White</div>
+ </div>
+ </section>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173909 => 173910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-24 05:10:18 UTC (rev 173909)
+++ trunk/Source/WebCore/ChangeLog 2014-09-24 07:56:52 UTC (rev 173910)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-09-24 Benjamin Poulain <bpoulain@apple.com>
+
+ Remove the style marking from :nth-child()
+ https://bugs.webkit.org/show_bug.cgi?id=137055
+
+ Reviewed by Andreas Kling.
+
+ Previously, :nth-child() had to mark the RenderStyle as unique in order
+ to prevent it from being used for style sharing.
+
+ After r173229, :nth-child() use the more generic element marking
+ "StyleIsAffectedByPreviousSibling".
+
+ In StyleResolver::canShareStyleWithElement(), StyleIsAffectedByPreviousSibling
+ is already used to prevent style sharing of those elements, making the "Unique"
+ flag redundant.
+
+ Since it is now useless, remove the style marking from SelectorChecker and the CSS JIT.
+
+ Tests: fast/css/nth-child-style-sharing-even.html
+ fast/css/nth-child-style-sharing-fixed-integer.html
+ fast/css/nth-child-style-sharing-odd.html
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::checkOne):
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsNthChild):
+ (WebCore::SelectorCompiler::setElementChildIndexAndUpdateStyle): Deleted.
+ * rendering/style/RenderStyle.h:
+
</ins><span class="cx"> 2014-09-23 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for is<HTML*Element>() for type checking
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (173909 => 173910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2014-09-24 05:10:18 UTC (rev 173909)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2014-09-24 07:56:52 UTC (rev 173910)
</span><span class="lines">@@ -695,11 +695,6 @@
</span><span class="cx"> element->setChildIndex(count);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (context.resolvingMode == Mode::ResolvingStyle) {
- if (RenderStyle* childStyle = context.elementStyle ? context.elementStyle : element->renderStyle())
- childStyle->setUnique();
- }
-
</del><span class="cx"> if (selector->matchNth(count))
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (173909 => 173910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-09-24 05:10:18 UTC (rev 173909)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-09-24 07:56:52 UTC (rev 173910)
</span><span class="lines">@@ -2910,13 +2910,6 @@
</span><span class="cx"> element->setChildIndex(index);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void setElementChildIndexAndUpdateStyle(Element* element, int index)
-{
- element->setChildIndex(index);
- if (RenderStyle* childStyle = element->renderStyle())
- childStyle->setUnique();
-}
-
</del><span class="cx"> void SelectorCodeGenerator::generateElementIsNthChild(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
</span><span class="cx"> {
</span><span class="cx"> {
</span><span class="lines">@@ -2984,22 +2977,12 @@
</span><span class="cx"> LocalRegister checkingContext(m_registerAllocator);
</span><span class="cx"> Assembler::Jump notResolvingStyle = jumpIfNotResolvingStyle(checkingContext);
</span><span class="cx">
</span><del>- if (fragmentMatchesTheRightmostElement(m_selectorContext, fragment)) {
- addFlagsToElementStyleFromContext(checkingContext, RenderStyle::NonInheritedFlags::flagIsUnique());
</del><ins>+ Assembler::RegisterID elementAddress = elementAddressRegister;
+ FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);
+ functionCall.setFunctionAddress(setElementChildIndex);
+ functionCall.setTwoArguments(elementAddress, elementCounter);
+ functionCall.call();
</ins><span class="cx">
</span><del>- Assembler::RegisterID elementAddress = elementAddressRegister;
- FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);
- functionCall.setFunctionAddress(setElementChildIndex);
- functionCall.setTwoArguments(elementAddress, elementCounter);
- functionCall.call();
- } else {
- Assembler::RegisterID elementAddress = elementAddressRegister;
- FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);
- functionCall.setFunctionAddress(setElementChildIndexAndUpdateStyle);
- functionCall.setTwoArguments(elementAddress, elementCounter);
- functionCall.call();
- }
-
</del><span class="cx"> notResolvingStyle.link(&m_assembler);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (173909 => 173910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-09-24 05:10:18 UTC (rev 173909)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-09-24 07:56:52 UTC (rev 173910)
</span><span class="lines">@@ -277,7 +277,6 @@
</span><span class="cx"> static ETableLayout initialTableLayout() { return TAUTO; }
</span><span class="cx">
</span><span class="cx"> static ptrdiff_t flagsMemoryOffset() { return OBJECT_OFFSETOF(NonInheritedFlags, m_flags); }
</span><del>- static uint64_t flagIsUnique() { return oneBitMask << isUniqueOffset; }
</del><span class="cx"> static uint64_t flagIsaffectedByActive() { return oneBitMask << affectedByActiveOffset; }
</span><span class="cx"> static uint64_t flagIsaffectedByHover() { return oneBitMask << affectedByHoverOffset; }
</span><span class="cx"> static uint64_t flagPseudoStyle(PseudoId pseudo) { return oneBitMask << (pseudoBitsOffset - 1 + pseudo); }
</span><span class="lines">@@ -309,6 +308,7 @@
</span><span class="cx"> return static_cast<unsigned>((m_flags >> offset) & positionIndependentMask);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static uint64_t flagIsUnique() { return oneBitMask << isUniqueOffset; }
</ins><span class="cx"> static uint64_t flagFirstChildState() { return oneBitMask << firstChildStateOffset; }
</span><span class="cx"> static uint64_t flagLastChildState() { return oneBitMask << lastChildStateOffset; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>