Diff
Modified: trunk/ChangeLog (109401 => 109402)
--- trunk/ChangeLog 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/ChangeLog 2012-03-01 20:55:53 UTC (rev 109402)
@@ -1,3 +1,15 @@
+2012-03-01 Kangil Han <[email protected]>
+
+ [DRT] Remove all PlainTextController usages in existing tests by adding internal API
+ https://bugs.webkit.org/show_bug.cgi?id=78570
+
+ Reviewed by Hajime Morita.
+
+ This patch will remove all PlainTextController usages
+ in existing DRT tests by adding internal API to WebCore/testing/Internals
+
+ * Source/autotools/symbols.filter:
+
2012-02-29 Ryosuke Niwa <[email protected]>
Perf-o-matic build fix. Also toggle the switch to start using ping images on the dashboard after r109190.
Modified: trunk/LayoutTests/ChangeLog (109401 => 109402)
--- trunk/LayoutTests/ChangeLog 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/LayoutTests/ChangeLog 2012-03-01 20:55:53 UTC (rev 109402)
@@ -1,3 +1,16 @@
+2012-03-01 Kangil Han <[email protected]>
+
+ [DRT] Remove all PlainTextController usages in existing tests by adding internal API
+ https://bugs.webkit.org/show_bug.cgi?id=78570
+
+ Reviewed by Hajime Morita.
+
+ This patch will remove all PlainTextController usages
+ in existing DRT tests by adding internal API to WebCore/testing/Internals
+
+ * editing/text-iterator/basic-iteration-expected.txt:
+ * editing/text-iterator/script-tests/basic-iteration.js:
+
2012-03-01 Adam Klein <[email protected]>
Rebaseline to remove quotes around font name after r109382.
Modified: trunk/LayoutTests/editing/text-iterator/basic-iteration-expected.txt (109401 => 109402)
--- trunk/LayoutTests/editing/text-iterator/basic-iteration-expected.txt 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/LayoutTests/editing/text-iterator/basic-iteration-expected.txt 2012-03-01 20:55:53 UTC (rev 109402)
@@ -3,17 +3,17 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS range.selectNodeContents(testDocument.body); plainText.plainText(range) is ""
-PASS range.selectNodeContents(testDocument.body); plainText.plainText(range) is "a"
-PASS range.selectNodeContents(testDocument.body); plainText.plainText(range) is "a"
-PASS range.selectNodeContents(testDocument.body); plainText.plainText(range) is "a\nb"
-PASS range.selectNodeContents(testDocument.body); plainText.plainText(range) is "debugging this note"
-FAIL range.selectNodeContents(testDocument.body); plainText.plainText(range) should be Hello
+PASS range.selectNodeContents(testDocument.body); internals.rangeAsText(range) is ""
+PASS range.selectNodeContents(testDocument.body); internals.rangeAsText(range) is "a"
+PASS range.selectNodeContents(testDocument.body); internals.rangeAsText(range) is "a"
+PASS range.selectNodeContents(testDocument.body); internals.rangeAsText(range) is "a\nb"
+PASS range.selectNodeContents(testDocument.body); internals.rangeAsText(range) is "debugging this note"
+FAIL range.selectNodeContents(testDocument.body); internals.rangeAsText(range) should be Hello
. Was Hello
.
-PASS range.selectNodeContents(testDocument.body); plainText.plainText(range) is "hey"
-PASS range.setStartBefore(testDocument.body); range.setEndAfter(testDocument.body); plainText.plainText(range) is "hey"
+PASS range.selectNodeContents(testDocument.body); internals.rangeAsText(range) is "hey"
+PASS range.setStartBefore(testDocument.body); range.setEndAfter(testDocument.body); internals.rangeAsText(range) is "hey"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/editing/text-iterator/script-tests/basic-iteration.js (109401 => 109402)
--- trunk/LayoutTests/editing/text-iterator/script-tests/basic-iteration.js 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/LayoutTests/editing/text-iterator/script-tests/basic-iteration.js 2012-03-01 20:55:53 UTC (rev 109402)
@@ -10,26 +10,26 @@
testDocument.documentElement.insertBefore(head, testDocument.documentElement.firstChild);
testDocument.body.innerHTML = '';
-shouldBe('range.selectNodeContents(testDocument.body); plainText.plainText(range)', '""');
+shouldBe('range.selectNodeContents(testDocument.body); internals.rangeAsText(range)', '""');
testDocument.body.innerHTML = 'a';
-shouldBe('range.selectNodeContents(testDocument.body); plainText.plainText(range)', '"a"');
+shouldBe('range.selectNodeContents(testDocument.body); internals.rangeAsText(range)', '"a"');
testDocument.body.innerHTML = '<div>a</div>';
-shouldBe('range.selectNodeContents(testDocument.body); plainText.plainText(range)', '"a"');
+shouldBe('range.selectNodeContents(testDocument.body); internals.rangeAsText(range)', '"a"');
testDocument.body.innerHTML = '<div>a</div><div>b</div>';
-shouldBe('range.selectNodeContents(testDocument.body); plainText.plainText(range)', '"a\\nb"');
+shouldBe('range.selectNodeContents(testDocument.body); internals.rangeAsText(range)', '"a\\nb"');
testDocument.body.innerHTML = '<div style="line-height: 18px; min-height: 436px; " id="node-content" class="note-content">debugging this note</div>';
-shouldBe('range.selectNodeContents(testDocument.body); plainText.plainText(range)', '"debugging this note"');
+shouldBe('range.selectNodeContents(testDocument.body); internals.rangeAsText(range)', '"debugging this note"');
testDocument.body.innerHTML = '<div>Hello<div><span><span><br></div></div>';
-shouldBe('range.selectNodeContents(testDocument.body); plainText.plainText(range)', '"Hello\\n"');
+shouldBe('range.selectNodeContents(testDocument.body); internals.rangeAsText(range)', '"Hello\\n"');
testDocument.body.innerHTML = '<div class="note-rule-vertical" style="left:22px"></div>\n\t\t<div class="note-rule-vertical" style="left:26px"></div>\n\n\t\t<div class="note-wrapper">\n\t\t\t<div class="note-header">\n\t\t\t\t<div class="note-body" id="note-body">\n\t\t\t\t\t<div class="note-content" id="note-content" contenteditable="true" style="line-height: 20px; min-height: 580px; ">hey</div>\n\t\t\t\t</div>\n\t\t\t</div>\n\t\t</div>\n\t\n';
-shouldBe('range.selectNodeContents(testDocument.body); plainText.plainText(range)', '"hey"');
-shouldBe('range.setStartBefore(testDocument.body); range.setEndAfter(testDocument.body); plainText.plainText(range)', '"hey"');
+shouldBe('range.selectNodeContents(testDocument.body); internals.rangeAsText(range)', '"hey"');
+shouldBe('range.setStartBefore(testDocument.body); range.setEndAfter(testDocument.body); internals.rangeAsText(range)', '"hey"');
document.body.removeChild(subframe);
Modified: trunk/Source/WebCore/ChangeLog (109401 => 109402)
--- trunk/Source/WebCore/ChangeLog 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/Source/WebCore/ChangeLog 2012-03-01 20:55:53 UTC (rev 109402)
@@ -1,3 +1,22 @@
+2012-03-01 Kangil Han <[email protected]>
+
+ [DRT] Remove all PlainTextController usages in existing tests by adding internal API
+ https://bugs.webkit.org/show_bug.cgi?id=78570
+
+ Reviewed by Hajime Morita.
+
+ This patch will remove all PlainTextController usages
+ in existing DRT tests by adding internal API to WebCore/testing/Internals
+
+ Changed editing/text-iterator/script-tests/basic-iteration.js to use internals.rangeAsText
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::rangeAsText):
+ (WebCore):
+ * testing/Internals.h:
+ (Internals):
+ * testing/Internals.idl:
+
2012-03-01 Adam Barth <[email protected]>
DOMWindow shouldn't have any INDEXED_DATABASE ifdefs
Modified: trunk/Source/WebCore/testing/Internals.cpp (109401 => 109402)
--- trunk/Source/WebCore/testing/Internals.cpp 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/Source/WebCore/testing/Internals.cpp 2012-03-01 20:55:53 UTC (rev 109402)
@@ -546,6 +546,16 @@
return length;
}
+String Internals::rangeAsText(const Range* range, ExceptionCode& ec)
+{
+ if (!range) {
+ ec = INVALID_ACCESS_ERR;
+ return String();
+ }
+
+ return range->text();
+}
+
int Internals::lastSpellCheckRequestSequence(Document* document, ExceptionCode& ec)
{
SpellChecker* checker = spellchecker(document);
Modified: trunk/Source/WebCore/testing/Internals.h (109401 => 109402)
--- trunk/Source/WebCore/testing/Internals.h 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/Source/WebCore/testing/Internals.h 2012-03-01 20:55:53 UTC (rev 109402)
@@ -106,6 +106,7 @@
PassRefPtr<Range> rangeFromLocationAndLength(Element* scope, int rangeLocation, int rangeLength, ExceptionCode&);
unsigned locationFromRange(Element* scope, const Range*, ExceptionCode&);
unsigned lengthFromRange(Element* scope, const Range*, ExceptionCode&);
+ String rangeAsText(const Range*, ExceptionCode&);
int lastSpellCheckRequestSequence(Document*, ExceptionCode&);
int lastSpellCheckProcessedSequence(Document*, ExceptionCode&);
Modified: trunk/Source/WebCore/testing/Internals.idl (109401 => 109402)
--- trunk/Source/WebCore/testing/Internals.idl 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/Source/WebCore/testing/Internals.idl 2012-03-01 20:55:53 UTC (rev 109402)
@@ -82,6 +82,7 @@
Range rangeFromLocationAndLength(in Element scope, in long rangeLocation, in long rangeLength) raises (DOMException);
unsigned long locationFromRange(in Element scope, in Range range) raises (DOMException);
unsigned long lengthFromRange(in Element scope, in Range range) raises (DOMException);
+ DOMString rangeAsText(in Range range) raises (DOMException);
long lastSpellCheckRequestSequence(in Document document) raises (DOMException);
long lastSpellCheckProcessedSequence(in Document document) raises (DOMException);
Modified: trunk/Source/WebKit2/ChangeLog (109401 => 109402)
--- trunk/Source/WebKit2/ChangeLog 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-01 20:55:53 UTC (rev 109402)
@@ -1,3 +1,16 @@
+2012-03-01 Kangil Han <[email protected]>
+
+ [DRT] Remove all PlainTextController usages in existing tests by adding internal API
+ https://bugs.webkit.org/show_bug.cgi?id=78570
+
+ Reviewed by Hajime Morita.
+
+ This patch will remove all PlainTextController usages
+ in existing DRT tests by adding internal API to WebCore/testing/Internals
+
+ * win/WebKit2.def:
+ * win/WebKit2CFLite.def:
+
2012-03-01 Nikolas Zimmermann <[email protected]>
Unreviewed, rolling out r109255.
Modified: trunk/Source/WebKit2/win/WebKit2.def (109401 => 109402)
--- trunk/Source/WebKit2/win/WebKit2.def 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/Source/WebKit2/win/WebKit2.def 2012-03-01 20:55:53 UTC (rev 109402)
@@ -193,6 +193,7 @@
?setFixedElementsLayoutRelativeToFrame@Settings@WebCore@@QAEX_N@Z
?shadowTree@Element@WebCore@@QBEPAVShadowTree@2@XZ
?suggestedValue@HTMLInputElement@WebCore@@QBEABVString@WTF@@XZ
+ ?text@Range@WebCore@@QBE?AVString@WTF@@XZ
?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
?toElement@WebCore@@YAPAVElement@1@VJSValue@JSC@@@Z
?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVClientRect@1@@Z
Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (109401 => 109402)
--- trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-03-01 20:55:53 UTC (rev 109402)
@@ -186,6 +186,7 @@
?setFixedElementsLayoutRelativeToFrame@Settings@WebCore@@QAEX_N@Z
?shadowTree@Element@WebCore@@QBEPAVShadowTree@2@XZ
?suggestedValue@HTMLInputElement@WebCore@@QBEABVString@WTF@@XZ
+ ?text@Range@WebCore@@QBE?AVString@WTF@@XZ
?toDocument@WebCore@@YAPAVDocument@1@VJSValue@JSC@@@Z
?toElement@WebCore@@YAPAVElement@1@VJSValue@JSC@@@Z
?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVClientRect@1@@Z
Modified: trunk/Source/autotools/symbols.filter (109401 => 109402)
--- trunk/Source/autotools/symbols.filter 2012-03-01 20:54:43 UTC (rev 109401)
+++ trunk/Source/autotools/symbols.filter 2012-03-01 20:55:53 UTC (rev 109402)
@@ -85,6 +85,7 @@
_ZNK7WebCore8Document4pageEv;
_ZNK7WebCore8Document8settingsEv;
_ZNK7WebCore8Document4viewEv;
+_ZNK7WebCore5Range4textEv;
_ZNK7WebCore9TreeScope14getElementByIdERKN3WTF12AtomicStringE;
_ZNK7WebCore14DocumentMarker11descriptionEv;
_ZN7WebCore14ScrollableArea28setScrollOffsetFromInternalsERKNS_8IntPointE;
