<!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>[207999] 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/207999">207999</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-10-27 13:00:38 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[DOMJIT][CSSJIT] Share code with DOMJIT
https://bugs.webkit.org/show_bug.cgi?id=164006
Reviewed by Mark Lam.
Move CSSJIT's getDocument function to DOMJIT and share it with DOMJIT.
And rename it to "loadDocument", it is closer name to the JSC's convention.
No behavior change.
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateSpecialFailureInQuirksModeForActiveAndHoverIfNeeded):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueExactMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasTagName):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsRoot):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsScopeRoot):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsTarget):
(WebCore::SelectorCompiler::getDocument): Deleted.
* domjit/DOMJITHelpers.h:
(WebCore::DOMJIT::loadDocument):
* domjit/JSNodeDOMJIT.cpp:
(WebCore::NodeOwnerDocumentDOMJIT::callDOM):</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="#trunkSourceWebCoredomjitDOMJITHelpersh">trunk/Source/WebCore/domjit/DOMJITHelpers.h</a></li>
<li><a href="#trunkSourceWebCoredomjitJSNodeDOMJITcpp">trunk/Source/WebCore/domjit/JSNodeDOMJIT.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207998 => 207999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-27 19:49:49 UTC (rev 207998)
+++ trunk/Source/WebCore/ChangeLog 2016-10-27 20:00:38 UTC (rev 207999)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-10-27 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [DOMJIT][CSSJIT] Share code with DOMJIT
+ https://bugs.webkit.org/show_bug.cgi?id=164006
+
+ Reviewed by Mark Lam.
+
+ Move CSSJIT's getDocument function to DOMJIT and share it with DOMJIT.
+ And rename it to "loadDocument", it is closer name to the JSC's convention.
+
+ No behavior change.
+
+ * cssjit/SelectorCompiler.cpp:
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateSpecialFailureInQuirksModeForActiveAndHoverIfNeeded):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueExactMatching):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementHasTagName):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsRoot):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsScopeRoot):
+ (WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsTarget):
+ (WebCore::SelectorCompiler::getDocument): Deleted.
+ * domjit/DOMJITHelpers.h:
+ (WebCore::DOMJIT::loadDocument):
+ * domjit/JSNodeDOMJIT.cpp:
+ (WebCore::NodeOwnerDocumentDOMJIT::callDOM):
+
</ins><span class="cx"> 2016-10-27 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r207753-207755): ASSERTION FAILED: m_parsedStyleSheetCache->isInMemoryCache()
</span></span></pre></div>
<a id="trunkSourceWebCorecssjitSelectorCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (207998 => 207999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-10-27 19:49:49 UTC (rev 207998)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2016-10-27 20:00:38 UTC (rev 207999)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSSelector.h"
</span><span class="cx"> #include "CSSSelectorList.h"
</span><ins>+#include "DOMJITHelpers.h"
</ins><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "ElementData.h"
</span><span class="cx"> #include "ElementRareData.h"
</span><span class="lines">@@ -2311,12 +2312,6 @@
</span><span class="cx"> return branchOnResolvingMode(Assembler::NotEqual, SelectorChecker::Mode::ResolvingStyle, checkingContext);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void getDocument(Assembler& assembler, Assembler::RegisterID element, Assembler::RegisterID output)
-{
- assembler.loadPtr(Assembler::Address(element, Node::treeScopeMemoryOffset()), output);
- assembler.loadPtr(Assembler::Address(output, TreeScope::documentScopeMemoryOffset()), output);
-}
-
</del><span class="cx"> void SelectorCodeGenerator::generateSpecialFailureInQuirksModeForActiveAndHoverIfNeeded(Assembler::JumpList& failureCases, const SelectorFragment& fragment)
</span><span class="cx"> {
</span><span class="cx"> if (fragment.onlyMatchesLinksInQuirksMode) {
</span><span class="lines">@@ -2326,7 +2321,7 @@
</span><span class="cx"> // Only quirks mode restrict :hover and :active.
</span><span class="cx"> static_assert(sizeof(DocumentCompatibilityMode) == 1, "We generate a byte load/test for the compatibility mode.");
</span><span class="cx"> LocalRegister documentAddress(m_registerAllocator);
</span><del>- getDocument(m_assembler, elementAddressRegister, documentAddress);
</del><ins>+ DOMJIT::loadDocument(m_assembler, elementAddressRegister, documentAddress);
</ins><span class="cx"> failureCases.append(m_assembler.branchTest8(Assembler::NonZero, Assembler::Address(documentAddress, Document::compatibilityModeMemoryOffset()), Assembler::TrustedImm32(static_cast<std::underlying_type<DocumentCompatibilityMode>::type>(DocumentCompatibilityMode::QuirksMode))));
</span><span class="cx">
</span><span class="cx"> isLink.link(&m_assembler);
</span><span class="lines">@@ -2992,7 +2987,7 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> LocalRegister document(m_registerAllocator);
</span><del>- getDocument(m_assembler, elementAddressRegister, document);
</del><ins>+ DOMJIT::loadDocument(m_assembler, elementAddressRegister, document);
</ins><span class="cx"> failureCases.append(testIsHTMLClassOnDocument(Assembler::Zero, m_assembler, document));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3422,7 +3417,7 @@
</span><span class="cx"> caseSensitiveCases.append(testIsHTMLFlagOnNode(Assembler::Zero, m_assembler, elementAddressRegister));
</span><span class="cx"> {
</span><span class="cx"> LocalRegister document(m_registerAllocator);
</span><del>- getDocument(m_assembler, elementAddressRegister, document);
</del><ins>+ DOMJIT::loadDocument(m_assembler, elementAddressRegister, document);
</ins><span class="cx"> caseSensitiveCases.append(testIsHTMLClassOnDocument(Assembler::Zero, m_assembler, document));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3780,7 +3775,7 @@
</span><span class="cx"> void SelectorCodeGenerator::generateElementIsRoot(Assembler::JumpList& failureCases)
</span><span class="cx"> {
</span><span class="cx"> LocalRegister document(m_registerAllocator);
</span><del>- getDocument(m_assembler, elementAddressRegister, document);
</del><ins>+ DOMJIT::loadDocument(m_assembler, elementAddressRegister, document);
</ins><span class="cx"> failureCases.append(m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(document, Document::documentElementMemoryOffset()), elementAddressRegister));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3794,7 +3789,7 @@
</span><span class="cx">
</span><span class="cx"> Assembler::Jump scopeIsNotNull = m_assembler.branchTestPtr(Assembler::NonZero, scope);
</span><span class="cx">
</span><del>- getDocument(m_assembler, elementAddressRegister, scope);
</del><ins>+ DOMJIT::loadDocument(m_assembler, elementAddressRegister, scope);
</ins><span class="cx"> m_assembler.loadPtr(Assembler::Address(scope, Document::documentElementMemoryOffset()), scope);
</span><span class="cx">
</span><span class="cx"> scopeIsNotNull.link(&m_assembler);
</span><span class="lines">@@ -3804,7 +3799,7 @@
</span><span class="cx"> void SelectorCodeGenerator::generateElementIsTarget(Assembler::JumpList& failureCases)
</span><span class="cx"> {
</span><span class="cx"> LocalRegister document(m_registerAllocator);
</span><del>- getDocument(m_assembler, elementAddressRegister, document);
</del><ins>+ DOMJIT::loadDocument(m_assembler, elementAddressRegister, document);
</ins><span class="cx"> failureCases.append(m_assembler.branchPtr(Assembler::NotEqual, Assembler::Address(document, Document::cssTargetMemoryOffset()), elementAddressRegister));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomjitDOMJITHelpersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/domjit/DOMJITHelpers.h (207998 => 207999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/domjit/DOMJITHelpers.h 2016-10-27 19:49:49 UTC (rev 207998)
+++ trunk/Source/WebCore/domjit/DOMJITHelpers.h 2016-10-27 20:00:38 UTC (rev 207999)
</span><span class="lines">@@ -37,7 +37,10 @@
</span><span class="cx"> using JSC::CCallHelpers;
</span><span class="cx"> using JSC::GPRReg;
</span><span class="cx"> using JSC::JSValueRegs;
</span><ins>+using JSC::MacroAssembler;
</ins><span class="cx">
</span><ins>+static_assert(std::is_same<GPRReg, MacroAssembler::RegisterID>::value, "GPRReg is the alias to the MacroAssembler::RegisterID");
+
</ins><span class="cx"> inline CCallHelpers::Jump branchIfNotWorldIsNormal(CCallHelpers& jit, GPRReg globalObject)
</span><span class="cx"> {
</span><span class="cx"> return jit.branchTest8(CCallHelpers::Zero, CCallHelpers::Address(globalObject, JSDOMGlobalObject::offsetOfWorldIsNormal()));
</span><span class="lines">@@ -137,6 +140,12 @@
</span><span class="cx"> return jit.branchIfNotType(target, JSC::JSType(JSDocumentWrapperType));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void loadDocument(MacroAssembler& jit, GPRReg node, GPRReg output)
+{
+ jit.loadPtr(CCallHelpers::Address(node, Node::treeScopeMemoryOffset()), output);
+ jit.loadPtr(CCallHelpers::Address(output, TreeScope::documentScopeMemoryOffset()), output);
+}
+
</ins><span class="cx"> } }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomjitJSNodeDOMJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/domjit/JSNodeDOMJIT.cpp (207998 => 207999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/domjit/JSNodeDOMJIT.cpp 2016-10-27 19:49:49 UTC (rev 207998)
+++ trunk/Source/WebCore/domjit/JSNodeDOMJIT.cpp 2016-10-27 20:00:38 UTC (rev 207999)
</span><span class="lines">@@ -206,9 +206,7 @@
</span><span class="cx">
</span><span class="cx"> notDocument.link(&jit);
</span><span class="cx"> jit.loadPtr(CCallHelpers::Address(node, JSNode::offsetOfWrapped()), scratch);
</span><del>- jit.loadPtr(CCallHelpers::Address(scratch, Node::treeScopeMemoryOffset()), scratch);
- jit.loadPtr(CCallHelpers::Address(scratch, TreeScope::documentScopeMemoryOffset()), scratch);
-
</del><ins>+ DOMJIT::loadDocument(jit, scratch, scratch);
</ins><span class="cx"> DOMJIT::toWrapper<Document>(jit, params, scratch, globalObject, result, toWrapperSlow<Document>, globalObjectValue);
</span><span class="cx"> done.link(&jit);
</span><span class="cx"> return CCallHelpers::JumpList();
</span></span></pre>
</div>
</div>
</body>
</html>