- Revision
- 88717
- Author
- commit-qu...@webkit.org
- Date
- 2011-06-13 15:37:16 -0700 (Mon, 13 Jun 2011)
Log Message
2011-06-13 Wyatt Carss <wca...@google.com>
Reviewed by Ryosuke Niwa.
dump-as-markup conversion: editing/pasteboard/paste-xml.xhtml
https://bugs.webkit.org/show_bug.cgi?id=58159
Converted to dump the key part of page as text. The platform-dependent files are
copied from the previous setup of this test, as mac appears to do something different
in its delegate info -- 'insertText' instead of 'insertNode', and some differences
in how it counts indices. Note that chromium-mac works the same as chromium-win, but
would hit mac first. GTK appears to pass for now; if tests fail we'll reorganize these
a bit accordingly.
* editing/pasteboard/paste-xml.xhtml:
* platform/chromium-linux/editing/pasteboard/paste-xml-expected.png: Removed.
* platform/chromium-mac/editing/pasteboard/paste-xml-expected.txt:
* platform/chromium-win/editing/pasteboard/paste-xml-expected.png: Removed.
* platform/chromium-win/editing/pasteboard/paste-xml-expected.txt:
* platform/chromium/test_expectations.txt:
* platform/mac/editing/pasteboard/paste-xml-expected.png: Removed.
* platform/mac/editing/pasteboard/paste-xml-expected.txt:
* platform/win/editing/pasteboard/paste-xml-expected.txt:
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (88716 => 88717)
--- trunk/LayoutTests/ChangeLog 2011-06-13 22:36:45 UTC (rev 88716)
+++ trunk/LayoutTests/ChangeLog 2011-06-13 22:37:16 UTC (rev 88717)
@@ -1,3 +1,27 @@
+2011-06-13 Wyatt Carss <wca...@google.com>
+
+ Reviewed by Ryosuke Niwa.
+
+ dump-as-markup conversion: editing/pasteboard/paste-xml.xhtml
+ https://bugs.webkit.org/show_bug.cgi?id=58159
+
+ Converted to dump the key part of page as text. The platform-dependent files are
+ copied from the previous setup of this test, as mac appears to do something different
+ in its delegate info -- 'insertText' instead of 'insertNode', and some differences
+ in how it counts indices. Note that chromium-mac works the same as chromium-win, but
+ would hit mac first. GTK appears to pass for now; if tests fail we'll reorganize these
+ a bit accordingly.
+
+ * editing/pasteboard/paste-xml.xhtml:
+ * platform/chromium-linux/editing/pasteboard/paste-xml-expected.png: Removed.
+ * platform/chromium-mac/editing/pasteboard/paste-xml-expected.txt:
+ * platform/chromium-win/editing/pasteboard/paste-xml-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-xml-expected.txt:
+ * platform/chromium/test_expectations.txt:
+ * platform/mac/editing/pasteboard/paste-xml-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-xml-expected.txt:
+ * platform/win/editing/pasteboard/paste-xml-expected.txt:
+
2011-06-13 Mark Pilgrim <pilg...@chromium.org>
Reviewed by Eric Seidel.
Modified: trunk/LayoutTests/editing/pasteboard/paste-xml.xhtml (88716 => 88717)
--- trunk/LayoutTests/editing/pasteboard/paste-xml.xhtml 2011-06-13 22:36:45 UTC (rev 88716)
+++ trunk/LayoutTests/editing/pasteboard/paste-xml.xhtml 2011-06-13 22:37:16 UTC (rev 88717)
@@ -37,7 +37,7 @@
</div>
<script>
-runEditingTest();
+runDumpAsTextEditingTest(true);
</script>
</body>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (88716 => 88717)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-06-13 22:36:45 UTC (rev 88716)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-06-13 22:37:16 UTC (rev 88717)
@@ -3214,7 +3214,6 @@
BUGCR780807 : http/tests/misc/webtiming-origins.html = PASS TEXT
BUGCR78835 : plugins/npp-set-window-called-during-destruction.html = CRASH
-BUGWK58158 : editing/pasteboard/paste-xml.xhtml = PASS TEXT
BUGCR78988 LINUX : svg/zoom/text/absolute-sized-document-no-scrollbars.svg = CRASH PASS
BUGCR78996 DEBUG : fast/css/first-of-type-pseudo-class.html = PASS TEXT
// http://trac.webkit.org/changeset/83411/ merged some frame tests into one.
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-xml-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-mac/editing/pasteboard/paste-xml-expected.txt (88716 => 88717)
--- trunk/LayoutTests/platform/chromium-mac/editing/pasteboard/paste-xml-expected.txt 2011-06-13 22:36:45 UTC (rev 88716)
+++ trunk/LayoutTests/platform/chromium-mac/editing/pasteboard/paste-xml-expected.txt 2011-06-13 22:37:16 UTC (rev 88717)
@@ -15,18 +15,6 @@
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > span > div > body > html > #document to 1 of #text > span > div > body > html > #document toDOMRange:range from 3 of #text > span > div > body > html > #document to 3 of #text > span > div > body > html > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x72
- RenderBlock {html} at (0,0) size 800x72
- RenderBody {body} at (8,8) size 784x56
- RenderBlock {div} at (0,0) size 784x56 [border: (2px solid #FF0000)]
- RenderInline {span} at (0,0) size 140x28
- RenderText {#text} at (14,14) size 69x28
- text run at (14,14) width 69: "foo bar"
- RenderText {#text} at (83,14) size 31x28
- text run at (83,14) width 31: "bar"
- RenderText {#text} at (114,14) size 40x28
- text run at (114,14) width 40: " baz"
- RenderText {#text} at (0,0) size 0x0
-caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of body
+foo barbar baz
+execCopyCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo bar baz</span>
+execPasteCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo barbar baz</span>
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-xml-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-xml-expected.txt (88716 => 88717)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-xml-expected.txt 2011-06-13 22:36:45 UTC (rev 88716)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-xml-expected.txt 2011-06-13 22:37:16 UTC (rev 88717)
@@ -15,18 +15,6 @@
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of #text > span > div > body > html > #document to 1 of #text > span > div > body > html > #document toDOMRange:range from 3 of #text > span > div > body > html > #document to 3 of #text > span > div > body > html > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x72
- RenderBlock {html} at (0,0) size 800x72
- RenderBody {body} at (8,8) size 784x56
- RenderBlock {div} at (0,0) size 784x56 [border: (2px solid #FF0000)]
- RenderInline {span} at (0,0) size 139x27
- RenderText {#text} at (14,14) size 69x27
- text run at (14,14) width 69: "foo bar"
- RenderText {#text} at (83,14) size 31x27
- text run at (83,14) width 31: "bar"
- RenderText {#text} at (114,14) size 39x27
- text run at (114,14) width 39: " baz"
- RenderText {#text} at (0,0) size 0x0
-caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of body
+foo barbar baz
+execCopyCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo bar baz</span>
+execPasteCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo barbar baz</span>
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-xml-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/win/editing/pasteboard/paste-xml-expected.txt (88716 => 88717)
--- trunk/LayoutTests/platform/win/editing/pasteboard/paste-xml-expected.txt 2011-06-13 22:36:45 UTC (rev 88716)
+++ trunk/LayoutTests/platform/win/editing/pasteboard/paste-xml-expected.txt 2011-06-13 22:37:16 UTC (rev 88717)
@@ -1,15 +1,3 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x72
- RenderBlock {html} at (0,0) size 800x72
- RenderBody {body} at (8,8) size 784x56
- RenderBlock {div} at (0,0) size 784x56 [border: (2px solid #FF0000)]
- RenderInline {span} at (0,0) size 140x28
- RenderText {#text} at (14,14) size 69x28
- text run at (14,14) width 69: "foo bar"
- RenderText {#text} at (83,14) size 31x28
- text run at (83,14) width 31: "bar"
- RenderText {#text} at (114,14) size 40x28
- text run at (114,14) width 40: " baz"
- RenderText {#text} at (0,0) size 0x0
-caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of body
+foo barbar baz
+execCopyCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo bar baz</span>
+execPasteCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo barbar baz</span>
