Reviewed by Justin.
authorharrison <harrison@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Mar 2006 19:21:02 +0000 (19:21 +0000)
committerharrison <harrison@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Mar 2006 19:21:02 +0000 (19:21 +0000)
        <rdar://problem/4444693> REGRESSION: Deleting empty lines causes quoted text to mistakenly get "unquoted"

        * editing/deleting/delete-block-merge-contents-022-expected.checksum: Added.
        * editing/deleting/delete-block-merge-contents-022-expected.png: Added.
        * editing/deleting/delete-block-merge-contents-022-expected.txt: Added.
        * editing/deleting/delete-block-merge-contents-022.html: Added.
        * editing/deleting/delete-block-merge-contents-023-expected.checksum: Added.
        * editing/deleting/delete-block-merge-contents-023-expected.png: Added.
        * editing/deleting/delete-block-merge-contents-023-expected.txt: Added.
        * editing/deleting/delete-block-merge-contents-023.html: Added.
        * editing/deleting/delete-block-merge-contents-024-expected.checksum: Added.
        * editing/deleting/delete-block-merge-contents-024-expected.png: Added.
        * editing/deleting/delete-block-merge-contents-024-expected.txt: Added.
        * editing/deleting/delete-block-merge-contents-024.html: Added.

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

13 files changed:
LayoutTests/ChangeLog
LayoutTests/editing/deleting/delete-block-merge-contents-022-expected.checksum [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-022-expected.png [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-022-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-022.html [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-023-expected.checksum [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-023-expected.png [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-023-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-023.html [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-024-expected.checksum [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-024-expected.png [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-024-expected.txt [new file with mode: 0644]
LayoutTests/editing/deleting/delete-block-merge-contents-024.html [new file with mode: 0644]

index 85e05b2b14759bf59032ee2b67b1b9b6c252ec4c..d188478a9d56a7bea41777ec1108ee1fc643872b 100644 (file)
@@ -1,3 +1,22 @@
+2006-03-30  David Harrison  <harrison@apple.com>
+
+        Reviewed by Justin.
+
+        <rdar://problem/4444693> REGRESSION: Deleting empty lines causes quoted text to mistakenly get "unquoted"
+
+        * editing/deleting/delete-block-merge-contents-022-expected.checksum: Added.
+        * editing/deleting/delete-block-merge-contents-022-expected.png: Added.
+        * editing/deleting/delete-block-merge-contents-022-expected.txt: Added.
+        * editing/deleting/delete-block-merge-contents-022.html: Added.
+        * editing/deleting/delete-block-merge-contents-023-expected.checksum: Added.
+        * editing/deleting/delete-block-merge-contents-023-expected.png: Added.
+        * editing/deleting/delete-block-merge-contents-023-expected.txt: Added.
+        * editing/deleting/delete-block-merge-contents-023.html: Added.
+        * editing/deleting/delete-block-merge-contents-024-expected.checksum: Added.
+        * editing/deleting/delete-block-merge-contents-024-expected.png: Added.
+        * editing/deleting/delete-block-merge-contents-024-expected.txt: Added.
+        * editing/deleting/delete-block-merge-contents-024.html: Added.
+
 2006-03-30  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 
         Test: fast/forms/visual-hebrew-text-field.html
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-022-expected.checksum b/LayoutTests/editing/deleting/delete-block-merge-contents-022-expected.checksum
new file mode 100644 (file)
index 0000000..9133066
--- /dev/null
@@ -0,0 +1 @@
+8662c0ef079842311537d16bc1312323
\ No newline at end of file
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-022-expected.png b/LayoutTests/editing/deleting/delete-block-merge-contents-022-expected.png
new file mode 100644 (file)
index 0000000..6b05b18
Binary files /dev/null and b/LayoutTests/editing/deleting/delete-block-merge-contents-022-expected.png differ
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-022-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-022-expected.txt
new file mode 100644 (file)
index 0000000..ec85ced
--- /dev/null
@@ -0,0 +1,31 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 6 of BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 2 of #text > DIV > DIV > BODY > HTML > #document to 2 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+layer at (0,0) size 800x600
+  RenderCanvas 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 784x84 [border: (2px solid #0000FF)]
+        RenderText {TEXT} at (14,14) size 753x56
+          text run at (14,14) width 753: "Should see \"XX\" in outer red box, and another \"XX\" in an orange box nested "
+          text run at (14,42) width 144: "in a green box."
+      RenderBlock {DIV} at (0,108) size 784x140
+        RenderBlock {DIV} at (0,0) size 784x140 [border: (2px solid #FF0000)]
+          RenderBlock (anonymous) at (14,14) size 756x28
+            RenderText {TEXT} at (0,0) size 17x28
+              text run at (0,0) width 17: "X"
+            RenderText {TEXT} at (17,0) size 17x28
+              text run at (17,0) width 17: "X"
+          RenderBlock {DIV} at (14,42) size 756x84 [border: (2px solid #008000)]
+            RenderBlock {DIV} at (14,14) size 728x56 [border: (2px solid #FFA500)]
+              RenderText {TEXT} at (14,14) size 34x28
+                text run at (14,14) width 34: "XX"
+caret: position 2 of child 0 {TEXT} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-022.html b/LayoutTests/editing/deleting/delete-block-merge-contents-022.html
new file mode 100644 (file)
index 0000000..c7197f6
--- /dev/null
@@ -0,0 +1,52 @@
+<html> 
+<head>
+
+<style>
+.editing { 
+    border: 2px solid red; 
+    padding: 12px; 
+    font-size: 24px; 
+}
+.explanation { 
+    border: 2px solid blue; 
+    padding: 12px; 
+    font-size: 24px; 
+    margin-bottom: 24px;
+}
+</style>
+<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
+
+<script>
+
+function editingTest() {
+    moveSelectionForwardByCharacterCommand();
+    extendSelectionForwardByLineCommand();
+    extendSelectionForwardByLineCommand();
+    extendSelectionForwardByCharacterCommand();
+    deleteCommand();
+}
+
+</script>
+
+<title>Editing Test</title> 
+</head> 
+<body contenteditable="true">
+<div class="explanation">
+Should see "XX" in outer red box, and another "XX" in an orange box nested in a green box.
+</div>
+
+<div id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
+<div id="test" class="editing">
+X
+<div class="editing" style="border-color: green;">
+<div class="editing" style="border-color: purple;">should not see this content</div><div class="editing" style="border-color: yellow;">XX</div><div class="editing" style="border-color: orange;">XX</div>
+</div>
+</div>
+</div>
+
+<script>
+runEditingTest();
+</script>
+
+</body>
+</html>
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-023-expected.checksum b/LayoutTests/editing/deleting/delete-block-merge-contents-023-expected.checksum
new file mode 100644 (file)
index 0000000..316b110
--- /dev/null
@@ -0,0 +1 @@
+96384cdb3ea4ce40bff1de6f41e285ba
\ No newline at end of file
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-023-expected.png b/LayoutTests/editing/deleting/delete-block-merge-contents-023-expected.png
new file mode 100644 (file)
index 0000000..9143e6c
Binary files /dev/null and b/LayoutTests/editing/deleting/delete-block-merge-contents-023-expected.png differ
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-023-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-023-expected.txt
new file mode 100644 (file)
index 0000000..0725be8
--- /dev/null
@@ -0,0 +1,25 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 7 of BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+layer at (0,0) size 800x600
+  RenderCanvas 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 784x56 [border: (2px solid #0000FF)]
+        RenderText {TEXT} at (14,14) size 516x28
+          text run at (14,14) width 516: "Should see \"XX\" in a yellow box nested in a red box."
+      RenderBlock {DIV} at (0,80) size 784x62
+        RenderBlock {DIV} at (0,0) size 784x62 [border: (2px solid #FF0000)]
+          RenderBlock (anonymous) at (14,14) size 756x0
+          RenderBlock {DIV} at (14,14) size 756x34 [border: (3px solid #FFFF00)]
+            RenderBlock (anonymous) at (3,3) size 750x0
+            RenderBlock {DIV} at (3,3) size 750x28
+              RenderText {TEXT} at (0,0) size 34x28
+                text run at (0,0) width 34: "XX"
+caret: position 0 of child 0 {TEXT} of child 0 {DIV} of child 0 {DIV} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-023.html b/LayoutTests/editing/deleting/delete-block-merge-contents-023.html
new file mode 100644 (file)
index 0000000..7ed224b
--- /dev/null
@@ -0,0 +1,50 @@
+<html> 
+<head>
+
+<style>
+.editing { 
+    border: 2px solid red; 
+    padding: 12px; 
+    font-size: 24px; 
+}
+.explanation { 
+    border: 2px solid blue; 
+    padding: 12px; 
+    font-size: 24px; 
+    margin-bottom: 24px;
+}
+</style>
+<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
+
+<script>
+
+function editingTest() {
+    extendSelectionForwardByLineCommand();
+    extendSelectionForwardByLineCommand();
+    deleteCommand();
+}
+
+</script>
+
+<title>Editing Test</title> 
+</head> 
+<body contenteditable="true">
+<div class="explanation">
+Should see "XX" in a yellow box nested in a red box.
+</div>
+
+<div id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
+<div id="test" class="editing">
+AA
+<div style="border-style:solid; border-color: yellow;">
+should not see this content<div>XX</div></div>
+</div>
+</div>
+</div>
+
+<script>
+runEditingTest();
+</script>
+
+</body>
+</html>
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-024-expected.checksum b/LayoutTests/editing/deleting/delete-block-merge-contents-024-expected.checksum
new file mode 100644 (file)
index 0000000..309458b
--- /dev/null
@@ -0,0 +1 @@
+1a281884db08c936770a1e322c5d776f
\ No newline at end of file
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-024-expected.png b/LayoutTests/editing/deleting/delete-block-merge-contents-024-expected.png
new file mode 100644 (file)
index 0000000..c7ccf5a
Binary files /dev/null and b/LayoutTests/editing/deleting/delete-block-merge-contents-024-expected.png differ
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-024-expected.txt b/LayoutTests/editing/deleting/delete-block-merge-contents-024-expected.txt
new file mode 100644 (file)
index 0000000..d8b16ee
--- /dev/null
@@ -0,0 +1,26 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 7 of BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+layer at (0,0) size 800x600
+  RenderCanvas 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 784x56 [border: (2px solid #0000FF)]
+        RenderText {TEXT} at (14,14) size 499x28
+          text run at (14,14) width 499: "Should see \"X\" in a yellow box nested in a red box."
+      RenderBlock {DIV} at (0,80) size 784x62
+        RenderBlock {DIV} at (0,0) size 784x62 [border: (2px solid #FF0000)]
+          RenderBlock (anonymous) at (14,14) size 756x0
+          RenderBlock {DIV} at (14,14) size 756x34 [border: (3px solid #FFFF00)]
+            RenderBlock (anonymous) at (3,3) size 750x0
+            RenderBlock {DIV} at (3,3) size 750x28
+              RenderText {TEXT} at (0,0) size 17x28
+                text run at (0,0) width 17: "X"
+caret: position 0 of child 0 {TEXT} of child 0 {DIV} of child 0 {DIV} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/editing/deleting/delete-block-merge-contents-024.html b/LayoutTests/editing/deleting/delete-block-merge-contents-024.html
new file mode 100644 (file)
index 0000000..2bc8e9a
--- /dev/null
@@ -0,0 +1,51 @@
+<html> 
+<head>
+
+<style>
+.editing { 
+    border: 2px solid red; 
+    padding: 12px; 
+    font-size: 24px; 
+}
+.explanation { 
+    border: 2px solid blue; 
+    padding: 12px; 
+    font-size: 24px; 
+    margin-bottom: 24px;
+}
+</style>
+<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
+
+<script>
+
+function editingTest() {
+    extendSelectionForwardByLineCommand();
+    extendSelectionForwardByLineCommand();
+    extendSelectionForwardByCharacterCommand();
+    deleteCommand();
+}
+
+</script>
+
+<title>Editing Test</title> 
+</head> 
+<body contenteditable="true">
+<div class="explanation">
+Should see "X" in a yellow box nested in a red box.
+</div>
+
+<div id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
+<div id="test" class="editing">
+AA
+<div style="border-style:solid; border-color: yellow;">
+should not see this content<div>XX</div></div>
+</div>
+</div>
+</div>
+
+<script>
+runEditingTest();
+</script>
+
+</body>
+</html>