Title: [207793] trunk/Source/WebCore
- Revision
- 207793
- Author
- utatane....@gmail.com
- Date
- 2016-10-24 17:31:05 -0700 (Mon, 24 Oct 2016)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (207792 => 207793)
--- 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)
@@ -1,3 +1,26 @@
+2016-10-24 Yusuke Suzuki <utatane....@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):
+
2016-10-24 Simon Fraser <simon.fra...@apple.com>
Fix the lifetime of strings used in LOG_WITH_STREAM
Modified: trunk/Source/WebCore/domjit/DOMJITAbstractHeapRepository.cpp (207792 => 207793)
--- 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)
@@ -59,7 +59,7 @@
}
}
-const AbstractHeapRepository& AbstractHeapRepository::instance()
+const AbstractHeapRepository& AbstractHeapRepository::shared()
{
static NeverDestroyed<AbstractHeapRepository> repository;
return repository.get();
Modified: trunk/Source/WebCore/domjit/DOMJITAbstractHeapRepository.h (207792 => 207793)
--- 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)
@@ -47,8 +47,7 @@
class AbstractHeapRepository {
WTF_MAKE_NONCOPYABLE(AbstractHeapRepository);
public:
- friend class NeverDestroyed<AbstractHeapRepository>;
- static const AbstractHeapRepository& instance();
+ static const AbstractHeapRepository& shared();
JSC::DOMJIT::HeapRange DOM;
@@ -57,6 +56,7 @@
#undef DOMJIT_DEFINE_MEMBER
private:
+ friend class NeverDestroyed<AbstractHeapRepository>;
AbstractHeapRepository();
};
Modified: trunk/Source/WebCore/domjit/JSNodeDOMJIT.cpp (207792 => 207793)
--- 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)
@@ -104,7 +104,7 @@
Ref<JSC::DOMJIT::CallDOMPatchpoint> NodeFirstChildDOMJIT::callDOM()
{
- const auto& heap = DOMJIT::AbstractHeapRepository::instance();
+ const auto& heap = DOMJIT::AbstractHeapRepository::shared();
auto patchpoint = createCallDOMForOffsetAccess<Node>(CAST_OFFSET(Node*, ContainerNode*) + ContainerNode::firstChildMemoryOffset(), IsContainerGuardRequirement::Required);
patchpoint->effect = JSC::DOMJIT::Effect::forDef(heap.Node_firstChild);
return patchpoint;
@@ -118,7 +118,7 @@
Ref<JSC::DOMJIT::CallDOMPatchpoint> NodeLastChildDOMJIT::callDOM()
{
- const auto& heap = DOMJIT::AbstractHeapRepository::instance();
+ const auto& heap = DOMJIT::AbstractHeapRepository::shared();
auto patchpoint = createCallDOMForOffsetAccess<Node>(CAST_OFFSET(Node*, ContainerNode*) + ContainerNode::lastChildMemoryOffset(), IsContainerGuardRequirement::Required);
patchpoint->effect = JSC::DOMJIT::Effect::forDef(heap.Node_lastChild);
return patchpoint;
@@ -132,7 +132,7 @@
Ref<JSC::DOMJIT::CallDOMPatchpoint> NodeNextSiblingDOMJIT::callDOM()
{
- const auto& heap = DOMJIT::AbstractHeapRepository::instance();
+ const auto& heap = DOMJIT::AbstractHeapRepository::shared();
auto patchpoint = createCallDOMForOffsetAccess<Node>(Node::nextSiblingMemoryOffset(), IsContainerGuardRequirement::NotRequired);
patchpoint->effect = JSC::DOMJIT::Effect::forDef(heap.Node_nextSibling);
return patchpoint;
@@ -146,7 +146,7 @@
Ref<JSC::DOMJIT::CallDOMPatchpoint> NodePreviousSiblingDOMJIT::callDOM()
{
- const auto& heap = DOMJIT::AbstractHeapRepository::instance();
+ const auto& heap = DOMJIT::AbstractHeapRepository::shared();
auto patchpoint = createCallDOMForOffsetAccess<Node>(Node::previousSiblingMemoryOffset(), IsContainerGuardRequirement::NotRequired);
patchpoint->effect = JSC::DOMJIT::Effect::forDef(heap.Node_previousSibling);
return patchpoint;
@@ -160,7 +160,7 @@
Ref<JSC::DOMJIT::CallDOMPatchpoint> NodeParentNodeDOMJIT::callDOM()
{
- const auto& heap = DOMJIT::AbstractHeapRepository::instance();
+ const auto& heap = DOMJIT::AbstractHeapRepository::shared();
auto patchpoint = createCallDOMForOffsetAccess<ContainerNode>(Node::parentNodeMemoryOffset(), IsContainerGuardRequirement::NotRequired);
patchpoint->effect = JSC::DOMJIT::Effect::forDef(heap.Node_parentNode);
return patchpoint;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
