[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:55:40 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 562e0ee4bcd78a22466e0266d7fa86e43b17a2b7
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 25 12:31:13 2010 +0000
2010-10-25 Benjamin Kalman <kalman at chromium.org>
Reviewed by Kent Tamura.
Make editing/deleting/5390681.html and
editing/deleting/delete-mixed-editable-content-001.html use Markup
instead of render tree.
https://bugs.webkit.org/show_bug.cgi?id=48112
* editing/deleting/5390681-expected.txt: Added.
* editing/deleting/5390681.html: Updated to use Markup instead of
render tree.
* editing/deleting/delete-mixed-editable-content-001-expected.txt: Added.
* editing/deleting/delete-mixed-editable-content-001.html: Updated to
use Markup instead of render tree.
* platform/chromium-linux/editing/deleting/5390681-expected.checksum: Removed.
* platform/chromium-linux/editing/deleting/5390681-expected.png: Removed.
* platform/chromium-linux/editing/deleting/delete-mixed-editable-content-001-expected.checksum: Removed.
* platform/chromium-linux/editing/deleting/delete-mixed-editable-content-001-expected.png: Removed.
* platform/chromium-win/editing/deleting/5390681-expected.checksum: Removed.
* platform/chromium-win/editing/deleting/5390681-expected.png: Removed.
* platform/chromium-win/editing/deleting/5390681-expected.txt: Removed.
* platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.checksum: Removed.
* platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.png: Removed.
* platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.txt: Removed.
* platform/gtk/editing/deleting/5390681-expected.txt: Removed.
* platform/mac-leopard/editing/deleting/5390681-expected.checksum: Removed.
* platform/mac-leopard/editing/deleting/5390681-expected.png: Removed.
* platform/mac/editing/deleting/5390681-expected.checksum: Removed.
* platform/mac/editing/deleting/5390681-expected.png: Removed.
* platform/mac/editing/deleting/5390681-expected.txt: Removed.
* platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.checksum: Removed.
* platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.png: Removed.
* platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.txt: Removed.
* platform/qt/editing/deleting/5390681-expected.txt: Removed.
* platform/qt/editing/deleting/delete-mixed-editable-content-001-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0e04b58..5aae9ed 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,40 @@
+2010-10-25 Benjamin Kalman <kalman at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ Make editing/deleting/5390681.html and
+ editing/deleting/delete-mixed-editable-content-001.html use Markup
+ instead of render tree.
+ https://bugs.webkit.org/show_bug.cgi?id=48112
+
+ * editing/deleting/5390681-expected.txt: Added.
+ * editing/deleting/5390681.html: Updated to use Markup instead of
+ render tree.
+ * editing/deleting/delete-mixed-editable-content-001-expected.txt: Added.
+ * editing/deleting/delete-mixed-editable-content-001.html: Updated to
+ use Markup instead of render tree.
+ * platform/chromium-linux/editing/deleting/5390681-expected.checksum: Removed.
+ * platform/chromium-linux/editing/deleting/5390681-expected.png: Removed.
+ * platform/chromium-linux/editing/deleting/delete-mixed-editable-content-001-expected.checksum: Removed.
+ * platform/chromium-linux/editing/deleting/delete-mixed-editable-content-001-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5390681-expected.checksum: Removed.
+ * platform/chromium-win/editing/deleting/5390681-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5390681-expected.txt: Removed.
+ * platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.checksum: Removed.
+ * platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.txt: Removed.
+ * platform/gtk/editing/deleting/5390681-expected.txt: Removed.
+ * platform/mac-leopard/editing/deleting/5390681-expected.checksum: Removed.
+ * platform/mac-leopard/editing/deleting/5390681-expected.png: Removed.
+ * platform/mac/editing/deleting/5390681-expected.checksum: Removed.
+ * platform/mac/editing/deleting/5390681-expected.png: Removed.
+ * platform/mac/editing/deleting/5390681-expected.txt: Removed.
+ * platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.checksum: Removed.
+ * platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.png: Removed.
+ * platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.txt: Removed.
+ * platform/qt/editing/deleting/5390681-expected.txt: Removed.
+ * platform/qt/editing/deleting/delete-mixed-editable-content-001-expected.txt: Removed.
+
2010-10-25 Ariya Hidayat <ariya at sencha.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/editing/deleting/5390681-expected.txt b/LayoutTests/editing/deleting/5390681-expected.txt
new file mode 100644
index 0000000..8977238
--- /dev/null
+++ b/LayoutTests/editing/deleting/5390681-expected.txt
@@ -0,0 +1,5 @@
+This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'. There is a bug: while the non-editable space isn't deleted, deletion inserts a placeholder when it shouldn't.
+| <br>
+| <span>
+| contenteditable="false"
+| " bar"
diff --git a/LayoutTests/editing/deleting/5390681.html b/LayoutTests/editing/deleting/5390681.html
index 3c85489..5ce5276 100644
--- a/LayoutTests/editing/deleting/5390681.html
+++ b/LayoutTests/editing/deleting/5390681.html
@@ -1,10 +1,11 @@
-<p>This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'. <b>There is a bug: while the non-editable space isn't deleted, deletion inserts a placeholder when it shouldn't.</b></p>
+<script src="../../resources/dump-as-markup.js"></script>
<div contenteditable="true" id="div">foo<span contenteditable="false"> bar</span></div>
-
<script>
var div = document.getElementById("div");
var sel = window.getSelection();
sel.setPosition(div, 0);
sel.modify("extend", "forward", "word");
document.execCommand("Delete");
+Markup.description("This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'. There is a bug: while the non-editable space isn't deleted, deletion inserts a placeholder when it shouldn't.");
+Markup.dump(div);
</script>
diff --git a/LayoutTests/editing/deleting/delete-mixed-editable-content-001-expected.txt b/LayoutTests/editing/deleting/delete-mixed-editable-content-001-expected.txt
new file mode 100644
index 0000000..fc2d28f
--- /dev/null
+++ b/LayoutTests/editing/deleting/delete-mixed-editable-content-001-expected.txt
@@ -0,0 +1,21 @@
+Confirm no crash when selecting all text with mixed editability.
+| "
+"
+| <span>
+| "
+ "
+| <span>
+| <span>
+| contenteditable="true"
+| "12345"
+| "
+ "
+| <span>
+| contenteditable="true"
+| id="test"
+| <#selection-caret>
+| <br>
+| "
+"
+| "
+"
diff --git a/LayoutTests/editing/deleting/delete-mixed-editable-content-001.html b/LayoutTests/editing/deleting/delete-mixed-editable-content-001.html
index 8f1a031..b7cfc6d 100644
--- a/LayoutTests/editing/deleting/delete-mixed-editable-content-001.html
+++ b/LayoutTests/editing/deleting/delete-mixed-editable-content-001.html
@@ -1,8 +1,9 @@
+<script src="../../resources/dump-as-markup.js"></script>
<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
<script>
function editingTest() {
- selectAllCommand();
- deleteCommand();
+ selectAllCommand();
+ deleteCommand();
}
</script>
<div style="border-style:solid; border-width:2px; border-color:red; width:200px;">
@@ -12,5 +13,7 @@ function editingTest() {
</span>
</div>
<script>
-runEditingTest();
-</script>
\ No newline at end of file
+runDumpAsTextEditingTest(false);
+Markup.description("Confirm no crash when selecting all text with mixed editability.");
+Markup.dump(document.getElementsByTagName("div")[0]);
+</script>
diff --git a/LayoutTests/platform/chromium-linux/editing/deleting/5390681-expected.checksum b/LayoutTests/platform/chromium-linux/editing/deleting/5390681-expected.checksum
deleted file mode 100644
index 24750a7..0000000
--- a/LayoutTests/platform/chromium-linux/editing/deleting/5390681-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d63112a6cf89ab0b37d5b1827250a26d
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/editing/deleting/5390681-expected.png b/LayoutTests/platform/chromium-linux/editing/deleting/5390681-expected.png
deleted file mode 100644
index 0376af6..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/deleting/5390681-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-linux/editing/deleting/delete-mixed-editable-content-001-expected.checksum b/LayoutTests/platform/chromium-linux/editing/deleting/delete-mixed-editable-content-001-expected.checksum
deleted file mode 100644
index 0358957..0000000
--- a/LayoutTests/platform/chromium-linux/editing/deleting/delete-mixed-editable-content-001-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-cf060ddf297ceb8d0b323b0b30b8247b
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/editing/deleting/delete-mixed-editable-content-001-expected.png b/LayoutTests/platform/chromium-linux/editing/deleting/delete-mixed-editable-content-001-expected.png
deleted file mode 100644
index f74be82..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/deleting/delete-mixed-editable-content-001-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/deleting/5390681-expected.checksum b/LayoutTests/platform/chromium-win/editing/deleting/5390681-expected.checksum
deleted file mode 100644
index 627803f..0000000
--- a/LayoutTests/platform/chromium-win/editing/deleting/5390681-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-a06bc49a5864564848fb1ec257aad8be
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/deleting/5390681-expected.png b/LayoutTests/platform/chromium-win/editing/deleting/5390681-expected.png
deleted file mode 100644
index e15cc76..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/deleting/5390681-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/deleting/5390681-expected.txt b/LayoutTests/platform/chromium-win/editing/deleting/5390681-expected.txt
deleted file mode 100644
index ce273b4..0000000
--- a/LayoutTests/platform/chromium-win/editing/deleting/5390681-expected.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-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 {P} at (0,0) size 784x60
- RenderText {#text} at (0,0) size 768x39
- text run at (0,0) width 565: "This tests for a bug where expansion for smart delete would not consider editable boundaries. "
- text run at (565,0) width 177: "Only 'foo' should be deleted. "
- text run at (742,0) width 26: "You"
- text run at (0,20) width 105: "should see ' bar'. "
- RenderInline {B} at (0,0) size 735x39
- RenderText {#text} at (105,20) size 735x39
- text run at (105,20) width 630: "There is a bug: while the non-editable space isn't deleted, deletion inserts a placeholder when it"
- text run at (0,40) width 64: "shouldn't."
- RenderBlock {DIV} at (0,76) size 784x40
- RenderBR {BR} at (0,0) size 0x19
- RenderInline {SPAN} at (0,0) size 20x19
- RenderText {#text} at (0,20) size 20x19
- text run at (0,20) width 20: "bar"
-caret: position 0 of child 0 {BR} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.checksum b/LayoutTests/platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.checksum
deleted file mode 100644
index 04a0c02..0000000
--- a/LayoutTests/platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-249ed73d54112a3c3f03abcb00c34f85
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.png b/LayoutTests/platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.png
deleted file mode 100644
index c4723ff..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.txt b/LayoutTests/platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.txt
deleted file mode 100644
index 35b71af..0000000
--- a/LayoutTests/platform/chromium-win/editing/deleting/delete-mixed-editable-content-001-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of SPAN > SPAN > DIV > BODY > HTML > #document to 1 of SPAN > SPAN > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of SPAN > SPAN > DIV > BODY > HTML > #document to 0 of SPAN > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 5 of #text > SPAN > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 5 of #text > SPAN > SPAN > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of SPAN > SPAN > DIV > BODY > HTML > #document to 0 of SPAN > 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 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 204x24 [border: (2px solid #FF0000)]
- RenderInline {SPAN} at (0,0) size 44x19
- RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 40x19
- RenderInline {SPAN} at (0,0) size 40x19
- RenderText {#text} at (2,2) size 40x19
- text run at (2,2) width 40: "12345"
- RenderText {#text} at (42,2) size 4x19
- text run at (42,2) width 4: " "
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBR {BR} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
-caret: position 0 of child 0 {BR} of child 3 {SPAN} of child 1 {SPAN} of child 0 {DIV} of body
diff --git a/LayoutTests/platform/gtk/editing/deleting/5390681-expected.txt b/LayoutTests/platform/gtk/editing/deleting/5390681-expected.txt
deleted file mode 100644
index 854b1d5..0000000
--- a/LayoutTests/platform/gtk/editing/deleting/5390681-expected.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-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 {P} at (0,0) size 784x57
- RenderText {#text} at (0,0) size 768x38
- text run at (0,0) width 565: "This tests for a bug where expansion for smart delete would not consider editable boundaries. "
- text run at (565,0) width 177: "Only 'foo' should be deleted. "
- text run at (742,0) width 26: "You"
- text run at (0,19) width 105: "should see ' bar'. "
- RenderInline {B} at (0,0) size 735x38
- RenderText {#text} at (105,19) size 735x38
- text run at (105,19) width 630: "There is a bug: while the non-editable space isn't deleted, deletion inserts a placeholder when it"
- text run at (0,38) width 64: "shouldn't."
- RenderBlock {DIV} at (0,73) size 784x38
- RenderBR {BR} at (0,0) size 0x19
- RenderInline {SPAN} at (0,0) size 20x19
- RenderText {#text} at (0,19) size 20x19
- text run at (0,19) width 20: "bar"
-caret: position 0 of child 0 {BR} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/mac-leopard/editing/deleting/5390681-expected.checksum b/LayoutTests/platform/mac-leopard/editing/deleting/5390681-expected.checksum
deleted file mode 100644
index e65170d..0000000
--- a/LayoutTests/platform/mac-leopard/editing/deleting/5390681-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-9f4e212c2055bda5695a461dfc2702fc
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/editing/deleting/5390681-expected.png b/LayoutTests/platform/mac-leopard/editing/deleting/5390681-expected.png
deleted file mode 100644
index 743a6a8..0000000
Binary files a/LayoutTests/platform/mac-leopard/editing/deleting/5390681-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/deleting/5390681-expected.checksum b/LayoutTests/platform/mac/editing/deleting/5390681-expected.checksum
deleted file mode 100644
index 9a77e43..0000000
--- a/LayoutTests/platform/mac/editing/deleting/5390681-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-20cdfc7bbbaf0498201df167c3ab0140
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/deleting/5390681-expected.png b/LayoutTests/platform/mac/editing/deleting/5390681-expected.png
deleted file mode 100644
index dd975f7..0000000
Binary files a/LayoutTests/platform/mac/editing/deleting/5390681-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/deleting/5390681-expected.txt b/LayoutTests/platform/mac/editing/deleting/5390681-expected.txt
deleted file mode 100644
index 66aebc7..0000000
--- a/LayoutTests/platform/mac/editing/deleting/5390681-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-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 {P} at (0,0) size 784x54
- RenderText {#text} at (0,0) size 772x36
- text run at (0,0) width 591: "This tests for a bug where expansion for smart delete would not consider editable boundaries. "
- text run at (591,0) width 181: "Only 'foo' should be deleted."
- text run at (0,18) width 140: "You should see ' bar'. "
- RenderInline {B} at (0,0) size 778x36
- RenderText {#text} at (140,18) size 778x36
- text run at (140,18) width 638: "There is a bug: while the non-editable space isn't deleted, deletion inserts a placeholder when it"
- text run at (0,36) width 67: "shouldn't."
- RenderBlock {DIV} at (0,70) size 784x36
- RenderBR {BR} at (0,0) size 0x18
- RenderInline {SPAN} at (0,0) size 20x18
- RenderText {#text} at (0,18) size 20x18
- text run at (0,18) width 20: "bar"
-caret: position 0 of child 0 {BR} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.checksum b/LayoutTests/platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.checksum
deleted file mode 100644
index f25aebd..0000000
--- a/LayoutTests/platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-9a6c3594ebe691d1114f318d86c7ebc8
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.png b/LayoutTests/platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.png
deleted file mode 100644
index 02d6c72..0000000
Binary files a/LayoutTests/platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.txt b/LayoutTests/platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.txt
deleted file mode 100644
index 352bdf6..0000000
--- a/LayoutTests/platform/mac/editing/deleting/delete-mixed-editable-content-001-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of SPAN > SPAN > DIV > BODY > HTML > #document to 1 of SPAN > SPAN > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of SPAN > SPAN > DIV > BODY > HTML > #document to 0 of SPAN > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 5 of #text > SPAN > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 5 of #text > SPAN > SPAN > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of SPAN > SPAN > DIV > BODY > HTML > #document to 0 of SPAN > 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 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 204x22 [border: (2px solid #FF0000)]
- RenderInline {SPAN} at (0,0) size 44x18
- RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 40x18
- RenderInline {SPAN} at (0,0) size 40x18
- RenderText {#text} at (2,2) size 40x18
- text run at (2,2) width 40: "12345"
- RenderText {#text} at (42,2) size 4x18
- text run at (42,2) width 4: " "
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBR {BR} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
-caret: position 0 of child 0 {BR} of child 3 {SPAN} of child 1 {SPAN} of child 0 {DIV} of body
diff --git a/LayoutTests/platform/qt/editing/deleting/5390681-expected.txt b/LayoutTests/platform/qt/editing/deleting/5390681-expected.txt
deleted file mode 100644
index 82c0cba..0000000
--- a/LayoutTests/platform/qt/editing/deleting/5390681-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-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 {P} at (0,0) size 784x59
- RenderText {#text} at (0,0) size 778x38
- text run at (0,0) width 598: "This tests for a bug where expansion for smart delete would not consider editable boundaries. "
- text run at (598,0) width 180: "Only 'foo' should be deleted."
- text run at (0,19) width 141: "You should see ' bar'. "
- RenderInline {B} at (0,0) size 746x40
- RenderText {#text} at (141,19) size 746x40
- text run at (141,19) width 605: "There is a bug: while the non-editable space isn't deleted, deletion inserts a placeholder"
- text run at (0,39) width 123: "when it shouldn't."
- RenderBlock {DIV} at (0,73) size 784x38
- RenderBR {BR} at (0,0) size 0x19
- RenderInline {SPAN} at (0,0) size 21x19
- RenderText {#text} at (0,19) size 21x19
- text run at (0,19) width 21: "bar"
-caret: position 0 of child 0 {BR} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/qt/editing/deleting/delete-mixed-editable-content-001-expected.txt b/LayoutTests/platform/qt/editing/deleting/delete-mixed-editable-content-001-expected.txt
deleted file mode 100644
index 106691b..0000000
--- a/LayoutTests/platform/qt/editing/deleting/delete-mixed-editable-content-001-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of SPAN > SPAN > DIV > BODY > HTML > #document to 1 of SPAN > SPAN > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of SPAN > SPAN > DIV > BODY > HTML > #document to 0 of SPAN > SPAN > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 5 of #text > SPAN > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > SPAN > SPAN > DIV > BODY > HTML > #document to 5 of #text > SPAN > SPAN > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of SPAN > SPAN > DIV > BODY > HTML > #document to 0 of SPAN > 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 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {DIV} at (0,0) size 204x23 [border: (2px solid #FF0000)]
- RenderInline {SPAN} at (0,0) size 44x19
- RenderText {#text} at (0,0) size 0x0
- RenderInline {SPAN} at (0,0) size 40x19
- RenderInline {SPAN} at (0,0) size 40x19
- RenderText {#text} at (2,2) size 40x19
- text run at (2,2) width 40: "12345"
- RenderText {#text} at (42,2) size 4x19
- text run at (42,2) width 4: " "
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBR {BR} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
-caret: position 0 of child 0 {BR} of child 3 {SPAN} of child 1 {SPAN} of child 0 {DIV} of body
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list