<!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>[207793] 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/207793">207793</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-10-24 17:31:05 -0700 (Mon, 24 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, attempt to fix Windows build after <a href="http://trac.webkit.org/projects/webkit/changeset/207787">r207787</a>
https://bugs.webkit.org/show_bug.cgi?id=163657
According to the similar code in WebKit, I guess that
Visual C++ requires friend class declaration is done
in the private section to access private members.
And I also changed ::instance to ::shared to align to
the existing WebCore code.
* domjit/DOMJITAbstractHeapRepository.cpp:
(WebCore::DOMJIT::AbstractHeapRepository::shared):
(WebCore::DOMJIT::AbstractHeapRepository::instance): Deleted.
* domjit/DOMJITAbstractHeapRepository.h:
* domjit/JSNodeDOMJIT.cpp:
(WebCore::NodeFirstChildDOMJIT::callDOM):
(WebCore::NodeLastChildDOMJIT::callDOM):
(WebCore::NodeNextSiblingDOMJIT::callDOM):
(WebCore::NodePreviousSiblingDOMJIT::callDOM):
(WebCore::NodeParentNodeDOMJIT::callDOM):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomjitDOMJITAbstractHeapRepositorycpp">trunk/Source/WebCore/domjit/DOMJITAbstractHeapRepository.cpp</a></li>
<li><a href="#trunkSourceWebCoredomjitDOMJITAbstractHeapRepositoryh">trunk/Source/WebCore/domjit/DOMJITAbstractHeapRepository.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 (207792 => 207793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-10-25 00:22:08 UTC (rev 207792)
+++ trunk/Source/WebCore/ChangeLog        2016-10-25 00:31:05 UTC (rev 207793)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-10-24 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ Unreviewed, attempt to fix Windows build after r207787
+ https://bugs.webkit.org/show_bug.cgi?id=163657
+
+ According to the similar code in WebKit, I guess that
+ Visual C++ requires friend class declaration is done
+ in the private section to access private members.
+
+ And I also changed ::instance to ::shared to align to
+ the existing WebCore code.
+
+ * domjit/DOMJITAbstractHeapRepository.cpp:
+ (WebCore::DOMJIT::AbstractHeapRepository::shared):
+ (WebCore::DOMJIT::AbstractHeapRepository::instance): Deleted.
+ * domjit/DOMJITAbstractHeapRepository.h:
+ * domjit/JSNodeDOMJIT.cpp:
+ (WebCore::NodeFirstChildDOMJIT::callDOM):
+ (WebCore::NodeLastChildDOMJIT::callDOM):
+ (WebCore::NodeNextSiblingDOMJIT::callDOM):
+ (WebCore::NodePreviousSiblingDOMJIT::callDOM):
+ (WebCore::NodeParentNodeDOMJIT::callDOM):
+
</ins><span class="cx"> 2016-10-24 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the lifetime of strings used in LOG_WITH_STREAM
</span></span></pre></div>
<a id="trunkSourceWebCoredomjitDOMJITAbstractHeapRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/domjit/DOMJITAbstractHeapRepository.cpp (207792 => 207793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/domjit/DOMJITAbstractHeapRepository.cpp        2016-10-25 00:22:08 UTC (rev 207792)
+++ trunk/Source/WebCore/domjit/DOMJITAbstractHeapRepository.cpp        2016-10-25 00:31:05 UTC (rev 207793)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const AbstractHeapRepository& AbstractHeapRepository::instance()
</del><ins>+const AbstractHeapRepository& AbstractHeapRepository::shared()
</ins><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<AbstractHeapRepository> repository;
</span><span class="cx"> return repository.get();
</span></span></pre></div>
<a id="trunkSourceWebCoredomjitDOMJITAbstractHeapRepositoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/domjit/DOMJITAbstractHeapRepository.h (207792 => 207793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/domjit/DOMJITAbstractHeapRepository.h        2016-10-25 00:22:08 UTC (rev 207792)
+++ trunk/Source/WebCore/domjit/DOMJITAbstractHeapRepository.h        2016-10-25 00:31:05 UTC (rev 207793)
</span><span class="lines">@@ -47,8 +47,7 @@
</span><span class="cx"> class AbstractHeapRepository {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(AbstractHeapRepository);
</span><span class="cx"> public:
</span><del>- friend class NeverDestroyed<AbstractHeapRepository>;
- static const AbstractHeapRepository& instance();
</del><ins>+ static const AbstractHeapRepository& shared();
</ins><span class="cx">
</span><span class="cx"> JSC::DOMJIT::HeapRange DOM;
</span><span class="cx">
</span><span class="lines">@@ -57,6 +56,7 @@
</span><span class="cx"> #undef DOMJIT_DEFINE_MEMBER
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ friend class NeverDestroyed<AbstractHeapRepository>;
</ins><span class="cx"> AbstractHeapRepository();
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomjitJSNodeDOMJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/domjit/JSNodeDOMJIT.cpp (207792 => 207793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/domjit/JSNodeDOMJIT.cpp        2016-10-25 00:22:08 UTC (rev 207792)
+++ trunk/Source/WebCore/domjit/JSNodeDOMJIT.cpp        2016-10-25 00:31:05 UTC (rev 207793)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<JSC::DOMJIT::CallDOMPatchpoint> NodeFirstChildDOMJIT::callDOM()
</span><span class="cx"> {
</span><del>- const auto& heap = DOMJIT::AbstractHeapRepository::instance();
</del><ins>+ const auto& heap = DOMJIT::AbstractHeapRepository::shared();
</ins><span class="cx"> auto patchpoint = createCallDOMForOffsetAccess<Node>(CAST_OFFSET(Node*, ContainerNode*) + ContainerNode::firstChildMemoryOffset(), IsContainerGuardRequirement::Required);
</span><span class="cx"> patchpoint->effect = JSC::DOMJIT::Effect::forDef(heap.Node_firstChild);
</span><span class="cx"> return patchpoint;
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<JSC::DOMJIT::CallDOMPatchpoint> NodeLastChildDOMJIT::callDOM()
</span><span class="cx"> {
</span><del>- const auto& heap = DOMJIT::AbstractHeapRepository::instance();
</del><ins>+ const auto& heap = DOMJIT::AbstractHeapRepository::shared();
</ins><span class="cx"> auto patchpoint = createCallDOMForOffsetAccess<Node>(CAST_OFFSET(Node*, ContainerNode*) + ContainerNode::lastChildMemoryOffset(), IsContainerGuardRequirement::Required);
</span><span class="cx"> patchpoint->effect = JSC::DOMJIT::Effect::forDef(heap.Node_lastChild);
</span><span class="cx"> return patchpoint;
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<JSC::DOMJIT::CallDOMPatchpoint> NodeNextSiblingDOMJIT::callDOM()
</span><span class="cx"> {
</span><del>- const auto& heap = DOMJIT::AbstractHeapRepository::instance();
</del><ins>+ const auto& heap = DOMJIT::AbstractHeapRepository::shared();
</ins><span class="cx"> auto patchpoint = createCallDOMForOffsetAccess<Node>(Node::nextSiblingMemoryOffset(), IsContainerGuardRequirement::NotRequired);
</span><span class="cx"> patchpoint->effect = JSC::DOMJIT::Effect::forDef(heap.Node_nextSibling);
</span><span class="cx"> return patchpoint;
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<JSC::DOMJIT::CallDOMPatchpoint> NodePreviousSiblingDOMJIT::callDOM()
</span><span class="cx"> {
</span><del>- const auto& heap = DOMJIT::AbstractHeapRepository::instance();
</del><ins>+ const auto& heap = DOMJIT::AbstractHeapRepository::shared();
</ins><span class="cx"> auto patchpoint = createCallDOMForOffsetAccess<Node>(Node::previousSiblingMemoryOffset(), IsContainerGuardRequirement::NotRequired);
</span><span class="cx"> patchpoint->effect = JSC::DOMJIT::Effect::forDef(heap.Node_previousSibling);
</span><span class="cx"> return patchpoint;
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<JSC::DOMJIT::CallDOMPatchpoint> NodeParentNodeDOMJIT::callDOM()
</span><span class="cx"> {
</span><del>- const auto& heap = DOMJIT::AbstractHeapRepository::instance();
</del><ins>+ const auto& heap = DOMJIT::AbstractHeapRepository::shared();
</ins><span class="cx"> auto patchpoint = createCallDOMForOffsetAccess<ContainerNode>(Node::parentNodeMemoryOffset(), IsContainerGuardRequirement::NotRequired);
</span><span class="cx"> patchpoint->effect = JSC::DOMJIT::Effect::forDef(heap.Node_parentNode);
</span><span class="cx"> return patchpoint;
</span></span></pre>
</div>
</div>
</body>
</html>