[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tony at chromium.org
tony at chromium.org
Wed Dec 22 14:03:21 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit e00979d6afa2c799980dc0fa4c6cecc10cc5b4a7
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 1 23:21:29 2010 +0000
2010-10-01 Evan Martin <evan at chromium.org>
Reviewed by Tony Chang.
editing/selection/5354455-1 has incorrect description text
https://bugs.webkit.org/show_bug.cgi?id=44990
This test includes descriptive text that describes an OS X-specific behavior.
I almost checked in an incorrect baseline because I believed the text.
This change amends the text to describe expected behavior on Mac/Win/Linux.
Rather than requiring new baselines on all platforms, I took this opportunity
to also convert the test to a markup dump. We'll then end up with just one
Mac baseline and one non-Mac baseline.
* editing/selection/5354455-1.html:
* platform/chromium-linux/editing/selection/5354455-1-expected.checksum: Removed.
* platform/chromium-linux/editing/selection/5354455-1-expected.png: Removed.
* platform/chromium-win/editing/selection/5354455-1-expected.checksum: Removed.
* platform/chromium-win/editing/selection/5354455-1-expected.png: Removed.
* platform/chromium-win/editing/selection/5354455-1-expected.txt: Removed.
* platform/chromium/test_expectations.txt:
* platform/gtk/editing/selection/5354455-1-expected.txt: Removed.
* platform/mac-leopard/editing/selection/5354455-1-expected.checksum: Removed.
* platform/mac-leopard/editing/selection/5354455-1-expected.png: Removed.
* platform/mac/editing/selection/5354455-1-expected.checksum: Removed.
* platform/mac/editing/selection/5354455-1-expected.png: Removed.
* platform/mac/editing/selection/5354455-1-expected.txt: Updated.
* platform/win/editing/selection/5354455-1-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68948 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ae2b395..c066468 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,33 @@
+2010-10-01 Evan Martin <evan at chromium.org>
+
+ Reviewed by Tony Chang.
+
+ editing/selection/5354455-1 has incorrect description text
+ https://bugs.webkit.org/show_bug.cgi?id=44990
+
+ This test includes descriptive text that describes an OS X-specific behavior.
+ I almost checked in an incorrect baseline because I believed the text.
+ This change amends the text to describe expected behavior on Mac/Win/Linux.
+
+ Rather than requiring new baselines on all platforms, I took this opportunity
+ to also convert the test to a markup dump. We'll then end up with just one
+ Mac baseline and one non-Mac baseline.
+
+ * editing/selection/5354455-1.html:
+ * platform/chromium-linux/editing/selection/5354455-1-expected.checksum: Removed.
+ * platform/chromium-linux/editing/selection/5354455-1-expected.png: Removed.
+ * platform/chromium-win/editing/selection/5354455-1-expected.checksum: Removed.
+ * platform/chromium-win/editing/selection/5354455-1-expected.png: Removed.
+ * platform/chromium-win/editing/selection/5354455-1-expected.txt: Removed.
+ * platform/chromium/test_expectations.txt:
+ * platform/gtk/editing/selection/5354455-1-expected.txt: Removed.
+ * platform/mac-leopard/editing/selection/5354455-1-expected.checksum: Removed.
+ * platform/mac-leopard/editing/selection/5354455-1-expected.png: Removed.
+ * platform/mac/editing/selection/5354455-1-expected.checksum: Removed.
+ * platform/mac/editing/selection/5354455-1-expected.png: Removed.
+ * platform/mac/editing/selection/5354455-1-expected.txt: Updated.
+ * platform/win/editing/selection/5354455-1-expected.txt: Added.
+
2010-09-30 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
diff --git a/LayoutTests/editing/selection/5354455-1.html b/LayoutTests/editing/selection/5354455-1.html
index ad883ae..f58b536 100644
--- a/LayoutTests/editing/selection/5354455-1.html
+++ b/LayoutTests/editing/selection/5354455-1.html
@@ -1,8 +1,12 @@
-<p>This tests to make sure that right clicking on a paragraph break in editable content selects it. To run it manually, right click on the paragraph break after the first paragraph below.</p>
+<script src="../../resources/dump-as-markup.js"></script>
+
+<p>This tests whether right clicking on a paragraph break in editable content selects it. The break should be selected on OS X, but not on Windows or Linux. To run it manually, right click on the paragraph break after the first paragraph below.</p>
+<div id="dump">
<div id="div" contenteditable="true">
-<div><span id="text">The paragraph break should be selected.</span></div>
+<div><span id="text">The following paragraph break should be selected on OS X.</span></div>
<br>
</div>
+</div>
<script>
if (window.layoutTestController) {
@@ -14,7 +18,8 @@ if (window.layoutTestController) {
eventSender.mouseDown();
eventSender.mouseUp();
// Right click on the paragraph break to select it.
- eventSender.contextClick();
+ eventSender.contextClick();
}
+Markup.dump(document.getElementById("dump"));
</script>
diff --git a/LayoutTests/platform/chromium-linux/editing/selection/5354455-1-expected.checksum b/LayoutTests/platform/chromium-linux/editing/selection/5354455-1-expected.checksum
deleted file mode 100644
index cce68c2..0000000
--- a/LayoutTests/platform/chromium-linux/editing/selection/5354455-1-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-57110c6d420fd7a37c5038fc852a68e2
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/editing/selection/5354455-1-expected.png b/LayoutTests/platform/chromium-linux/editing/selection/5354455-1-expected.png
deleted file mode 100644
index 2f8f9a3..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/selection/5354455-1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/selection/5354455-1-expected.checksum b/LayoutTests/platform/chromium-win/editing/selection/5354455-1-expected.checksum
deleted file mode 100644
index 96805a2..0000000
--- a/LayoutTests/platform/chromium-win/editing/selection/5354455-1-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-1aa91a27583e9e9689c0e3a2367d24f8
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/selection/5354455-1-expected.png b/LayoutTests/platform/chromium-win/editing/selection/5354455-1-expected.png
deleted file mode 100644
index 3d86a37..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/selection/5354455-1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/selection/5354455-1-expected.txt b/LayoutTests/platform/chromium-win/editing/selection/5354455-1-expected.txt
deleted file mode 100644
index 3e46d44..0000000
--- a/LayoutTests/platform/chromium-win/editing/selection/5354455-1-expected.txt
+++ /dev/null
@@ -1,18 +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 784x40
- RenderText {#text} at (0,0) size 767x39
- text run at (0,0) width 553: "This tests to make sure that right clicking on a paragraph break in editable content selects it. "
- text run at (553,0) width 214: "To run it manually, right click on the"
- text run at (0,20) width 289: "paragraph break after the first paragraph below."
- RenderBlock {DIV} at (0,56) size 784x40
- RenderBlock {DIV} at (0,0) size 784x20
- RenderInline {SPAN} at (0,0) size 246x19
- RenderText {#text} at (0,0) size 246x19
- text run at (0,0) width 246: "The paragraph break should be selected."
- RenderBlock (anonymous) at (0,20) size 784x20
- RenderBR {BR} at (0,0) size 0x19
-caret: position 39 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of child 2 {DIV} of body
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 0599deb..144dc95 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -840,9 +840,6 @@ BUGWK44514 MAC : svg/zoom/page/zoom-mask-with-percentages.svg = IMAGE
// End SVG Regressions
// -----------------------------------------------------------------
-// Selection wrong.
-BUG10292 MAC LINUX : editing/selection/5354455-1.html = FAIL
-
// Compact support was removed from WebKit by Hyatt and layout tests rebaselined in r40259.
BUG10295 MAC : fast/dom/prototype-chain.html = FAIL
diff --git a/LayoutTests/platform/gtk/editing/selection/5354455-1-expected.txt b/LayoutTests/platform/gtk/editing/selection/5354455-1-expected.txt
index 33f1ac5..d810816 100644
--- a/LayoutTests/platform/gtk/editing/selection/5354455-1-expected.txt
+++ b/LayoutTests/platform/gtk/editing/selection/5354455-1-expected.txt
@@ -1,18 +1,18 @@
-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 784x40
- RenderText {#text} at (0,0) size 766x40
- text run at (0,0) width 578: "This tests to make sure that right clicking on a paragraph break in editable content selects it. "
- text run at (578,0) width 188: "To run it manually, right click"
- text run at (0,20) width 342: "on the paragraph break after the first paragraph below."
- RenderBlock {DIV} at (0,56) size 784x40
- RenderBlock {DIV} at (0,0) size 784x20
- RenderInline {SPAN} at (0,0) size 254x20
- RenderText {#text} at (0,0) size 254x20
- text run at (0,0) width 254: "The paragraph break should be selected."
- RenderBlock (anonymous) at (0,20) size 784x20
- RenderBR {BR} at (0,0) size 0x20
-caret: position 39 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of child 2 {DIV} of body
+| "
+"
+| <div>
+| contenteditable="true"
+| id="div"
+| "
+"
+| <div>
+| <span>
+| id="text"
+| "The following paragraph break should be selected on OS X.<#selection-caret>"
+| "
+"
+| <br>
+| "
+"
+| "
+"
diff --git a/LayoutTests/platform/mac-leopard/editing/selection/5354455-1-expected.checksum b/LayoutTests/platform/mac-leopard/editing/selection/5354455-1-expected.checksum
deleted file mode 100644
index d01e3db..0000000
--- a/LayoutTests/platform/mac-leopard/editing/selection/5354455-1-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-aeb2236914fadcdaa38e01bbe621516f
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/editing/selection/5354455-1-expected.png b/LayoutTests/platform/mac-leopard/editing/selection/5354455-1-expected.png
deleted file mode 100644
index 25e3122..0000000
Binary files a/LayoutTests/platform/mac-leopard/editing/selection/5354455-1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/selection/5354455-1-expected.checksum b/LayoutTests/platform/mac/editing/selection/5354455-1-expected.checksum
deleted file mode 100644
index e4dba1b..0000000
--- a/LayoutTests/platform/mac/editing/selection/5354455-1-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-62f373a861e976b2a93696e95c9b92c4
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/selection/5354455-1-expected.png b/LayoutTests/platform/mac/editing/selection/5354455-1-expected.png
deleted file mode 100644
index 959513b..0000000
Binary files a/LayoutTests/platform/mac/editing/selection/5354455-1-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/selection/5354455-1-expected.txt b/LayoutTests/platform/mac/editing/selection/5354455-1-expected.txt
index 3f080af..8062910 100644
--- a/LayoutTests/platform/mac/editing/selection/5354455-1-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/5354455-1-expected.txt
@@ -1,19 +1,19 @@
-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 784x36
- RenderText {#text} at (0,0) size 766x36
- text run at (0,0) width 578: "This tests to make sure that right clicking on a paragraph break in editable content selects it. "
- text run at (578,0) width 188: "To run it manually, right click"
- text run at (0,18) width 342: "on the paragraph break after the first paragraph below."
- RenderBlock {DIV} at (0,52) size 784x36
- RenderBlock {DIV} at (0,0) size 784x18
- RenderInline {SPAN} at (0,0) size 254x18
- RenderText {#text} at (0,0) size 254x18
- text run at (0,0) width 254: "The paragraph break should be selected."
- RenderBlock (anonymous) at (0,18) size 784x18
- RenderBR {BR} at (0,0) size 0x18
-selection start: position 39 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of child 2 {DIV} of body
-selection end: position 0 of child 3 {BR} of child 2 {DIV} of body
+| "
+"
+| <div>
+| contenteditable="true"
+| id="div"
+| "
+"
+| <div>
+| <span>
+| id="text"
+| "The following paragraph break should be selected on OS X.<#selection-anchor>"
+| "
+"
+| <#selection-focus>
+| <br>
+| "
+"
+| "
+"
diff --git a/LayoutTests/platform/win/editing/selection/5354455-1-expected.txt b/LayoutTests/platform/win/editing/selection/5354455-1-expected.txt
new file mode 100644
index 0000000..d810816
--- /dev/null
+++ b/LayoutTests/platform/win/editing/selection/5354455-1-expected.txt
@@ -0,0 +1,18 @@
+| "
+"
+| <div>
+| contenteditable="true"
+| id="div"
+| "
+"
+| <div>
+| <span>
+| id="text"
+| "The following paragraph break should be selected on OS X.<#selection-caret>"
+| "
+"
+| <br>
+| "
+"
+| "
+"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list