<!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>[169506] 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/169506">169506</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-31 18:34:15 -0700 (Sat, 31 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>CSS JIT cleanup: move two utility functions out of the properties-matcher section
https://bugs.webkit.org/show_bug.cgi?id=133427

Reviewed by Andreas Kling.

Just move the code, no other modification.

* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::jumpIfNoPreviousAdjacentElement):
(WebCore::SelectorCompiler::SelectorCodeGenerator::jumpIfNoNextAdjacentElement):</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 (169505 => 169506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-06-01 00:01:16 UTC (rev 169505)
+++ trunk/Source/WebCore/ChangeLog        2014-06-01 01:34:15 UTC (rev 169506)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-31  Benjamin Poulain  &lt;benjamin@webkit.org&gt;
+
+        CSS JIT cleanup: move two utility functions out of the properties-matcher section
+        https://bugs.webkit.org/show_bug.cgi?id=133427
+
+        Reviewed by Andreas Kling.
+
+        Just move the code, no other modification.
+
+        * cssjit/SelectorCompiler.cpp:
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::jumpIfNoPreviousAdjacentElement):
+        (WebCore::SelectorCompiler::SelectorCodeGenerator::jumpIfNoNextAdjacentElement):
+
</ins><span class="cx"> 2014-05-31  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Viewport percentage tests that resize the viewport are flaky
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (169505 => 169506)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp        2014-06-01 00:01:16 UTC (rev 169505)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp        2014-06-01 01:34:15 UTC (rev 169506)
</span><span class="lines">@@ -210,11 +210,9 @@
</span><span class="cx">     void generateElementMatching(Assembler::JumpList&amp; matchingTagNameFailureCases, Assembler::JumpList&amp; matchingPostTagNameFailureCases, const SelectorFragment&amp;);
</span><span class="cx">     void generateElementDataMatching(Assembler::JumpList&amp; failureCases, const SelectorFragment&amp;);
</span><span class="cx">     void generateElementFunctionCallTest(Assembler::JumpList&amp; failureCases, JSC::FunctionPtr);
</span><del>-    Assembler::JumpList jumpIfNoPreviousAdjacentElement();
</del><span class="cx">     void generateElementIsActive(Assembler::JumpList&amp; failureCases, const SelectorFragment&amp;);
</span><span class="cx">     void generateElementIsFirstChild(Assembler::JumpList&amp; failureCases, const SelectorFragment&amp;);
</span><span class="cx">     void generateElementIsHovered(Assembler::JumpList&amp; failureCases, const SelectorFragment&amp;);
</span><del>-    Assembler::JumpList jumpIfNoNextAdjacentElement();
</del><span class="cx">     void generateElementIsLastChild(Assembler::JumpList&amp; failureCases, const SelectorFragment&amp;);
</span><span class="cx">     void generateElementIsOnlyChild(Assembler::JumpList&amp; failureCases, const SelectorFragment&amp;);
</span><span class="cx">     void generateSynchronizeStyleAttribute(Assembler::RegisterID elementDataArraySizeAndFlags);
</span><span class="lines">@@ -234,6 +232,8 @@
</span><span class="cx"> 
</span><span class="cx">     // Helpers.
</span><span class="cx">     void addFlagsToElementStyleFromContext(Assembler::RegisterID checkingContext, int64_t);
</span><ins>+    Assembler::JumpList jumpIfNoPreviousAdjacentElement();
+    Assembler::JumpList jumpIfNoNextAdjacentElement();
</ins><span class="cx">     Assembler::Jump jumpIfNotResolvingStyle(Assembler::RegisterID checkingContextRegister);
</span><span class="cx">     void generateSpecialFailureInQuirksModeForActiveAndHoverIfNeeded(Assembler::JumpList&amp; failureCases, const SelectorFragment&amp;);
</span><span class="cx">     Assembler::Jump modulo(JSC::MacroAssembler::ResultCondition, Assembler::RegisterID inputDividend, int divisor);
</span><span class="lines">@@ -1235,6 +1235,24 @@
</span><span class="cx">     m_assembler.store64(flags, flagAddress);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+Assembler::JumpList SelectorCodeGenerator::jumpIfNoPreviousAdjacentElement()
+{
+    Assembler::JumpList successCase;
+    LocalRegister previousSibling(m_registerAllocator);
+    m_assembler.move(elementAddressRegister, previousSibling);
+    generateWalkToPreviousAdjacentElement(successCase, previousSibling);
+    return successCase;
+}
+
+Assembler::JumpList SelectorCodeGenerator::jumpIfNoNextAdjacentElement()
+{
+    Assembler::JumpList successCase;
+    LocalRegister nextSibling(m_registerAllocator);
+    m_assembler.move(elementAddressRegister, nextSibling);
+    generateWalkToNextAdjacentElement(successCase, nextSibling);
+    return successCase;
+}
+
</ins><span class="cx"> Assembler::Jump SelectorCodeGenerator::jumpIfNotResolvingStyle(Assembler::RegisterID checkingContext)
</span><span class="cx"> {
</span><span class="cx">     RELEASE_ASSERT(m_selectorContext == SelectorContext::RuleCollector);
</span><span class="lines">@@ -1996,15 +2014,6 @@
</span><span class="cx">         style-&gt;setFirstChildState();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline Assembler::JumpList SelectorCodeGenerator::jumpIfNoPreviousAdjacentElement()
-{
-    Assembler::JumpList successCase;
-    LocalRegister previousSibling(m_registerAllocator);
-    m_assembler.move(elementAddressRegister, previousSibling);
-    generateWalkToPreviousAdjacentElement(successCase, previousSibling);
-    return successCase;
-}
-
</del><span class="cx"> static bool elementIsActive(Element* element)
</span><span class="cx"> {
</span><span class="cx">     return element-&gt;active() || InspectorInstrumentation::forcePseudoState(element, CSSSelector::PseudoClassActive);
</span><span class="lines">@@ -2146,15 +2155,6 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Assembler::JumpList SelectorCodeGenerator::jumpIfNoNextAdjacentElement()
-{
-    Assembler::JumpList successCase;
-    LocalRegister nextSibling(m_registerAllocator);
-    m_assembler.move(elementAddressRegister, nextSibling);
-    generateWalkToNextAdjacentElement(successCase, nextSibling);
-    return successCase;
-}
-
</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></pre>
</div>
</div>

</body>
</html>