Diff
Modified: tags/Safari-603.1.11/LayoutTests/ChangeLog (208352 => 208353)
--- tags/Safari-603.1.11/LayoutTests/ChangeLog 2016-11-03 22:53:59 UTC (rev 208352)
+++ tags/Safari-603.1.11/LayoutTests/ChangeLog 2016-11-03 22:54:05 UTC (rev 208353)
@@ -1,5 +1,18 @@
2016-11-03 Matthew Hanson <matthew_han...@apple.com>
+ Merge r208351. rdar://problem/29094221
+
+ 2016-11-03 Yusuke Suzuki <utatane....@gmail.com>
+
+ Unreviewed, rolling out due to crash in Amazon web site
+ https://bugs.webkit.org/show_bug.cgi?id=164380
+ <rdar://problem/29094221>
+
+ * js/dom/domjit-accessor-owner-document-expected.txt: Removed.
+ * js/dom/domjit-accessor-owner-document.html: Removed.
+
+2016-11-03 Matthew Hanson <matthew_han...@apple.com>
+
Rollout r208149. rdar://problem/29098431
2016-11-03 Matthew Hanson <matthew_han...@apple.com>
Deleted: tags/Safari-603.1.11/LayoutTests/js/dom/domjit-accessor-owner-document-expected.txt (208352 => 208353)
--- tags/Safari-603.1.11/LayoutTests/js/dom/domjit-accessor-owner-document-expected.txt 2016-11-03 22:53:59 UTC (rev 208352)
+++ tags/Safari-603.1.11/LayoutTests/js/dom/domjit-accessor-owner-document-expected.txt 2016-11-03 22:54:05 UTC (rev 208353)
@@ -1,109 +0,0 @@
-Test DOMJIT nodeType accessor works.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS (
- function testElement(element, result)
- {
- for (var i = 0; i < 1e4; ++i) {
- if (element.ownerDocument !== result)
- return false;
- }
- return true;
- }
- )(target, result) is true
-PASS (
- function testAttr(element, result)
- {
- for (var i = 0; i < 1e4; ++i) {
- if (element.ownerDocument !== result)
- return false;
- }
- return true;
- }
- )(target, result) is true
-PASS (
- function testText(element, result)
- {
- for (var i = 0; i < 1e4; ++i) {
- if (element.ownerDocument !== result)
- return false;
- }
- return true;
- }
- )(target, result) is true
-PASS (
- function testCDATA(element, result)
- {
- for (var i = 0; i < 1e4; ++i) {
- if (element.ownerDocument !== result)
- return false;
- }
- return true;
- }
- )(target, result) is true
-PASS (
- function testProcessingInstruction(element, result)
- {
- for (var i = 0; i < 1e4; ++i) {
- if (element.ownerDocument !== result)
- return false;
- }
- return true;
- }
- )(target, result) is true
-PASS (
- function testComment(element, result)
- {
- for (var i = 0; i < 1e4; ++i) {
- if (element.ownerDocument !== result)
- return false;
- }
- return true;
- }
- )(target, result) is true
-PASS (
- function testDocument(element, result)
- {
- for (var i = 0; i < 1e4; ++i) {
- if (element.ownerDocument !== result)
- return false;
- }
- return true;
- }
- )(target, result) is true
-PASS (
- function testXMLDocument(element, result)
- {
- for (var i = 0; i < 1e4; ++i) {
- if (element.ownerDocument !== result)
- return false;
- }
- return true;
- }
- )(target, result) is true
-PASS (
- function testDocumentType(element, result)
- {
- for (var i = 0; i < 1e4; ++i) {
- if (element.ownerDocument !== result)
- return false;
- }
- return true;
- }
- )(target, result) is true
-PASS (
- function testDocumentFragment(element, result)
- {
- for (var i = 0; i < 1e4; ++i) {
- if (element.ownerDocument !== result)
- return false;
- }
- return true;
- }
- )(target, result) is true
-
Deleted: tags/Safari-603.1.11/LayoutTests/js/dom/domjit-accessor-owner-document.html (208352 => 208353)
--- tags/Safari-603.1.11/LayoutTests/js/dom/domjit-accessor-owner-document.html 2016-11-03 22:53:59 UTC (rev 208352)
+++ tags/Safari-603.1.11/LayoutTests/js/dom/domjit-accessor-owner-document.html 2016-11-03 22:54:05 UTC (rev 208353)
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<iframe id="xmlframe" _onload_="frameLoaded()" style="height:0px" src="" version='1.0' encoding='UTF-8'?><body/>"></iframe>
-<script>
-description('Test DOMJIT nodeType accessor works.');
-
-if (window.testRunner)
- testRunner.waitUntilDone();
-
-var target = null;
-var result = null;
-function runTest()
-{
- var xmlDocument = document.getElementById('xmlframe').contentDocument;
- var targets = [
- ['Element', document.body, document],
- ['Attr', document.createAttribute('Cocoa'), document],
- ['Text', document.createTextNode('Cocoa'), document],
- ['CDATA', xmlDocument.createCDATASection('test'), xmlDocument],
- ['ProcessingInstruction', xmlDocument.createProcessingInstruction('target', 'test'), xmlDocument],
- ['Comment', document.createComment('Cocoa'), document],
- ['Document', document, null],
- ['XMLDocument', xmlDocument, null],
- ['DocumentType', document.doctype, document],
- ['DocumentFragment', document.createDocumentFragment(), document],
- ];
-
- for ([name, target, result] of targets) {
- var text = `
- function test${name}(element, result)
- {
- for (var i = 0; i < 1e4; ++i) {
- if (element.ownerDocument !== result)
- return false;
- }
- return true;
- }
- `;
- shouldBeTrue(`(${text})(target, result)`);
- }
-
- if (window.testRunner)
- testRunner.notifyDone();
-}
-function frameLoaded()
-{
- runTest();
-}
-</script>
-<script src=""
-</body>
-</html>
Modified: tags/Safari-603.1.11/Source/WebCore/ChangeLog (208352 => 208353)
--- tags/Safari-603.1.11/Source/WebCore/ChangeLog 2016-11-03 22:53:59 UTC (rev 208352)
+++ tags/Safari-603.1.11/Source/WebCore/ChangeLog 2016-11-03 22:54:05 UTC (rev 208353)
@@ -1,5 +1,20 @@
2016-11-03 Matthew Hanson <matthew_han...@apple.com>
+ Merge r208351. rdar://problem/29094221
+
+ 2016-11-03 Yusuke Suzuki <utatane....@gmail.com>
+
+ Unreviewed, rolling out due to crash in Amazon web site
+ https://bugs.webkit.org/show_bug.cgi?id=164380
+ <rdar://problem/29094221>
+
+ * dom/Node.idl:
+ * domjit/JSNodeDOMJIT.cpp:
+ (WebCore::NodeOwnerDocumentDOMJIT::checkDOM): Deleted.
+ (WebCore::NodeOwnerDocumentDOMJIT::callDOMGetter): Deleted.
+
+2016-11-03 Matthew Hanson <matthew_han...@apple.com>
+
Rollout r208149. rdar://problem/29098431
2016-11-03 Matthew Hanson <matthew_han...@apple.com>
Modified: tags/Safari-603.1.11/Source/WebCore/dom/Node.idl (208352 => 208353)
--- tags/Safari-603.1.11/Source/WebCore/dom/Node.idl 2016-11-03 22:53:59 UTC (rev 208352)
+++ tags/Safari-603.1.11/Source/WebCore/dom/Node.idl 2016-11-03 22:54:05 UTC (rev 208353)
@@ -53,7 +53,7 @@
[DOMJIT] readonly attribute Node? lastChild;
[DOMJIT] readonly attribute Node? previousSibling;
[DOMJIT] readonly attribute Node? nextSibling;
- [DOMJIT] readonly attribute Document? ownerDocument;
+ readonly attribute Document? ownerDocument;
[CEReactions, Custom, MayThrowLegacyException] Node insertBefore(Node newChild, Node? refChild);
[CEReactions, Custom, MayThrowLegacyException] Node replaceChild(Node newChild, Node oldChild);
Modified: tags/Safari-603.1.11/Source/WebCore/domjit/JSNodeDOMJIT.cpp (208352 => 208353)
--- tags/Safari-603.1.11/Source/WebCore/domjit/JSNodeDOMJIT.cpp 2016-11-03 22:53:59 UTC (rev 208352)
+++ tags/Safari-603.1.11/Source/WebCore/domjit/JSNodeDOMJIT.cpp 2016-11-03 22:54:05 UTC (rev 208353)
@@ -162,39 +162,6 @@
return patchpoint;
}
-Ref<JSC::DOMJIT::Patchpoint> NodeOwnerDocumentDOMJIT::checkDOM()
-{
- return DOMJIT::checkDOM<Node>();
}
-Ref<JSC::DOMJIT::CallDOMGetterPatchpoint> NodeOwnerDocumentDOMJIT::callDOMGetter()
-{
- const auto& heap = DOMJIT::AbstractHeapRepository::shared();
- Ref<JSC::DOMJIT::CallDOMGetterPatchpoint> patchpoint = JSC::DOMJIT::CallDOMGetterPatchpoint::create();
- patchpoint->numGPScratchRegisters = 1;
- patchpoint->setGenerator([=](CCallHelpers& jit, JSC::DOMJIT::PatchpointParams& params) {
- JSValueRegs result = params[0].jsValueRegs();
- GPRReg node = params[1].gpr();
- GPRReg globalObject = params[2].gpr();
- JSValue globalObjectValue = params[2].value();
- GPRReg scratch = params.gpScratch(0);
-
- // If the given node is a Document, Node#ownerDocument returns null.
- auto notDocument = DOMJIT::branchIfNotDocumentWrapper(jit, node);
- jit.moveValue(jsNull(), result);
- auto done = jit.jump();
-
- notDocument.link(&jit);
- jit.loadPtr(CCallHelpers::Address(node, JSNode::offsetOfWrapped()), scratch);
- DOMJIT::loadDocument(jit, scratch, scratch);
- DOMJIT::toWrapper<Document>(jit, params, scratch, globalObject, result, DOMJIT::toWrapperSlow<Document>, globalObjectValue);
- done.link(&jit);
- return CCallHelpers::JumpList();
- });
- patchpoint->effect = JSC::DOMJIT::Effect::forDef(heap.Node_ownerDocument);
- return patchpoint;
-}
-
-}
-
#endif
