Unreviewed, rolling out r94781.

http://trac.webkit.org/changeset/94781
https://bugs.webkit.org/show_bug.cgi?id=67806

Broke Objective-C binding on Mac (Requested by rniwa on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-09-08

Source/WebCore:

* dom/Element.idl:
* dom/Node.cpp:
(WebCore::Node::contains):
* dom/Node.idl:
* editing/DeleteSelectionCommand.cpp:
(WebCore::DeleteSelectionCommand::mergeParagraphs):

LayoutTests:

* fast/dom/Element/contains-method-expected.txt: Added.
* fast/dom/Element/contains-method.html: Renamed from LayoutTests/fast/dom/Node/contains-method.html.
* fast/dom/Element/script-tests/contains-method.js: Added.
* fast/dom/Node/contains-method-expected.txt: Removed.
* fast/dom/Node/script-tests/contains-method.js: Removed.
* fast/dom/Window/window-properties-expected.txt:
* perf/document-contains-expected.txt: Removed.
* perf/document-contains.html: Removed.
* platform/gtk/fast/dom/Window/window-properties-expected.txt:
* platform/mac/fast/dom/Window/window-properties-expected.txt:
* platform/qt-wk2/fast/dom/Window/window-properties-expected.txt:
* platform/qt/fast/dom/Window/window-properties-expected.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@94805 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e118c97d
2011-09-08 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r94781.
http://trac.webkit.org/changeset/94781
https://bugs.webkit.org/show_bug.cgi?id=67806
Broke Objective-C binding on Mac (Requested by rniwa on
#webkit).
* fast/dom/Element/contains-method-expected.txt: Added.
* fast/dom/Element/contains-method.html: Renamed from LayoutTests/fast/dom/Node/contains-method.html.
* fast/dom/Element/script-tests/contains-method.js: Added.
* fast/dom/Node/contains-method-expected.txt: Removed.
* fast/dom/Node/script-tests/contains-method.js: Removed.
* fast/dom/Window/window-properties-expected.txt:
* perf/document-contains-expected.txt: Removed.
* perf/document-contains.html: Removed.
* platform/gtk/fast/dom/Window/window-properties-expected.txt:
* platform/mac/fast/dom/Window/window-properties-expected.txt:
* platform/qt-wk2/fast/dom/Window/window-properties-expected.txt:
* platform/qt/fast/dom/Window/window-properties-expected.txt:
2011-09-08 Csaba Osztrogonác <ossy@webkit.org>
[WK2] evetSender.keyDown is unimplemented
This test checks behavior of Element.contains.
[test1 [test 2]]
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
PASS document.contains is undefined.
PASS test1.contains(test2) is true
PASS test1.contains(test1TextChild) is false
PASS test1.contains(123) is false
PASS test1.contains(null) is false
PASS successfullyParsed is true
TEST COMPLETE
description(
'This test checks behavior of Element.contains. <div id="test1">[test1 <span id="test2">[test 2]</span>]</div>'
);
var test1 = document.getElementById('test1');
var test1TextChild = document.getElementById('test1').firstChild;
var test2 = document.getElementById('test2');
shouldBeUndefined("document.contains");
shouldBeTrue("test1.contains(test2)");
shouldBeFalse("test1.contains(test1TextChild)");
shouldBeFalse("test1.contains(123)");
shouldBeFalse("test1.contains(null)");
var successfullyParsed = true;
This test checks behavior of Node.contains.
[test1 [test 2]]
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
PASS typeof document.contains is "function"
PASS test1.contains(test2) is true
PASS test1.contains(test1TextChild) is true
PASS document.contains(test1) is true
PASS document.contains(test1TextChild) is true
PASS document.contains(document) is true
PASS test1.contains(test1) is true
PASS test1TextChild.contains(test1TextChild) is true
PASS test1.contains(123) is false
PASS test1.contains(null) is false
PASS document.contains(iframe) is false
PASS iframe.contains(iframe) is true
iframe is now in document
PASS document.contains(iframe) is true
PASS document.contains(iframeDoc) is false
PASS iframeDoc.contains(iframeBody) is true
PASS document.contains(iframeBody) is false
PASS successfullyParsed is true
TEST COMPLETE
description(
'This test checks behavior of Node.contains. <div id="test1">[test1 <span id="test2">[test 2]</span>]</div>'
);
var test1 = document.getElementById('test1');
var test1TextChild = document.getElementById('test1').firstChild;
var test2 = document.getElementById('test2');
shouldBeEqualToString("typeof document.contains", "function");
shouldBeTrue("test1.contains(test2)");
shouldBeTrue("test1.contains(test1TextChild)");
shouldBeTrue("document.contains(test1)");
shouldBeTrue("document.contains(test1TextChild)");
shouldBeTrue("document.contains(document)");
shouldBeTrue("test1.contains(test1)");
shouldBeTrue("test1TextChild.contains(test1TextChild)");
shouldBeFalse("test1.contains(123)");
shouldBeFalse("test1.contains(null)");
// Cross document tests
var iframe = document.createElement("iframe");
shouldBeFalse("document.contains(iframe)"); // Not in document
shouldBeTrue("iframe.contains(iframe)");
document.body.appendChild(iframe);
debug('iframe is now in document');
shouldBeTrue("document.contains(iframe)");
var iframeDoc = iframe.contentDocument;
var iframeBody = iframeDoc.body;
shouldBeFalse("document.contains(iframeDoc)");
shouldBeTrue("iframeDoc.contains(iframeBody)");
shouldBeFalse("document.contains(iframeBody)");
var successfullyParsed = true;
......@@ -26,7 +26,6 @@ window.Attr.prototype.addEventListener [function]
window.Attr.prototype.appendChild [function]
window.Attr.prototype.cloneNode [function]
window.Attr.prototype.compareDocumentPosition [function]
window.Attr.prototype.contains [function]
window.Attr.prototype.dispatchEvent [function]
window.Attr.prototype.hasAttributes [function]
window.Attr.prototype.hasChildNodes [function]
......@@ -180,7 +179,6 @@ window.CDATASection.prototype.appendChild [function]
window.CDATASection.prototype.appendData [function]
window.CDATASection.prototype.cloneNode [function]
window.CDATASection.prototype.compareDocumentPosition [function]
window.CDATASection.prototype.contains [function]
window.CDATASection.prototype.deleteData [function]
window.CDATASection.prototype.dispatchEvent [function]
window.CDATASection.prototype.hasAttributes [function]
......@@ -452,7 +450,6 @@ window.CharacterData.prototype.appendChild [function]
window.CharacterData.prototype.appendData [function]
window.CharacterData.prototype.cloneNode [function]
window.CharacterData.prototype.compareDocumentPosition [function]
window.CharacterData.prototype.contains [function]
window.CharacterData.prototype.deleteData [function]
window.CharacterData.prototype.dispatchEvent [function]
window.CharacterData.prototype.hasAttributes [function]
......@@ -624,7 +621,6 @@ window.Document.prototype.appendChild [function]
window.Document.prototype.caretRangeFromPoint [function]
window.Document.prototype.cloneNode [function]
window.Document.prototype.compareDocumentPosition [function]
window.Document.prototype.contains [function]
window.Document.prototype.createAttribute [function]
window.Document.prototype.createAttributeNS [function]
window.Document.prototype.createCDATASection [function]
......@@ -699,7 +695,6 @@ window.DocumentFragment.prototype.addEventListener [function]
window.DocumentFragment.prototype.appendChild [function]
window.DocumentFragment.prototype.cloneNode [function]
window.DocumentFragment.prototype.compareDocumentPosition [function]
window.DocumentFragment.prototype.contains [function]
window.DocumentFragment.prototype.dispatchEvent [function]
window.DocumentFragment.prototype.hasAttributes [function]
window.DocumentFragment.prototype.hasChildNodes [function]
......@@ -740,7 +735,6 @@ window.DocumentType.prototype.addEventListener [function]
window.DocumentType.prototype.appendChild [function]
window.DocumentType.prototype.cloneNode [function]
window.DocumentType.prototype.compareDocumentPosition [function]
window.DocumentType.prototype.contains [function]
window.DocumentType.prototype.dispatchEvent [function]
window.DocumentType.prototype.hasAttributes [function]
window.DocumentType.prototype.hasChildNodes [function]
......@@ -848,7 +842,6 @@ window.Entity.prototype.addEventListener [function]
window.Entity.prototype.appendChild [function]
window.Entity.prototype.cloneNode [function]
window.Entity.prototype.compareDocumentPosition [function]
window.Entity.prototype.contains [function]
window.Entity.prototype.dispatchEvent [function]
window.Entity.prototype.hasAttributes [function]
window.Entity.prototype.hasChildNodes [function]
......@@ -887,7 +880,6 @@ window.EntityReference.prototype.addEventListener [function]
window.EntityReference.prototype.appendChild [function]
window.EntityReference.prototype.cloneNode [function]
window.EntityReference.prototype.compareDocumentPosition [function]
window.EntityReference.prototype.contains [function]
window.EntityReference.prototype.dispatchEvent [function]
window.EntityReference.prototype.hasAttributes [function]
window.EntityReference.prototype.hasChildNodes [function]
......@@ -1260,7 +1252,6 @@ window.Node.prototype.addEventListener [function]
window.Node.prototype.appendChild [function]
window.Node.prototype.cloneNode [function]
window.Node.prototype.compareDocumentPosition [function]
window.Node.prototype.contains [function]
window.Node.prototype.dispatchEvent [function]
window.Node.prototype.hasAttributes [function]
window.Node.prototype.hasChildNodes [function]
......
Tests that document.contains is O(1).
PASS
PASS
PASS
<!DOCTYPE html>
<script src="../resources/magnitude-perf.js"></script>
<body>
<script>
var doc, node, expected;
function appendDeepTree(magnitude)
{
for (var i = 0; i < magnitude; i++) {
node = node.appendChild(doc.createElement('div'));
}
}
// Tests that contains is O(1) for document where the test |node| is in the document.
function setup1(magnitude)
{
node = document.body;
doc = document;
expected = true;
appendDeepTree(magnitude);
}
// Tests that contains is O(1) for document when the test |node| is not in the document.
function setup2(magnitude)
{
node = document.createElement('div'); // Not added to the document
doc = document;
expected = false;
appendDeepTree(magnitude);
}
// Tests that contains is O(1) for document when the test |node| is in a different document.
function setup3(magnitude)
{
var iframe = document.body.appendChild(document.createElement('iframe'));
doc = iframe.contentDocument;
node = doc.body; // Different document.
expected = false;
appendDeepTree(magnitude);
}
function test(magnitude)
{
var actual = document.contains(node);
if (actual !== expected)
throw 'Unexpected return value: ' + actual + ', expected: ' + expected;
}
Magnitude.description('Tests that document.contains is O(1).');
Magnitude.run(setup1, test, Magnitude.CONSTANT);
Magnitude.run(setup2, test, Magnitude.CONSTANT);
Magnitude.run(setup3, test, Magnitude.CONSTANT);
</script>
</body>
......@@ -26,7 +26,6 @@ window.Attr.prototype.addEventListener [function]
window.Attr.prototype.appendChild [function]
window.Attr.prototype.cloneNode [function]
window.Attr.prototype.compareDocumentPosition [function]
window.Attr.prototype.contains [function]
window.Attr.prototype.dispatchEvent [function]
window.Attr.prototype.hasAttributes [function]
window.Attr.prototype.hasChildNodes [function]
......@@ -180,7 +179,6 @@ window.CDATASection.prototype.appendChild [function]
window.CDATASection.prototype.appendData [function]
window.CDATASection.prototype.cloneNode [function]
window.CDATASection.prototype.compareDocumentPosition [function]
window.CDATASection.prototype.contains [function]
window.CDATASection.prototype.deleteData [function]
window.CDATASection.prototype.dispatchEvent [function]
window.CDATASection.prototype.hasAttributes [function]
......@@ -452,7 +450,6 @@ window.CharacterData.prototype.appendChild [function]
window.CharacterData.prototype.appendData [function]
window.CharacterData.prototype.cloneNode [function]
window.CharacterData.prototype.compareDocumentPosition [function]
window.CharacterData.prototype.contains [function]
window.CharacterData.prototype.deleteData [function]
window.CharacterData.prototype.dispatchEvent [function]
window.CharacterData.prototype.hasAttributes [function]
......@@ -677,7 +674,6 @@ window.Document.prototype.appendChild [function]
window.Document.prototype.caretRangeFromPoint [function]
window.Document.prototype.cloneNode [function]
window.Document.prototype.compareDocumentPosition [function]
window.Document.prototype.contains [function]
window.Document.prototype.createAttribute [function]
window.Document.prototype.createAttributeNS [function]
window.Document.prototype.createCDATASection [function]
......@@ -752,7 +748,6 @@ window.DocumentFragment.prototype.addEventListener [function]
window.DocumentFragment.prototype.appendChild [function]
window.DocumentFragment.prototype.cloneNode [function]
window.DocumentFragment.prototype.compareDocumentPosition [function]
window.DocumentFragment.prototype.contains [function]
window.DocumentFragment.prototype.dispatchEvent [function]
window.DocumentFragment.prototype.hasAttributes [function]
window.DocumentFragment.prototype.hasChildNodes [function]
......@@ -793,7 +788,6 @@ window.DocumentType.prototype.addEventListener [function]
window.DocumentType.prototype.appendChild [function]
window.DocumentType.prototype.cloneNode [function]
window.DocumentType.prototype.compareDocumentPosition [function]
window.DocumentType.prototype.contains [function]
window.DocumentType.prototype.dispatchEvent [function]
window.DocumentType.prototype.hasAttributes [function]
window.DocumentType.prototype.hasChildNodes [function]
......@@ -901,7 +895,6 @@ window.Entity.prototype.addEventListener [function]
window.Entity.prototype.appendChild [function]
window.Entity.prototype.cloneNode [function]
window.Entity.prototype.compareDocumentPosition [function]
window.Entity.prototype.contains [function]
window.Entity.prototype.dispatchEvent [function]
window.Entity.prototype.hasAttributes [function]
window.Entity.prototype.hasChildNodes [function]
......@@ -940,7 +933,6 @@ window.EntityReference.prototype.addEventListener [function]
window.EntityReference.prototype.appendChild [function]
window.EntityReference.prototype.cloneNode [function]
window.EntityReference.prototype.compareDocumentPosition [function]
window.EntityReference.prototype.contains [function]
window.EntityReference.prototype.dispatchEvent [function]
window.EntityReference.prototype.hasAttributes [function]
window.EntityReference.prototype.hasChildNodes [function]
......@@ -1341,7 +1333,6 @@ window.Node.prototype.addEventListener [function]
window.Node.prototype.appendChild [function]
window.Node.prototype.cloneNode [function]
window.Node.prototype.compareDocumentPosition [function]
window.Node.prototype.contains [function]
window.Node.prototype.dispatchEvent [function]
window.Node.prototype.hasAttributes [function]
window.Node.prototype.hasChildNodes [function]
......
......@@ -26,7 +26,6 @@ window.Attr.prototype.addEventListener [function]
window.Attr.prototype.appendChild [function]
window.Attr.prototype.cloneNode [function]
window.Attr.prototype.compareDocumentPosition [function]
window.Attr.prototype.contains [function]
window.Attr.prototype.dispatchEvent [function]
window.Attr.prototype.hasAttributes [function]
window.Attr.prototype.hasChildNodes [function]
......@@ -180,7 +179,6 @@ window.CDATASection.prototype.appendChild [function]
window.CDATASection.prototype.appendData [function]
window.CDATASection.prototype.cloneNode [function]
window.CDATASection.prototype.compareDocumentPosition [function]
window.CDATASection.prototype.contains [function]
window.CDATASection.prototype.deleteData [function]
window.CDATASection.prototype.dispatchEvent [function]
window.CDATASection.prototype.hasAttributes [function]
......@@ -452,7 +450,6 @@ window.CharacterData.prototype.appendChild [function]
window.CharacterData.prototype.appendData [function]
window.CharacterData.prototype.cloneNode [function]
window.CharacterData.prototype.compareDocumentPosition [function]
window.CharacterData.prototype.contains [function]
window.CharacterData.prototype.deleteData [function]
window.CharacterData.prototype.dispatchEvent [function]
window.CharacterData.prototype.hasAttributes [function]
......@@ -677,7 +674,6 @@ window.Document.prototype.appendChild [function]
window.Document.prototype.caretRangeFromPoint [function]
window.Document.prototype.cloneNode [function]
window.Document.prototype.compareDocumentPosition [function]
window.Document.prototype.contains [function]
window.Document.prototype.createAttribute [function]
window.Document.prototype.createAttributeNS [function]
window.Document.prototype.createCDATASection [function]
......@@ -752,7 +748,6 @@ window.DocumentFragment.prototype.addEventListener [function]
window.DocumentFragment.prototype.appendChild [function]
window.DocumentFragment.prototype.cloneNode [function]
window.DocumentFragment.prototype.compareDocumentPosition [function]
window.DocumentFragment.prototype.contains [function]
window.DocumentFragment.prototype.dispatchEvent [function]
window.DocumentFragment.prototype.hasAttributes [function]
window.DocumentFragment.prototype.hasChildNodes [function]
......@@ -793,7 +788,6 @@ window.DocumentType.prototype.addEventListener [function]
window.DocumentType.prototype.appendChild [function]
window.DocumentType.prototype.cloneNode [function]
window.DocumentType.prototype.compareDocumentPosition [function]
window.DocumentType.prototype.contains [function]
window.DocumentType.prototype.dispatchEvent [function]
window.DocumentType.prototype.hasAttributes [function]
window.DocumentType.prototype.hasChildNodes [function]
......@@ -901,7 +895,6 @@ window.Entity.prototype.addEventListener [function]
window.Entity.prototype.appendChild [function]
window.Entity.prototype.cloneNode [function]
window.Entity.prototype.compareDocumentPosition [function]
window.Entity.prototype.contains [function]
window.Entity.prototype.dispatchEvent [function]
window.Entity.prototype.hasAttributes [function]
window.Entity.prototype.hasChildNodes [function]
......@@ -940,7 +933,6 @@ window.EntityReference.prototype.addEventListener [function]
window.EntityReference.prototype.appendChild [function]
window.EntityReference.prototype.cloneNode [function]
window.EntityReference.prototype.compareDocumentPosition [function]
window.EntityReference.prototype.contains [function]
window.EntityReference.prototype.dispatchEvent [function]
window.EntityReference.prototype.hasAttributes [function]
window.EntityReference.prototype.hasChildNodes [function]
......@@ -1339,7 +1331,6 @@ window.Node.prototype.addEventListener [function]
window.Node.prototype.appendChild [function]
window.Node.prototype.cloneNode [function]
window.Node.prototype.compareDocumentPosition [function]
window.Node.prototype.contains [function]
window.Node.prototype.dispatchEvent [function]
window.Node.prototype.hasAttributes [function]
window.Node.prototype.hasChildNodes [function]
......
......@@ -26,7 +26,6 @@ window.Attr.prototype.addEventListener [function]
window.Attr.prototype.appendChild [function]
window.Attr.prototype.cloneNode [function]
window.Attr.prototype.compareDocumentPosition [function]
window.Attr.prototype.contains [function]
window.Attr.prototype.dispatchEvent [function]
window.Attr.prototype.hasAttributes [function]
window.Attr.prototype.hasChildNodes [function]
......@@ -178,7 +177,6 @@ window.CDATASection.prototype.appendChild [function]
window.CDATASection.prototype.appendData [function]
window.CDATASection.prototype.cloneNode [function]
window.CDATASection.prototype.compareDocumentPosition [function]
window.CDATASection.prototype.contains [function]
window.CDATASection.prototype.deleteData [function]
window.CDATASection.prototype.dispatchEvent [function]
window.CDATASection.prototype.hasAttributes [function]
......@@ -450,7 +448,6 @@ window.CharacterData.prototype.appendChild [function]
window.CharacterData.prototype.appendData [function]
window.CharacterData.prototype.cloneNode [function]
window.CharacterData.prototype.compareDocumentPosition [function]
window.CharacterData.prototype.contains [function]
window.CharacterData.prototype.deleteData [function]
window.CharacterData.prototype.dispatchEvent [function]
window.CharacterData.prototype.hasAttributes [function]
......@@ -622,7 +619,6 @@ window.Document.prototype.appendChild [function]
window.Document.prototype.caretRangeFromPoint [function]
window.Document.prototype.cloneNode [function]
window.Document.prototype.compareDocumentPosition [function]
window.Document.prototype.contains [function]
window.Document.prototype.createAttribute [function]
window.Document.prototype.createAttributeNS [function]
window.Document.prototype.createCDATASection [function]
......@@ -698,7 +694,6 @@ window.DocumentFragment.prototype.addEventListener [function]
window.DocumentFragment.prototype.appendChild [function]
window.DocumentFragment.prototype.cloneNode [function]
window.DocumentFragment.prototype.compareDocumentPosition [function]
window.DocumentFragment.prototype.contains [function]
window.DocumentFragment.prototype.dispatchEvent [function]
window.DocumentFragment.prototype.hasAttributes [function]
window.DocumentFragment.prototype.hasChildNodes [function]
......@@ -739,7 +734,6 @@ window.DocumentType.prototype.addEventListener [function]
window.DocumentType.prototype.appendChild [function]
window.DocumentType.prototype.cloneNode [function]
window.DocumentType.prototype.compareDocumentPosition [function]
window.DocumentType.prototype.contains [function]
window.DocumentType.prototype.dispatchEvent [function]
window.DocumentType.prototype.hasAttributes [function]
window.DocumentType.prototype.hasChildNodes [function]
......@@ -844,7 +838,6 @@ window.Entity.prototype.addEventListener [function]
window.Entity.prototype.appendChild [function]
window.Entity.prototype.cloneNode [function]
window.Entity.prototype.compareDocumentPosition [function]
window.Entity.prototype.contains [function]
window.Entity.prototype.dispatchEvent [function]
window.Entity.prototype.hasAttributes [function]
window.Entity.prototype.hasChildNodes [function]
......@@ -883,7 +876,6 @@ window.EntityReference.prototype.addEventListener [function]
window.EntityReference.prototype.appendChild [function]
window.EntityReference.prototype.cloneNode [function]
window.EntityReference.prototype.compareDocumentPosition [function]
window.EntityReference.prototype.contains [function]
window.EntityReference.prototype.dispatchEvent [function]
window.EntityReference.prototype.hasAttributes [function]
window.EntityReference.prototype.hasChildNodes [function]
......@@ -1256,7 +1248,6 @@ window.Node.prototype.addEventListener [function]
window.Node.prototype.appendChild [function]
window.Node.prototype.cloneNode [function]
window.Node.prototype.compareDocumentPosition [function]
window.Node.prototype.contains [function]
window.Node.prototype.dispatchEvent [function]
window.Node.prototype.hasAttributes [function]
window.Node.prototype.hasChildNodes [function]
......
......@@ -26,7 +26,6 @@ window.Attr.prototype.addEventListener [function]
window.Attr.prototype.appendChild [function]
window.Attr.prototype.cloneNode [function]
window.Attr.prototype.compareDocumentPosition [function]
window.Attr.prototype.contains [function]
window.Attr.prototype.dispatchEvent [function]
window.Attr.prototype.hasAttributes [function]
window.Attr.prototype.hasChildNodes [function]
......@@ -178,7 +177,6 @@ window.CDATASection.prototype.appendChild [function]
window.CDATASection.prototype.appendData [function]
window.CDATASection.prototype.cloneNode [function]
window.CDATASection.prototype.compareDocumentPosition [function]
window.CDATASection.prototype.contains [function]
window.CDATASection.prototype.deleteData [function]
window.CDATASection.prototype.dispatchEvent [function]
window.CDATASection.prototype.hasAttributes [function]
......@@ -450,7 +448,6 @@ window.CharacterData.prototype.appendChild [function]
window.CharacterData.prototype.appendData [function]
window.CharacterData.prototype.cloneNode [function]
window.CharacterData.prototype.compareDocumentPosition [function]
window.CharacterData.prototype.contains [function]
window.CharacterData.prototype.deleteData [function]
window.CharacterData.prototype.dispatchEvent [function]
window.CharacterData.prototype.hasAttributes [function]
......@@ -675,7 +672,6 @@ window.Document.prototype.appendChild [function]
window.Document.prototype.caretRangeFromPoint [function]
window.Document.prototype.cloneNode [function]
window.Document.prototype.compareDocumentPosition [function]
window.Document.prototype.contains [function]
window.Document.prototype.createAttribute [function]
window.Document.prototype.createAttributeNS [function]
window.Document.prototype.createCDATASection [function]
......@@ -751,7 +747,6 @@ window.DocumentFragment.prototype.addEventListener [function]
window.DocumentFragment.prototype.appendChild [function]
window.DocumentFragment.prototype.cloneNode [function]
window.DocumentFragment.prototype.compareDocumentPosition [function]
window.DocumentFragment.prototype.contains [function]
window.DocumentFragment.prototype.dispatchEvent [function]
window.DocumentFragment.prototype.hasAttributes [function]
window.DocumentFragment.prototype.hasChildNodes [function]
......@@ -792,7 +787,6 @@ window.DocumentType.prototype.addEventListener [function]
window.DocumentType.prototype.appendChild [function]
window.DocumentType.prototype.cloneNode [function]
window.DocumentType.prototype.compareDocumentPosition [function]
window.DocumentType.prototype.contains [function]
window.DocumentType.prototype.dispatchEvent [function]
window.DocumentType.prototype.hasAttributes [function]
window.DocumentType.prototype.hasChildNodes [function]
......@@ -897,7 +891,6 @@ window.Entity.prototype.addEventListener [function]
window.Entity.prototype.appendChild [function]
window.Entity.prototype.cloneNode [function]
window.Entity.prototype.compareDocumentPosition [function]
window.Entity.prototype.contains [function]
window.Entity.prototype.dispatchEvent [function]
window.Entity.prototype.hasAttributes [function]
window.Entity.prototype.hasChildNodes [function]
......@@ -936,7 +929,6 @@ window.EntityReference.prototype.addEventListener [function]
window.EntityReference.prototype.appendChild [function]
window.EntityReference.prototype.cloneNode [function]
window.EntityReference.prototype.compareDocumentPosition [function]
window.EntityReference.prototype.contains [function]
window.EntityReference.prototype.dispatchEvent [function]
window.EntityReference.prototype.hasAttributes [function]
window.EntityReference.prototype.hasChildNodes [function]
......@@ -1335,7 +1327,6 @@ window.Node.prototype.addEventListener [function]
window.Node.prototype.appendChild [function]
window.Node.prototype.cloneNode [function]
window.Node.prototype.compareDocumentPosition [function]
window.Node.prototype.contains [function]
window.Node.prototype.dispatchEvent [function]
window.Node.prototype.hasAttributes [function]
window.Node.prototype.hasChildNodes [function]
......
2011-09-08 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r94781.
http://trac.webkit.org/changeset/94781
https://bugs.webkit.org/show_bug.cgi?id=67806
Broke Objective-C binding on Mac (Requested by rniwa on
#webkit).
* dom/Element.idl:
* dom/Node.cpp:
(WebCore::Node::contains):
* dom/Node.idl:
* editing/DeleteSelectionCommand.cpp:
(WebCore::DeleteSelectionCommand::mergeParagraphs):
2011-09-08 Eric Seidel <eric@webkit.org>
Remove DocumentWriter::setDecoder as a grep of WebKit shows no callers
......@@ -85,6 +85,10 @@ module core {
void blur();
void scrollIntoView(in [Optional] boolean alignWithTop);
// IE extensions
boolean contains(in [Optional=CallWithDefaultValue] Element element);
// WebKit extensions
void scrollIntoViewIfNeeded(in [Optional] boolean centerIfNeeded);
......
......@@ -1338,8 +1338,6 @@ bool Node::contains(const Node* node) const
{
if (!node)
return false;
if (document() == this)
return node->document() == this && node->inDocument();
return this == node || node->isDescendantOf(this);
}
......
......@@ -118,9 +118,6 @@ module core {
unsigned short compareDocumentPosition(in [Optional=CallWithDefaultValue] Node other);
// Introduced in DOM4
boolean contains(in [Optional=CallWithDefaultValue] Node other);
#if 0
DOMObject getFeature(in DOMString feature,
in DOMString version);
......
......@@ -605,7 +605,7 @@ void DeleteSelectionCommand::mergeParagraphs()
// m_downstreamEnd's block has been emptied out by deletion. There is no content inside of it to
// move, so just remove it.
Element* endBlock = static_cast<Element*>(enclosingBlock(m_downstreamEnd.deprecatedNode()));
if (!endBlock || !endBlock->contains(startOfParagraphToMove.deepEquivalent().deprecatedNode()) || !startOfParagraphToMove.deepEquivalent().deprecatedNode()) {
if (!startOfParagraphToMove.deepEquivalent().deprecatedNode() || !endBlock->contains(startOfParagraphToMove.deepEquivalent().deprecatedNode())) {
removeNode(enclosingBlock(m_downstreamEnd.deprecatedNode()));
return;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment