[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
vicki
vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:46:40 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 69153b25cda55d400a5185ae34a05897f70d2544
Author: vicki <vicki at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jun 15 18:07:27 2004 +0000
- added a few layout tests, rdar://3694510
* layout-tests/editing/deleting/delete-image-004-expected.txt: Added.
* layout-tests/editing/deleting/delete-image-004.html: Added.
* layout-tests/editing/selection/extend-by-character-006-expected.txt: Added.
* layout-tests/editing/selection/extend-by-character-006.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6856 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/editing/deleting/delete-image-004-expected.txt b/LayoutTests/editing/deleting/delete-image-004-expected.txt
new file mode 100644
index 0000000..4c9ffa5
--- /dev/null
+++ b/LayoutTests/editing/deleting/delete-image-004-expected.txt
@@ -0,0 +1,18 @@
+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 784x137 [border: (2px solid #FF0000)]
+ RenderInline {SPAN} at (0,0) size 158x28
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderImage {IMG} at (14,14) size 76x103
+ RenderText {TEXT} at (90,95) size 6x28
+ text run at (90,95) width 6: " "
+ RenderImage {IMG} at (96,14) size 76x103
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderText {TEXT} at (0,0) size 0x0
+selection is CARET:
+start: position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
+upstream: position 0 of child 1 {TEXT} of root {DIV}
+downstream: position 0 of child 2 {IMG} of child 2 {SPAN} of root {DIV}
diff --git a/LayoutTests/editing/deleting/delete-character-001.html b/LayoutTests/editing/deleting/delete-image-004.html
similarity index 71%
copy from LayoutTests/editing/deleting/delete-character-001.html
copy to LayoutTests/editing/deleting/delete-image-004.html
index 6776857..31b7aaa 100644
--- a/LayoutTests/editing/deleting/delete-character-001.html
+++ b/LayoutTests/editing/deleting/delete-image-004.html
@@ -13,10 +13,9 @@
<script>
function editingTest() {
- for (i = 0; i < 2; i++) {
- moveSelectionForwardByCharacterCommand();
- }
- deleteCommand();
+ for (i=0; i < 4; i++)
+ extendSelectionForwardByCharacterCommand();
+ deleteCommand();
}
</script>
@@ -25,7 +24,7 @@ function editingTest() {
</head>
<body>
<div contenteditable id="root" class="editing">
-<span id="test">foo bar baz</span>
+<span id="test"> <img src="../abe.jpg"> <img src="../abe.jpg"> </span>
</div>
<script>
diff --git a/LayoutTests/editing/deleting/delete-trailing-ws-001-expected.txt b/LayoutTests/editing/selection/extend-by-character-006-expected.txt
similarity index 61%
copy from LayoutTests/editing/deleting/delete-trailing-ws-001-expected.txt
copy to LayoutTests/editing/selection/extend-by-character-006-expected.txt
index 6ab4b3d..91b3721 100644
--- a/LayoutTests/editing/deleting/delete-trailing-ws-001-expected.txt
+++ b/LayoutTests/editing/selection/extend-by-character-006-expected.txt
@@ -4,12 +4,13 @@ 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 #FF0000)]
- RenderInline {SPAN} at (0,0) size 77x28
- RenderText {TEXT} at (14,14) size 77x28
- text run at (14,14) width 43: " bar "
- text run at (57,14) width 34: "baz"
+ RenderInline {SPAN} at (0,0) size 32x28
+ RenderText {TEXT} at (14,14) size 32x28
+ text run at (14,14) width 32: "foo"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderText {TEXT} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
selection is CARET:
start: position 0 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
upstream: position 0 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
-downstream: position 0 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
+downstream: position 1 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
diff --git a/LayoutTests/editing/inserting/insert-after-delete-001.html b/LayoutTests/editing/selection/extend-by-character-006.html
similarity index 73%
copy from LayoutTests/editing/inserting/insert-after-delete-001.html
copy to LayoutTests/editing/selection/extend-by-character-006.html
index dd2f49d..a890497 100644
--- a/LayoutTests/editing/inserting/insert-after-delete-001.html
+++ b/LayoutTests/editing/selection/extend-by-character-006.html
@@ -13,10 +13,8 @@
<script>
function editingTest() {
- selectAllCommand();
- deleteCommand();
- for (i = 0; i < 3; i++) {
- typeCharacterCommand();
+ for (i = 0; i < 4; i++) {
+ extendSelectionForwardByCharacterCommand();
}
}
@@ -25,9 +23,9 @@ function editingTest() {
<title>Editing Test</title>
</head>
<body>
+<!-- rdar://problem/3694510 //-->
<div contenteditable id="root" class="editing">
-<span id="test">test</span>
-</div>
+<span id="test"> foo</span>
<script>
runEditingTest();
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e022680..eeada08 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-06-15 Vicki Murley <vicki at apple.com>
+
+ - added a few layout tests, rdar://3694510
+
+ * layout-tests/editing/deleting/delete-image-004-expected.txt: Added.
+ * layout-tests/editing/deleting/delete-image-004.html: Added.
+ * layout-tests/editing/selection/extend-by-character-006-expected.txt: Added.
+ * layout-tests/editing/selection/extend-by-character-006.html: Added.
+
2004-06-15 Trey Matteson <trey at apple.com>
Dragging tweak: We pass the mouse down coords instead of the
@@ -17587,4 +17596,4 @@ Added support for getting at Java object fields.
link to the parent node, not just when following a link to the next child node.
* kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::attributedString): Ditto.
-== Rolled over to ChangeLog-2003-10-25 ==ite
\ No newline at end of file
+== Rolled over to ChangeLog-2003-10-25 ==ite
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list