[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
chang.shu at nokia.com
chang.shu at nokia.com
Mon Feb 21 00:27:44 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit b04bc61ae023729879963b848eba18a2355f12db
Author: chang.shu at nokia.com <chang.shu at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 31 20:48:56 2011 +0000
2011-01-31 Chang Shu <chang.shu at nokia.com>
Reviewed by Ryosuke Niwa.
Convert the test case to dumpAsText test so the expected result is cross-platform.
https://bugs.webkit.org/show_bug.cgi?id=53437
* editing/deleting/5168598-expected.txt: Added.
* editing/deleting/5168598.html:
* platform/chromium-linux/editing/deleting/5168598-expected.checksum: Removed.
* platform/chromium-linux/editing/deleting/5168598-expected.png: Removed.
* platform/chromium-win/editing/deleting/5168598-expected.checksum: Removed.
* platform/chromium-win/editing/deleting/5168598-expected.png: Removed.
* platform/chromium-win/editing/deleting/5168598-expected.txt: Removed.
* platform/mac-leopard/editing/deleting/5168598-expected.checksum: Removed.
* platform/mac-leopard/editing/deleting/5168598-expected.png: Removed.
* platform/mac/editing/deleting/5168598-expected.checksum: Removed.
* platform/mac/editing/deleting/5168598-expected.png: Removed.
* platform/mac/editing/deleting/5168598-expected.txt: Removed.
* platform/qt/editing/deleting/5168598-expected.checksum: Removed.
* platform/qt/editing/deleting/5168598-expected.png: Removed.
* platform/qt/editing/deleting/5168598-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77154 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f50a6bf..1fdbe54 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2011-01-31 Chang Shu <chang.shu at nokia.com>
+
+ Reviewed by Ryosuke Niwa.
+
+ Convert the test case to dumpAsText test so the expected result is cross-platform.
+ https://bugs.webkit.org/show_bug.cgi?id=53437
+
+ * editing/deleting/5168598-expected.txt: Added.
+ * editing/deleting/5168598.html:
+ * platform/chromium-linux/editing/deleting/5168598-expected.checksum: Removed.
+ * platform/chromium-linux/editing/deleting/5168598-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5168598-expected.checksum: Removed.
+ * platform/chromium-win/editing/deleting/5168598-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5168598-expected.txt: Removed.
+ * platform/mac-leopard/editing/deleting/5168598-expected.checksum: Removed.
+ * platform/mac-leopard/editing/deleting/5168598-expected.png: Removed.
+ * platform/mac/editing/deleting/5168598-expected.checksum: Removed.
+ * platform/mac/editing/deleting/5168598-expected.png: Removed.
+ * platform/mac/editing/deleting/5168598-expected.txt: Removed.
+ * platform/qt/editing/deleting/5168598-expected.checksum: Removed.
+ * platform/qt/editing/deleting/5168598-expected.png: Removed.
+ * platform/qt/editing/deleting/5168598-expected.txt: Removed.
+
2011-01-31 takano takumi <takano at apple.com>
Reviewed by Dave Hyatt.
diff --git a/LayoutTests/editing/deleting/5168598-expected.txt b/LayoutTests/editing/deleting/5168598-expected.txt
new file mode 100644
index 0000000..a0d2e32
--- /dev/null
+++ b/LayoutTests/editing/deleting/5168598-expected.txt
@@ -0,0 +1,3 @@
+This tests for a crash when deleting a link inside a text field inside a completely editable document. You shouldn't see anything inside the text field.'We probably shouldn't let users add rich content to text fields even if they are in richly editable regions.'
+
+ PASS
diff --git a/LayoutTests/editing/deleting/5168598.html b/LayoutTests/editing/deleting/5168598.html
index 3cbb80a..98f1e50 100644
--- a/LayoutTests/editing/deleting/5168598.html
+++ b/LayoutTests/editing/deleting/5168598.html
@@ -1,11 +1,20 @@
+<!DOCTYPE html>
+<html>
<body>
<p>This tests for a crash when deleting a link inside a text field inside a completely editable document. You shouldn't see anything inside the text field.'<b>We probably shouldn't let users add rich content to text fields even if they are in richly editable regions.'</b></p>
<input type="text" id="textfield">
<script>
+
+if (window.layoutTestController)
+ window.layoutTestController.dumpAsText();
+
document.designMode = "on";
var textfield = document.getElementById("textfield");
textfield.setSelectionRange(0, 0);
document.execCommand("CreateLink", false, "http://www.google.com/")
document.execCommand("Delete");
+var numberOfElements = document.getElementsByTagName('a').length;
+document.write(numberOfElements ? 'FAIL: there were ' + numberOfElements + ' anchor elements but expected none' : 'PASS');
</script>
</body>
+</html>
diff --git a/LayoutTests/platform/chromium-linux/editing/deleting/5168598-expected.checksum b/LayoutTests/platform/chromium-linux/editing/deleting/5168598-expected.checksum
deleted file mode 100644
index 18a954e..0000000
--- a/LayoutTests/platform/chromium-linux/editing/deleting/5168598-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-1d1cd05ae0939fe3ba084fe4af77961a
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/editing/deleting/5168598-expected.png b/LayoutTests/platform/chromium-linux/editing/deleting/5168598-expected.png
deleted file mode 100644
index da95669..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/deleting/5168598-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/deleting/5168598-expected.checksum b/LayoutTests/platform/chromium-win/editing/deleting/5168598-expected.checksum
deleted file mode 100644
index 50a7ada..0000000
--- a/LayoutTests/platform/chromium-win/editing/deleting/5168598-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-395695bc6dc31aa8047dada597ca492b
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/editing/deleting/5168598-expected.png b/LayoutTests/platform/chromium-win/editing/deleting/5168598-expected.png
deleted file mode 100644
index f4213a6..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/deleting/5168598-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/editing/deleting/5168598-expected.txt b/LayoutTests/platform/chromium-win/editing/deleting/5168598-expected.txt
deleted file mode 100644
index 091e1ea..0000000
--- a/LayoutTests/platform/chromium-win/editing/deleting/5168598-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 750x39
- text run at (0,0) width 750: "This tests for a crash when deleting a link inside a text field inside a completely editable document. You shouldn't see anything"
- text run at (0,20) width 118: "inside the text field.'"
- RenderInline {B} at (0,0) size 747x39
- RenderText {#text} at (118,20) size 747x39
- text run at (118,20) width 629: "We probably shouldn't let users add rich content to text fields even if they are in richly editable"
- text run at (0,40) width 57: "regions.'"
- RenderBlock (anonymous) at (0,76) size 784x26
- RenderTextControl {INPUT} at (2,2) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
-layer at (12,89) size 151x16
- RenderBlock {DIV} at (2,3) size 151x16
- RenderBR {BR} at (1,0) size 0x16
-caret: position 0 of child 0 {BR} of child 0 {DIV} of child 3 {INPUT} of body
diff --git a/LayoutTests/platform/mac-leopard/editing/deleting/5168598-expected.checksum b/LayoutTests/platform/mac-leopard/editing/deleting/5168598-expected.checksum
deleted file mode 100644
index acdbf86..0000000
--- a/LayoutTests/platform/mac-leopard/editing/deleting/5168598-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-f942b398b37952ae6bb3dcd96ce89f38
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/editing/deleting/5168598-expected.png b/LayoutTests/platform/mac-leopard/editing/deleting/5168598-expected.png
deleted file mode 100644
index ce0874f..0000000
Binary files a/LayoutTests/platform/mac-leopard/editing/deleting/5168598-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/deleting/5168598-expected.checksum b/LayoutTests/platform/mac/editing/deleting/5168598-expected.checksum
deleted file mode 100644
index 8cb17e4..0000000
--- a/LayoutTests/platform/mac/editing/deleting/5168598-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-b09753f5c9aff8b95f3302d0953276c5
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/deleting/5168598-expected.png b/LayoutTests/platform/mac/editing/deleting/5168598-expected.png
deleted file mode 100644
index aa20de4..0000000
Binary files a/LayoutTests/platform/mac/editing/deleting/5168598-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/deleting/5168598-expected.txt b/LayoutTests/platform/mac/editing/deleting/5168598-expected.txt
deleted file mode 100644
index 72e0f0c..0000000
--- a/LayoutTests/platform/mac/editing/deleting/5168598-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 784x54
- RenderText {#text} at (0,0) size 737x36
- text run at (0,0) width 737: "This tests for a crash when deleting a link inside a text field inside a completely editable document. You shouldn't see"
- text run at (0,18) width 185: "anything inside the text field.'"
- RenderInline {B} at (0,0) size 767x36
- RenderText {#text} at (185,18) size 767x36
- text run at (185,18) width 582: "We probably shouldn't let users add rich content to text fields even if they are in richly"
- text run at (0,36) width 114: "editable regions.'"
- RenderBlock (anonymous) at (0,70) size 784x23
- RenderTextControl {INPUT} at (2,2) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
-layer at (13,83) size 119x13
- RenderBlock {DIV} at (3,3) size 119x13
- RenderBR {BR} at (1,0) size 0x13
-caret: position 0 of child 0 {BR} of child 0 {DIV} of child 3 {INPUT} of body
diff --git a/LayoutTests/platform/qt/editing/deleting/5168598-expected.checksum b/LayoutTests/platform/qt/editing/deleting/5168598-expected.checksum
deleted file mode 100644
index 26b5015..0000000
--- a/LayoutTests/platform/qt/editing/deleting/5168598-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-41afe5a8336a0bacc9d2632aec8fd732
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/editing/deleting/5168598-expected.png b/LayoutTests/platform/qt/editing/deleting/5168598-expected.png
deleted file mode 100644
index cf90bec..0000000
Binary files a/LayoutTests/platform/qt/editing/deleting/5168598-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/qt/editing/deleting/5168598-expected.txt b/LayoutTests/platform/qt/editing/deleting/5168598-expected.txt
deleted file mode 100644
index 8d1e9dc..0000000
--- a/LayoutTests/platform/qt/editing/deleting/5168598-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 784x63
- RenderText {#text} at (0,0) size 784x42
- text run at (0,0) width 784: "This tests for a crash when deleting a link inside a text field inside a completely editable document. You shouldn't see"
- text run at (0,21) width 198: "anything inside the text field.'"
- RenderInline {B} at (0,0) size 780x42
- RenderText {#text} at (198,21) size 780x42
- text run at (198,21) width 582: "We probably shouldn't let users add rich content to text fields even if they are in richly"
- text run at (0,42) width 114: "editable regions.'"
- RenderBlock (anonymous) at (0,79) size 784x29
- RenderTextControl {INPUT} at (2,2) size 166x25
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
-layer at (12,91) size 162x21
- RenderBlock {DIV} at (2,2) size 162x21
- RenderBR {BR} at (1,0) size 0x21
-caret: position 0 of child 0 {BR} of child 0 {DIV} of child 3 {INPUT} of body
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list