Changeset 88717 in webkit


Ignore:
Timestamp:
Jun 13, 2011 3:37:16 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-13 Wyatt Carss <wcarss@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:
Location:
trunk/LayoutTests
Files:
3 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r88715 r88717  
     12011-06-13  Wyatt Carss  <wcarss@google.com>
     2
     3        Reviewed by Ryosuke Niwa.
     4
     5        dump-as-markup conversion: editing/pasteboard/paste-xml.xhtml
     6        https://bugs.webkit.org/show_bug.cgi?id=58159
     7
     8        Converted to dump the key part of page as text. The platform-dependent files are
     9        copied from the previous setup of this test, as mac appears to do something different
     10        in its delegate info -- 'insertText' instead of 'insertNode', and some differences
     11        in how it counts indices. Note that chromium-mac works the same as chromium-win, but
     12        would hit mac first. GTK appears to pass for now; if tests fail we'll reorganize these
     13        a bit accordingly.
     14
     15        * editing/pasteboard/paste-xml.xhtml:
     16        * platform/chromium-linux/editing/pasteboard/paste-xml-expected.png: Removed.
     17        * platform/chromium-mac/editing/pasteboard/paste-xml-expected.txt:
     18        * platform/chromium-win/editing/pasteboard/paste-xml-expected.png: Removed.
     19        * platform/chromium-win/editing/pasteboard/paste-xml-expected.txt:
     20        * platform/chromium/test_expectations.txt:
     21        * platform/mac/editing/pasteboard/paste-xml-expected.png: Removed.
     22        * platform/mac/editing/pasteboard/paste-xml-expected.txt:
     23        * platform/win/editing/pasteboard/paste-xml-expected.txt:
     24
    1252011-06-13  Mark Pilgrim  <pilgrim@chromium.org>
    226
  • trunk/LayoutTests/editing/pasteboard/paste-xml.xhtml

    r20092 r88717  
    3838
    3939<script>
    40 runEditingTest();
     40runDumpAsTextEditingTest(true);
    4141</script>
    4242
  • trunk/LayoutTests/platform/chromium-mac/editing/pasteboard/paste-xml-expected.txt

    r80132 r88717  
    1616EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    1717EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    18 layer at (0,0) size 800x600
    19   RenderView at (0,0) size 800x600
    20 layer at (0,0) size 800x72
    21   RenderBlock {html} at (0,0) size 800x72
    22     RenderBody {body} at (8,8) size 784x56
    23       RenderBlock {div} at (0,0) size 784x56 [border: (2px solid #FF0000)]
    24         RenderInline {span} at (0,0) size 140x28
    25           RenderText {#text} at (14,14) size 69x28
    26             text run at (14,14) width 69: "foo bar"
    27           RenderText {#text} at (83,14) size 31x28
    28             text run at (83,14) width 31: "bar"
    29           RenderText {#text} at (114,14) size 40x28
    30             text run at (114,14) width 40: " baz"
    31         RenderText {#text} at (0,0) size 0x0
    32 caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of body
     18foo barbar baz
     19execCopyCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo bar baz</span>
     20execPasteCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo barbar baz</span>
  • trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-xml-expected.txt

    r80132 r88717  
    1616EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    1717EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    18 layer at (0,0) size 800x600
    19   RenderView at (0,0) size 800x600
    20 layer at (0,0) size 800x72
    21   RenderBlock {html} at (0,0) size 800x72
    22     RenderBody {body} at (8,8) size 784x56
    23       RenderBlock {div} at (0,0) size 784x56 [border: (2px solid #FF0000)]
    24         RenderInline {span} at (0,0) size 139x27
    25           RenderText {#text} at (14,14) size 69x27
    26             text run at (14,14) width 69: "foo bar"
    27           RenderText {#text} at (83,14) size 31x27
    28             text run at (83,14) width 31: "bar"
    29           RenderText {#text} at (114,14) size 39x27
    30             text run at (114,14) width 39: " baz"
    31         RenderText {#text} at (0,0) size 0x0
    32 caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of body
     18foo barbar baz
     19execCopyCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo bar baz</span>
     20execPasteCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo barbar baz</span>
  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r88697 r88717  
    32153215
    32163216BUGCR78835 : plugins/npp-set-window-called-during-destruction.html = CRASH
    3217 BUGWK58158 : editing/pasteboard/paste-xml.xhtml = PASS TEXT
    32183217BUGCR78988 LINUX : svg/zoom/text/absolute-sized-document-no-scrollbars.svg = CRASH PASS
    32193218BUGCR78996 DEBUG : fast/css/first-of-type-pseudo-class.html = PASS TEXT
  • trunk/LayoutTests/platform/win/editing/pasteboard/paste-xml-expected.txt

    r86989 r88717  
    1 layer at (0,0) size 800x600
    2   RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x72
    4   RenderBlock {html} at (0,0) size 800x72
    5     RenderBody {body} at (8,8) size 784x56
    6       RenderBlock {div} at (0,0) size 784x56 [border: (2px solid #FF0000)]
    7         RenderInline {span} at (0,0) size 140x28
    8           RenderText {#text} at (14,14) size 69x28
    9             text run at (14,14) width 69: "foo bar"
    10           RenderText {#text} at (83,14) size 31x28
    11             text run at (83,14) width 31: "bar"
    12           RenderText {#text} at (114,14) size 40x28
    13             text run at (114,14) width 40: " baz"
    14         RenderText {#text} at (0,0) size 0x0
    15 caret: position 3 of child 1 {#text} of child 1 {span} of child 1 {div} of body
     1foo barbar baz
     2execCopyCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo bar baz</span>
     3execPasteCommand: <span xmlns="http://www.w3.org/1999/xhtml" id="test">foo barbar baz</span>
Note: See TracChangeset for help on using the changeset viewer.