<!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>[166870] 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/166870">166870</a></dd>

<dt>Author</dt> <dd>benjamin@webkit.org</dd>

<dt>Date</dt> <dd>2014-04-07 01:52:45 -0700 (Mon, 07 Apr 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>CSS JIT: change the node flags directly instead of using function calls when possible

https://bugs.webkit.org/show_bug.cgi?id=131292

Reviewed by Andreas Kling.

For historical reasons, changing the node flags was always done with function calls.

This patch changes those calls to modify the nodes directly.

* cssjit/SelectorCompiler.cpp:

(WebCore::SelectorCompiler::SelectorCodeGenerator::generateDirectAdjacentTreeWalker):

(WebCore::SelectorCompiler::setNodeFlag):

(WebCore::SelectorCompiler::SelectorCodeGenerator::markParentElementIfResolvingStyle):

(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsFirstChild):

(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsLastChild):

(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsOnlyChild):

(WebCore::SelectorCompiler::markElementWithSetChildrenAffectedByLastChildRules): Deleted.

(WebCore::SelectorCompiler::markElementWithSetChildrenAffectedByFirstChildAndLastChildRules): Deleted.

* dom/Element.cpp:

(WebCore::Element::setChildrenAffectedByFirstChildRules): Deleted.

(WebCore::Element::setChildrenAffectedByDirectAdjacentRules): Deleted.

* dom/Element.h:

* dom/Node.h:

(WebCore::Node::flagChildrenAffectedByFirstChildRulesFlag):

(WebCore::Node::flagChildrenAffectedByLastChildRulesFlag):

(WebCore::Node::flagChildrenAffectedByDirectAdjacentRulesFlag):</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="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>

<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>

<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166869 => 166870)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-04-07 08:18:36 UTC (rev 166869)

+++ trunk/Source/WebCore/ChangeLog        2014-04-07 08:52:45 UTC (rev 166870)

</span><span class="lines">@@ -1,3 +1,31 @@

</span><ins>+2014-04-07  Benjamin Poulain  &lt;benjamin@webkit.org&gt;

+

+        CSS JIT: change the node flags directly instead of using function calls when possible

+        https://bugs.webkit.org/show_bug.cgi?id=131292

+

+        Reviewed by Andreas Kling.

+

+        For historical reasons, changing the node flags was always done with function calls.

+        This patch changes those calls to modify the nodes directly.

+

+        * cssjit/SelectorCompiler.cpp:

+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateDirectAdjacentTreeWalker):

+        (WebCore::SelectorCompiler::setNodeFlag):

+        (WebCore::SelectorCompiler::SelectorCodeGenerator::markParentElementIfResolvingStyle):

+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsFirstChild):

+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsLastChild):

+        (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsOnlyChild):

+        (WebCore::SelectorCompiler::markElementWithSetChildrenAffectedByLastChildRules): Deleted.

+        (WebCore::SelectorCompiler::markElementWithSetChildrenAffectedByFirstChildAndLastChildRules): Deleted.

+        * dom/Element.cpp:

+        (WebCore::Element::setChildrenAffectedByFirstChildRules): Deleted.

+        (WebCore::Element::setChildrenAffectedByDirectAdjacentRules): Deleted.

+        * dom/Element.h:

+        * dom/Node.h:

+        (WebCore::Node::flagChildrenAffectedByFirstChildRulesFlag):

+        (WebCore::Node::flagChildrenAffectedByLastChildRulesFlag):

+        (WebCore::Node::flagChildrenAffectedByDirectAdjacentRulesFlag):

+

</ins><span class="cx"> 2014-04-07  Krzysztof Czech  &lt;k.czech@samsung.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Remove unused header from PlatformSpeechSynthesizer.h

</span></span></pre></div>

<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (166869 => 166870)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp        2014-04-07 08:18:36 UTC (rev 166869)

+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp        2014-04-07 08:52:45 UTC (rev 166870)

</span><span class="lines">@@ -161,6 +161,7 @@

</span><span class="cx">     void generateWalkToPreviousAdjacent(Assembler::JumpList&amp; failureCases, const SelectorFragment&amp;);

</span><span class="cx">     void generateDirectAdjacentTreeWalker(Assembler::JumpList&amp; failureCases, const SelectorFragment&amp;);

</span><span class="cx">     void generateIndirectAdjacentTreeWalker(Assembler::JumpList&amp; failureCases, const SelectorFragment&amp;);

</span><ins>+    void markParentElementIfResolvingStyle(int32_t);

</ins><span class="cx">     void markParentElementIfResolvingStyle(JSC::FunctionPtr);

</span><span class="cx"> 

</span><span class="cx">     void linkFailures(Assembler::JumpList&amp; globalFailureCases, BacktrackingAction, Assembler::JumpList&amp; localFailureCases);

</span><span class="lines">@@ -854,7 +855,7 @@

</span><span class="cx"> 

</span><span class="cx"> void SelectorCodeGenerator::generateDirectAdjacentTreeWalker(Assembler::JumpList&amp; failureCases, const SelectorFragment&amp; fragment)

</span><span class="cx"> {

</span><del>-    markParentElementIfResolvingStyle(Element::setChildrenAffectedByDirectAdjacentRules);

</del><ins>+    markParentElementIfResolvingStyle(Node::flagChildrenAffectedByDirectAdjacentRulesFlag());

</ins><span class="cx"> 

</span><span class="cx">     generateWalkToPreviousAdjacent(failureCases, fragment);

</span><span class="cx"> 

</span><span class="lines">@@ -896,6 +897,30 @@

</span><span class="cx">     return m_assembler.branch8(Assembler::NotEqual, Assembler::Address(checkingContext, OBJECT_OFFSETOF(CheckingContext, resolvingMode)), Assembler::TrustedImm32(SelectorChecker::ResolvingStyle));

</span><span class="cx"> }

</span><span class="cx"> 

</span><ins>+static void setNodeFlag(Assembler&amp; assembler, Assembler::RegisterID elementAddress, int32_t flag)

+{

+    assembler.or32(Assembler::TrustedImm32(flag), Assembler::Address(elementAddress, Node::nodeFlagsMemoryOffset()));

+}

+

+void SelectorCodeGenerator::markParentElementIfResolvingStyle(int32_t nodeFlag)

+{

+    if (m_selectorContext == SelectorContext::QuerySelector)

+        return;

+

+    Assembler::JumpList skipMarking;

+    {

+        LocalRegister checkingContext(m_registerAllocator);

+        skipMarking.append(jumpIfNotResolvingStyle(checkingContext));

+    }

+

+    LocalRegister parentElement(m_registerAllocator);

+    generateWalkToParentElement(skipMarking, parentElement);

+

+    setNodeFlag(m_assembler, parentElement, nodeFlag);

+

+    skipMarking.link(&amp;m_assembler);

+}

+

</ins><span class="cx"> void SelectorCodeGenerator::markParentElementIfResolvingStyle(JSC::FunctionPtr markingFunction)

</span><span class="cx"> {

</span><span class="cx">     if (m_selectorContext == SelectorContext::QuerySelector)

</span><span class="lines">@@ -906,16 +931,15 @@

</span><span class="cx">     //         markingFunction(parent);

</span><span class="cx">     //     }

</span><span class="cx"> 

</span><del>-    Assembler::Jump notResolvingStyle;

</del><ins>+    Assembler::JumpList skipMarking;

</ins><span class="cx">     {

</span><span class="cx">         LocalRegister checkingContext(m_registerAllocator);

</span><del>-        notResolvingStyle = jumpIfNotResolvingStyle(checkingContext);

</del><ins>+        skipMarking.append(jumpIfNotResolvingStyle(checkingContext));

</ins><span class="cx">     }

</span><span class="cx"> 

<span class="cx">     // Get the parent element in a temporary register.

</span><del>-    Assembler::JumpList failedToGetParent;

</del><span class="cx">     Assembler::RegisterID parentElement = m_registerAllocator.allocateRegister();

</span><del>-    generateWalkToParentElement(failedToGetParent, parentElement);

</del><ins>+    generateWalkToParentElement(skipMarking, parentElement);

</ins><span class="cx"> 

</span><span class="cx">     // Return the register parentElement just before the function call since we don't need it to be preserved

<span class="cx">     // on the stack.

</span><span class="lines">@@ -927,8 +951,7 @@

</span><span class="cx">     functionCall.setOneArgument(parentElement);

</span><span class="cx">     functionCall.call();

</span><span class="cx"> 

</span><del>-    notResolvingStyle.link(&amp;m_assembler);

-    failedToGetParent.link(&amp;m_assembler);

</del><ins>+    skipMarking.link(&amp;m_assembler);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="lines">@@ -1482,11 +1505,8 @@

</span><span class="cx">     LocalRegister checkingContext(m_registerAllocator);

</span><span class="cx">     Assembler::Jump notResolvingStyle = jumpIfNotResolvingStyle(checkingContext);

</span><span class="cx"> 

</span><ins>+    setNodeFlag(m_assembler, parentElement, Node::flagChildrenAffectedByFirstChildRulesFlag());

</ins><span class="cx">     m_registerAllocator.deallocateRegister(parentElement);

</span><del>-    FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);

-    functionCall.setFunctionAddress(Element::setChildrenAffectedByFirstChildRules);

-    functionCall.setOneArgument(parentElement);

-    functionCall.call();

</del><span class="cx"> 

<span class="cx">     // The parent marking is unconditional. If the matching is not a success, we can now fail.

<span class="cx">     // Otherwise we need to apply setFirstChildState() on the RenderStyle.

</span><span class="lines">@@ -1525,11 +1545,6 @@

</span><span class="cx">     return successCase;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-static void markElementWithSetChildrenAffectedByLastChildRules(Element *element)

-{

-    element-&gt;setChildrenAffectedByLastChildRules();

-}

-

</del><span class="cx"> static void setLastChildState(Element* element)

</span><span class="cx"> {

</span><span class="cx">     if (RenderStyle* style = element-&gt;renderStyle())

</span><span class="lines">@@ -1572,11 +1587,8 @@

</span><span class="cx">     LocalRegister checkingContext(m_registerAllocator);

</span><span class="cx">     Assembler::Jump notResolvingStyle = jumpIfNotResolvingStyle(checkingContext);

</span><span class="cx"> 

</span><ins>+    setNodeFlag(m_assembler, parentElement, Node::flagChildrenAffectedByLastChildRulesFlag());

</ins><span class="cx">     m_registerAllocator.deallocateRegister(parentElement);

</span><del>-    FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);

-    functionCall.setFunctionAddress(markElementWithSetChildrenAffectedByLastChildRules);

-    functionCall.setOneArgument(parentElement);

-    functionCall.call();

</del><span class="cx"> 

<span class="cx">     // The parent marking is unconditional. If the matching is not a success, we can now fail.

<span class="cx">     // Otherwise we need to apply setLastChildState() on the RenderStyle.

</span><span class="lines">@@ -1606,12 +1618,6 @@

</span><span class="cx">     failureCases.append(m_assembler.branchTest32(Assembler::NonZero, isLastChildRegister));

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-static void markElementWithSetChildrenAffectedByFirstChildAndLastChildRules(Element *element)

-{

-    element-&gt;setChildrenAffectedByFirstChildRules();

-    element-&gt;setChildrenAffectedByLastChildRules();

-}

-

</del><span class="cx"> static void setOnlyChildState(Element* element)

</span><span class="cx"> {

</span><span class="cx">     if (RenderStyle* style = element-&gt;renderStyle()) {

</span><span class="lines">@@ -1666,11 +1672,8 @@

</span><span class="cx">     LocalRegister checkingContext(m_registerAllocator);

</span><span class="cx">     Assembler::Jump notResolvingStyle = jumpIfNotResolvingStyle(checkingContext);

</span><span class="cx"> 

</span><ins>+    setNodeFlag(m_assembler, parentElement, Node::flagChildrenAffectedByFirstChildRulesFlag() | Node::flagChildrenAffectedByLastChildRulesFlag());

</ins><span class="cx">     m_registerAllocator.deallocateRegister(parentElement);

</span><del>-    FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);

-    functionCall.setFunctionAddress(markElementWithSetChildrenAffectedByFirstChildAndLastChildRules);

-    functionCall.setOneArgument(parentElement);

-    functionCall.call();

</del><span class="cx"> 

<span class="cx">     // The parent marking is unconditional. If the matching is not a success, we can now fail.

<span class="cx">     // Otherwise we need to apply setLastChildState() on the RenderStyle.

</span></span></pre></div>

<a id="trunkSourceWebCoredomElementcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (166869 => 166870)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/dom/Element.cpp        2014-04-07 08:18:36 UTC (rev 166869)

+++ trunk/Source/WebCore/dom/Element.cpp        2014-04-07 08:52:45 UTC (rev 166870)

</span><span class="lines">@@ -2066,16 +2066,6 @@

</span><span class="cx">     ensureElementRareData().setChildrenAffectedByDrag(true);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void Element::setChildrenAffectedByFirstChildRules(Element* element)

-{

-    element-&gt;setChildrenAffectedByFirstChildRules();

-}

-

-void Element::setChildrenAffectedByDirectAdjacentRules(Element* element)

-{

-    element-&gt;setChildrenAffectedByDirectAdjacentRules();

-}

-

</del><span class="cx"> void Element::setChildrenAffectedByForwardPositionalRules(Element* element)

</span><span class="cx"> {

</span><span class="cx">     element-&gt;ensureElementRareData().setChildrenAffectedByForwardPositionalRules(true);

</span></span></pre></div>

<a id="trunkSourceWebCoredomElementh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (166869 => 166870)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/dom/Element.h        2014-04-07 08:18:36 UTC (rev 166869)

+++ trunk/Source/WebCore/dom/Element.h        2014-04-07 08:52:45 UTC (rev 166870)

</span><span class="lines">@@ -372,10 +372,8 @@

</span><span class="cx">     void setChildrenAffectedByHover() { setFlag(ChildrenAffectedByHoverRulesFlag); }

</span><span class="cx">     void setChildrenAffectedByActive();

</span><span class="cx">     void setChildrenAffectedByDrag();

</span><del>-    static void setChildrenAffectedByFirstChildRules(Element*);

</del><span class="cx">     void setChildrenAffectedByFirstChildRules() { setFlag(ChildrenAffectedByFirstChildRulesFlag); }

</span><span class="cx">     void setChildrenAffectedByLastChildRules() { setFlag(ChildrenAffectedByLastChildRulesFlag); }

</span><del>-    static void setChildrenAffectedByDirectAdjacentRules(Element*);

</del><span class="cx">     void setChildrenAffectedByDirectAdjacentRules() { setFlag(ChildrenAffectedByDirectAdjacentRulesFlag); }

</span><span class="cx">     static void setChildrenAffectedByForwardPositionalRules(Element*);

</span><span class="cx">     void setChildrenAffectedByForwardPositionalRules() { setChildrenAffectedByForwardPositionalRules(this); }

</span></span></pre></div>

<a id="trunkSourceWebCoredomNodeh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (166869 => 166870)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/dom/Node.h        2014-04-07 08:18:36 UTC (rev 166869)

+++ trunk/Source/WebCore/dom/Node.h        2014-04-07 08:52:45 UTC (rev 166870)

</span><span class="lines">@@ -575,6 +575,9 @@

</span><span class="cx">     static int32_t flagIsHTML() { return IsHTMLFlag; }

</span><span class="cx">     static int32_t flagIsLink() { return IsLinkFlag; }

</span><span class="cx">     static int32_t flagIsParsingChildrenFinished() { return IsParsingChildrenFinishedFlag; }

</span><ins>+    static int32_t flagChildrenAffectedByFirstChildRulesFlag() { return ChildrenAffectedByFirstChildRulesFlag; }

+    static int32_t flagChildrenAffectedByLastChildRulesFlag() { return ChildrenAffectedByLastChildRulesFlag; }

+    static int32_t flagChildrenAffectedByDirectAdjacentRulesFlag() { return ChildrenAffectedByDirectAdjacentRulesFlag; }

</ins><span class="cx"> #endif // ENABLE(CSS_SELECTOR_JIT)

</span><span class="cx"> 

</span><span class="cx"> protected:

</span></span></pre>

</div>

</div>

</body>

</html>