[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00
mrobinson at webkit.org
mrobinson at webkit.org
Wed Mar 17 18:33:43 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 71fc69096742de2e5861ed8d4fa5c5f60e5e43c2
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Mar 11 20:18:53 2010 +0000
2010-03-11 Martin Robinson <mrobinson at webkit.org>
Reviewed by Adam Barth
Convert editing/selection/5136696.html to dumpAsText
https://bugs.webkit.org/show_bug.cgi?id=34306
* editing/selection/5136696-expected.txt: Added.
* editing/selection/5136696.html: Use dumpAsText now.
* platform/gtk/Skipped: Unskip this test in GTK+ now that it has expected result.
* platform/mac/editing/selection/5136696-expected.checksum: Removed.
* platform/mac/editing/selection/5136696-expected.png: Removed.
* platform/mac/editing/selection/5136696-expected.txt: Removed.
* platform/qt/editing/selection/5136696-expected.txt: Removed.
* platform/win/editing/selection/5136696-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55852 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4a29230..a009f86 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-03-11 Martin Robinson <mrobinson at webkit.org>
+
+ Reviewed by Adam Barth
+
+ Convert editing/selection/5136696.html to dumpAsText
+ https://bugs.webkit.org/show_bug.cgi?id=34306
+
+ * editing/selection/5136696-expected.txt: Added.
+ * editing/selection/5136696.html: Use dumpAsText now.
+ * platform/gtk/Skipped: Unskip this test in GTK+ now that it has expected result.
+ * platform/mac/editing/selection/5136696-expected.checksum: Removed.
+ * platform/mac/editing/selection/5136696-expected.png: Removed.
+ * platform/mac/editing/selection/5136696-expected.txt: Removed.
+ * platform/qt/editing/selection/5136696-expected.txt: Removed.
+ * platform/win/editing/selection/5136696-expected.txt: Removed.
+
2010-03-11 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/editing/selection/doubleclick-whitespace-img-crash-expected.txt b/LayoutTests/editing/selection/5136696-expected.txt
similarity index 100%
copy from LayoutTests/editing/selection/doubleclick-whitespace-img-crash-expected.txt
copy to LayoutTests/editing/selection/5136696-expected.txt
diff --git a/LayoutTests/editing/selection/5136696.html b/LayoutTests/editing/selection/5136696.html
index 7dea671..af264db 100644
--- a/LayoutTests/editing/selection/5136696.html
+++ b/LayoutTests/editing/selection/5136696.html
@@ -1,20 +1,42 @@
<script>
-if (window.layoutTestController)
+if (window.layoutTestController) {
+ window.layoutTestController.dumpAsText();
window.layoutTestController.waitUntilDone();
+}
+
+function verifyResults(inputElement, selectedText) {
+ if (document.activeElement != inputElement) {
+ document.body.innerHTML = "FAIL (text field was not selected)";
+ return;
+ }
+
+ if (frames[0].getSelection().toString() != selectedText) {
+ document.body.innerHTML = "FAIL (unexpected selection)";
+ return;
+ }
+
+ document.body.innerHTML = "PASS";
+}
function runTest() {
+ var textToSelect = "This text should be selected, but this frame shouldn't be focused.";
frame = frames[0];
frame.focus();
s = frame.getSelection();
s.setPosition(frame.document.body, 0);
- frame.document.execCommand("InsertText", false, "This test should be selected, but this frame shouldn't be focused.");
+ frame.document.execCommand("InsertText", false, textToSelect);
frame.document.execCommand("SelectAll");
- document.getElementById("input").focus();
+
+ var inputElement = document.getElementById("input");
+ inputElement.focus();
+
+ verifyResults(inputElement, textToSelect);
+
if (window.layoutTestController)
window.layoutTestController.notifyDone();
}
</script>
-<p>This tests to make sure that a selection in one from isn't cleared when focusing a node in a different frame.</p>
+<p>This tests to make sure that a selection in one frame isn't cleared when focusing a node in a different frame.</p>
<iframe border="1" src="../resources/contenteditable-iframe-src.html" onload="runTest();"></iframe><br>
<input type="text" id="input" value="This text field should be focused." size="30">
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index d54601b..6e49f01 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -1125,7 +1125,6 @@ editing/selection/4932260-2.html
editing/selection/4932260-3.html
editing/selection/4947387.html
editing/selection/4975120.html
-editing/selection/5136696.html
editing/selection/5195166-1.html
editing/selection/5195166-2.html
editing/selection/5240265.html
diff --git a/LayoutTests/platform/mac/editing/selection/5136696-expected.checksum b/LayoutTests/platform/mac/editing/selection/5136696-expected.checksum
deleted file mode 100644
index 4e48dca..0000000
--- a/LayoutTests/platform/mac/editing/selection/5136696-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-100e84b4333b87e11059ac0fade616d0
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/editing/selection/5136696-expected.png b/LayoutTests/platform/mac/editing/selection/5136696-expected.png
deleted file mode 100644
index e0dfb2c..0000000
Binary files a/LayoutTests/platform/mac/editing/selection/5136696-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/editing/selection/5136696-expected.txt b/LayoutTests/platform/mac/editing/selection/5136696-expected.txt
deleted file mode 100644
index 34a4fa0..0000000
--- a/LayoutTests/platform/mac/editing/selection/5136696-expected.txt
+++ /dev/null
@@ -1,29 +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 784x18
- RenderText {#text} at (0,0) size 666x18
- text run at (0,0) width 666: "This tests to make sure that a selection in one from isn't cleared when focusing a node in a different frame."
- RenderBlock (anonymous) at (0,34) size 784x177
- RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
- layer at (0,0) size 300x150
- RenderView at (0,0) size 300x150
- layer at (0,0) size 300x150
- RenderBlock {HTML} at (0,0) size 300x150
- RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
- RenderText {#text} at (0,0) size 270x36
- text run at (0,0) width 266: "This test should be selected, but this frame"
- text run at (266,0) width 4: " "
- text run at (0,18) width 133: "shouldn't be focused."
- RenderText {#text} at (0,0) size 0x0
- RenderBR {BR} at (304,154) size 0x0
- RenderTextControl {INPUT} at (2,156) size 175x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
- RenderText {#text} at (0,0) size 0x0
-layer at (13,201) size 169x13 scrollWidth 183
- RenderBlock {DIV} at (3,3) size 169x13
- RenderText {#text} at (1,0) size 181x13
- text run at (1,0) width 181: "This text field should be focused."
-selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 5 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 34 of child 0 {#text} of child 0 {DIV} of child 5 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/qt/editing/selection/5136696-expected.txt b/LayoutTests/platform/qt/editing/selection/5136696-expected.txt
deleted file mode 100644
index d653b21..0000000
--- a/LayoutTests/platform/qt/editing/selection/5136696-expected.txt
+++ /dev/null
@@ -1,27 +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 784x19
- RenderText {#text} at (0,0) size 675x19
- text run at (0,0) width 675: "This tests to make sure that a selection in one from isn't cleared when focusing a node in a different frame."
- RenderBlock (anonymous) at (0,33) size 784x183
- RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
- layer at (0,0) size 300x150
- RenderView at (0,0) size 300x150
- layer at (0,0) size 300x150
- RenderBlock {HTML} at (0,0) size 300x150
- RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
- RenderText {#text} at (0,0) size 276x38
- text run at (0,0) width 276: "This test should be selected, but this frame "
- text run at (0,19) width 135: "shouldn't be focused."
- RenderBR {BR} at (304,154) size 0x0
- RenderTextControl {INPUT} at (2,156) size 248x25 [border: (2px inset #000000)]
- RenderText {#text} at (0,0) size 0x0
-layer at (13,200) size 242x19
- RenderBlock {DIV} at (3,3) size 242x19
- RenderText {#text} at (1,0) size 208x19
- text run at (1,0) width 208: "This text field should be focused."
-selection start: position 0 of child 0 {#text} of child 0 {DIV} of child 5 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
-selection end: position 34 of child 0 {#text} of child 0 {DIV} of child 5 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list