Reviewed by Maciej.

        http://bugs.webkit.org/show_bug.cgi?id=15506
        editing/pasteboard/paste-into-anchor-text.html accesses an external resource

        Removed the external resource reference and made the test dump as text.

        * editing/pasteboard/paste-into-anchor-text-expected.txt: Copied from platform/mac/editing/pasteboard/paste-into-anchor-text-expected.txt.
        * editing/pasteboard/paste-into-anchor-text.html:
        * platform/mac/editing/pasteboard/paste-into-anchor-text-expected.checksum: Removed.
        * platform/mac/editing/pasteboard/paste-into-anchor-text-expected.png: Removed.
        * platform/mac/editing/pasteboard/paste-into-anchor-text-expected.txt: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@26654 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 99ec6fab42397d4df17d3d9a4f12ae39a6ef6922..9e4cdb3580b2ecd799e9783f19d58fa7ba147a46 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2007-10-16  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Maciej.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15506
+        editing/pasteboard/paste-into-anchor-text.html accesses an external resource
+
+        Removed the external resource reference and made the test dump as text.
+
+        * editing/pasteboard/paste-into-anchor-text-expected.txt: Copied from platform/mac/editing/pasteboard/paste-into-anchor-text-expected.txt.
+        * editing/pasteboard/paste-into-anchor-text.html:
+        * platform/mac/editing/pasteboard/paste-into-anchor-text-expected.checksum: Removed.
+        * platform/mac/editing/pasteboard/paste-into-anchor-text-expected.png: Removed.
+        * platform/mac/editing/pasteboard/paste-into-anchor-text-expected.txt: Removed.
+
 2007-10-15  Geoffrey Garen  <ggaren@apple.com>
 
         Fixed layout test for reals. Changed \r\n to \n, fixing mass confusion.

diff --git a/LayoutTests/editing/pasteboard/paste-into-anchor-text-expected.txt b/LayoutTests/editing/pasteboard/paste-into-anchor-text-expected.txt
new file mode 100644 (file)
index 0000000..68d7a7b
--- /dev/null
+++ b/LayoutTests/editing/pasteboard/paste-into-anchor-text-expected.txt
@@ -0,0 +1,10 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 11 of #text > A > B > TD > TR > TBODY > TABLE > TD > TR > TBODY > TABLE > DIV > BODY > HTML > #document to 11 of #text > A > B > TD > TR > TBODY > TABLE > TD > TR > TBODY > TABLE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+  
+Canton Repository (subscription)                                                       all 7hello world9 news articles                                  
+

diff --git a/LayoutTests/editing/pasteboard/paste-into-anchor-text.html b/LayoutTests/editing/pasteboard/paste-into-anchor-text.html
index 60caeadaff2d58180d4d9b97d2adf93df4448fe9..f164ccf914a822faae0c7315cbbb0de569813a5e 100644 (file)
--- a/LayoutTests/editing/pasteboard/paste-into-anchor-text.html
+++ b/LayoutTests/editing/pasteboard/paste-into-anchor-text.html
@@ -1,6 +1,8 @@
 <script>
-if (window.layoutTestController)
+if (window.layoutTestController) {
+     layoutTestController.dumpAsText();
      layoutTestController.dumpEditingCallbacks();
+}
 </script>
 <script type="text/javascript" src="../editing.js"></script>
 <div contenteditable>
@@ -12,7 +14,7 @@ if (window.layoutTestController)
                     <span class="Apple-style-span" style="text-decoration:underline;">
                         <td>
                             <a href="http://www.cantonrep.com/index.php?ID=373537&Category=17&subCategoryID=30" id=r-11i_1119206349>
-                                <img src=http://news.google.com/news?imgefp=Se6UJuKIqiUJ&imgurl=www.cantonrep.com/photos/2007/08/m_31mOhio_State.jpg width=80 height=80 alt="" border=1>
+                                <img src="" width=80 height=80 alt="" border=1>
                                 <br>
                                 <font size=-2>Canton Repository (subscription)</font>
                             </a>

diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-into-anchor-text-expected.checksum b/LayoutTests/platform/mac/editing/pasteboard/paste-into-anchor-text-expected.checksum
deleted file mode 100644 (file)
index 4fe22a5..0000000
--- a/LayoutTests/platform/mac/editing/pasteboard/paste-into-anchor-text-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-3e980fa43ba47867ac50d6e310e1f98f
\ No newline at end of file

diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-into-anchor-text-expected.png b/LayoutTests/platform/mac/editing/pasteboard/paste-into-anchor-text-expected.png
deleted file mode 100644 (file)
index 98917d7..0000000
Binary files a/LayoutTests/platform/mac/editing/pasteboard/paste-into-anchor-text-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/mac/editing/pasteboard/paste-into-anchor-text-expected.txt b/LayoutTests/platform/mac/editing/pasteboard/paste-into-anchor-text-expected.txt
deleted file mode 100644 (file)
index d7f8dca..0000000
--- a/LayoutTests/platform/mac/editing/pasteboard/paste-into-anchor-text-expected.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 11 of #text > A > B > TD > TR > TBODY > TABLE > TD > TR > TBODY > TABLE > DIV > BODY > HTML > #document to 11 of #text > A > B > TD > TR > TBODY > TABLE > TD > TR > TBODY > TABLE > 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 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (0,0) size 784x116
-        RenderTable {TABLE} at (0,0) size 476x116
-          RenderTableSection {TBODY} at (0,0) size 476x116
-            RenderTableRow {TR} at (0,2) size 476x112
-              RenderTableCell {TD} at (2,2) size 472x112 [r=0 c=0 rs=1 cs=1]
-layer at (11,11) size 470x110
-  RenderTable {TABLE} at (1,1) size 470x110
-    RenderTableSection {TBODY} at (0,0) size 470x110
-      RenderTableRow {TR} at (0,2) size 470x106
-        RenderTableCell {TD} at (2,54) size 2x2 [r=0 c=0 rs=1 cs=1]
-          RenderInline {FONT} at (0,0) size 0x0 [color=#FF0000]
-            RenderText {#text} at (0,0) size 0x0
-            RenderInline {SPAN} at (0,0) size 0x0
-              RenderText {#text} at (0,0) size 0x0
-        RenderTableCell {TD} at (6,2) size 136x106 [r=0 c=1 rs=1 cs=1]
-          RenderInline {A} at (0,0) size 138x36 [color=#0000EE]
-            RenderText {#text} at (0,0) size 0x0
-            RenderImage {IMG} at (1,1) size 82x82 [border: (1px solid #0000EE)]
-            RenderText {#text} at (83,69) size 4x18
-              text run at (83,69) width 4: " "
-            RenderBR {BR} at (0,0) size 0x0
-            RenderInline {FONT} at (0,0) size 134x13
-              RenderText {#text} at (1,91) size 134x13
-                text run at (1,91) width 134: "Canton Repository (subscription)"
-            RenderText {#text} at (135,87) size 4x18
-              text run at (135,87) width 4: "                             "
-          RenderText {#text} at (139,87) size 0x18
-            text run at (139,87) width -4: "                         "
-        RenderTableCell {TD} at (144,2) size 316x20 [r=0 c=2 rs=1 cs=1]
-          RenderInline {B} at (0,0) size 314x18
-            RenderInline {A} at (0,0) size 104x18 [color=#0000EE]
-              RenderText {#text} at (1,1) size 28x18
-                text run at (1,1) width 28: "all 7"
-              RenderText {#text} at (29,1) size 76x18
-                text run at (29,1) width 76: "hello world"
-            RenderInline {SPAN} at (0,0) size 210x18 [color=#0000EE]
-              RenderInline {B} at (0,0) size 98x18
-                RenderText {#text} at (105,1) size 98x18
-                  text run at (105,1) width 98: "9 news articles"
-              RenderText {#text} at (203,1) size 112x18
-                text run at (203,1) width 112: "                            "
-        RenderTableCell {TD} at (462,2) size 2x20 [r=0 c=3 rs=1 cs=1]
-          RenderBR {BR} at (1,1) size 0x18
-        RenderTableCell {TD} at (466,54) size 2x2 [r=0 c=4 rs=1 cs=1]
-caret: position 11 of child 1 {#text} of child 0 {A} of child 2 {B} of child 4 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 0 {DIV} of child 2 {BODY} of child 0 {HTML} of document