[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:33:12 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0b4dd2f5050e1dd34a21a92ded49aa8ee48205eb
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Apr 9 14:41:37 2004 +0000
Reviewed by me
Added two more layout tests for editing.
* layout-tests/editing/selection/move-between-blocks-no-001-expected.txt: Added.
* layout-tests/editing/selection/move-between-blocks-no-001.html: Added.
* layout-tests/editing/selection/move-between-blocks-yes-001-expected.txt: Added.
* layout-tests/editing/selection/move-between-blocks-yes-001.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6342 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/editing/selection/move-between-blocks-no-001-expected.txt b/LayoutTests/editing/selection/move-between-blocks-no-001-expected.txt
new file mode 100644
index 0000000..040eef5
--- /dev/null
+++ b/LayoutTests/editing/selection/move-between-blocks-no-001-expected.txt
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x128
+ RenderBlock {HTML} at (0,0) size 800x128
+ RenderBody {BODY} at (8,8) size 784x112
+ RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
+ RenderInline {SPAN} at (0,0) size 381x28
+ RenderText {TEXT} at (14,14) size 381x28
+ text run at (14,14) width 381: "We hold these truths to be self-evident,"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
+ RenderText {TEXT} at (14,14) size 318x28
+ text run at (14,14) width 318: "that all men are created equal, ..."
+selection is CARET:
+start: position 40 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
+upstream: position 40 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
+downstream: position 1 of child 2 {TEXT} of root {DIV}
diff --git a/LayoutTests/editing/inserting/typing-002.html b/LayoutTests/editing/selection/move-between-blocks-no-001.html
similarity index 60%
copy from LayoutTests/editing/inserting/typing-002.html
copy to LayoutTests/editing/selection/move-between-blocks-no-001.html
index 94af2a5..02e57a1 100644
--- a/LayoutTests/editing/inserting/typing-002.html
+++ b/LayoutTests/editing/selection/move-between-blocks-no-001.html
@@ -12,17 +12,10 @@
<script>
-function moveNSpacesAndType(n) {
- for (i = 0; i < n; i++) {
+function editingTest() {
+ for (i = 0; i < 50; i++) {
moveSelectionForwardByCharacterCommand();
}
- for (i = 0; i < 3; i++) {
- typeCharacterCommand();
- }
-}
-
-function editingTest() {
- moveNSpacesAndType(4);
}
</script>
@@ -30,8 +23,13 @@ function editingTest() {
<title>Editing Test</title>
</head>
<body>
+<!-- body not contenteditable. treat these two divs like separate widgets.
+ arrowing from one to the other is prevented. -->
<div contenteditable id="root" class="editing">
-<span id="test">Foo <i> bar</i></span>
+<span id="test">We hold these truths to be self-evident,</span>
+</div>
+<div contenteditable class="editing">
+that all men are created equal, ...
</div>
<script>
diff --git a/LayoutTests/editing/selection/move-between-blocks-yes-001-expected.txt b/LayoutTests/editing/selection/move-between-blocks-yes-001-expected.txt
new file mode 100644
index 0000000..4b93451
--- /dev/null
+++ b/LayoutTests/editing/selection/move-between-blocks-yes-001-expected.txt
@@ -0,0 +1,17 @@
+layer at (0,0) size 800x600
+ RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x128
+ RenderBlock {HTML} at (0,0) size 800x128
+ RenderBody {BODY} at (8,8) size 784x112
+ RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
+ RenderInline {SPAN} at (0,0) size 381x28
+ RenderText {TEXT} at (14,14) size 381x28
+ text run at (14,14) width 381: "We hold these truths to be self-evident,"
+ RenderText {TEXT} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,56) size 784x56 [border: (2px solid #FF0000)]
+ RenderText {TEXT} at (14,14) size 318x28
+ text run at (14,14) width 318: "that all men are created equal, ..."
+selection is CARET:
+start: position 9 of child 1 {TEXT} of child 4 {DIV} of root {BODY}
+upstream: position 9 of child 1 {TEXT} of child 4 {DIV} of root {BODY}
+downstream: position 9 of child 1 {TEXT} of child 4 {DIV} of root {BODY}
diff --git a/LayoutTests/editing/inserting/typing-002.html b/LayoutTests/editing/selection/move-between-blocks-yes-001.html
similarity index 52%
copy from LayoutTests/editing/inserting/typing-002.html
copy to LayoutTests/editing/selection/move-between-blocks-yes-001.html
index 94af2a5..4883e9a 100644
--- a/LayoutTests/editing/inserting/typing-002.html
+++ b/LayoutTests/editing/selection/move-between-blocks-yes-001.html
@@ -12,26 +12,25 @@
<script>
-function moveNSpacesAndType(n) {
- for (i = 0; i < n; i++) {
+function editingTest() {
+ for (i = 0; i < 50; i++) {
moveSelectionForwardByCharacterCommand();
}
- for (i = 0; i < 3; i++) {
- typeCharacterCommand();
- }
-}
-
-function editingTest() {
- moveNSpacesAndType(4);
}
</script>
<title>Editing Test</title>
</head>
-<body>
-<div contenteditable id="root" class="editing">
-<span id="test">Foo <i> bar</i></span>
+<body id="root" contenteditable>
+<!-- body is contenteditable. treat these two divs like
+ different paragraphs in the same widget. arrowing from
+ one to the other is OK. -->
+<div class="editing">
+<span id="test">We hold these truths to be self-evident,</span>
+</div>
+<div class="editing">
+that all men are created equal, ...
</div>
<script>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2784451..414046b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
2004-04-09 Ken Kocienda <kocienda at apple.com>
+ Reviewed by me
+
+ Added two more layout tests for editing.
+
+ * layout-tests/editing/selection/move-between-blocks-no-001-expected.txt: Added.
+ * layout-tests/editing/selection/move-between-blocks-no-001.html: Added.
+ * layout-tests/editing/selection/move-between-blocks-yes-001-expected.txt: Added.
+ * layout-tests/editing/selection/move-between-blocks-yes-001.html: Added.
+
+2004-04-09 Ken Kocienda <kocienda at apple.com>
+
Reviewed by Dave
Small collection of editing improvements.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list