[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dbates at webkit.org
dbates at webkit.org
Wed Dec 22 14:48:30 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8ec8fdbc35c492fe8b61b812745bb422c7508d14
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 20 22:23:31 2010 +0000
2010-10-20 Daniel Bates <dbates at rim.com>
Reviewed by Adam Barth.
Convert layout test LayoutTests/fast/frames/frame-element-name.html from
render-tree/pixel test to text-only test
https://bugs.webkit.org/show_bug.cgi?id=48011
Converts the test case frame-element-name.html from a render-tree dump/pixel-test
to a text-only test.
Also, changes the test output to a PASS/FAIL style.
* fast/frames/frame-element-name-expected.txt: Added.
* fast/frames/frame-element-name.html: Modified to dump its child frames as text.
* fast/frames/resources/frame-element-name-left.html: Changed output to PASS/FAIL.
* fast/frames/resources/frame-element-name-right.html: Changed output to PASS/FAIL;
changed <title> of page from "Left" to "Right" to reflect the name of the file and
the location of the frame this page is to be loaded in.
* platform/chromium-linux/fast/frames/frame-element-name-expected.checksum: Removed.
* platform/chromium-linux/fast/frames/frame-element-name-expected.png: Removed.
* platform/chromium-win/fast/frames/frame-element-name-expected.checksum: Removed.
* platform/chromium-win/fast/frames/frame-element-name-expected.png: Removed.
* platform/chromium-win/fast/frames/frame-element-name-expected.txt: Removed.
* platform/gtk/fast/frames/frame-element-name-expected.txt: Removed.
* platform/mac/fast/frames/frame-element-name-expected.checksum: Removed.
* platform/mac/fast/frames/frame-element-name-expected.png: Removed.
* platform/mac/fast/frames/frame-element-name-expected.txt: Removed.
* platform/qt/fast/frames/frame-element-name-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70185 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 11c9502..14bfaf9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,33 @@
+2010-10-20 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Adam Barth.
+
+ Convert layout test LayoutTests/fast/frames/frame-element-name.html from
+ render-tree/pixel test to text-only test
+ https://bugs.webkit.org/show_bug.cgi?id=48011
+
+ Converts the test case frame-element-name.html from a render-tree dump/pixel-test
+ to a text-only test.
+
+ Also, changes the test output to a PASS/FAIL style.
+
+ * fast/frames/frame-element-name-expected.txt: Added.
+ * fast/frames/frame-element-name.html: Modified to dump its child frames as text.
+ * fast/frames/resources/frame-element-name-left.html: Changed output to PASS/FAIL.
+ * fast/frames/resources/frame-element-name-right.html: Changed output to PASS/FAIL;
+ changed <title> of page from "Left" to "Right" to reflect the name of the file and
+ the location of the frame this page is to be loaded in.
+ * platform/chromium-linux/fast/frames/frame-element-name-expected.checksum: Removed.
+ * platform/chromium-linux/fast/frames/frame-element-name-expected.png: Removed.
+ * platform/chromium-win/fast/frames/frame-element-name-expected.checksum: Removed.
+ * platform/chromium-win/fast/frames/frame-element-name-expected.png: Removed.
+ * platform/chromium-win/fast/frames/frame-element-name-expected.txt: Removed.
+ * platform/gtk/fast/frames/frame-element-name-expected.txt: Removed.
+ * platform/mac/fast/frames/frame-element-name-expected.checksum: Removed.
+ * platform/mac/fast/frames/frame-element-name-expected.png: Removed.
+ * platform/mac/fast/frames/frame-element-name-expected.txt: Removed.
+ * platform/qt/fast/frames/frame-element-name-expected.txt: Removed.
+
2010-10-20 Adam Roben <aroben at apple.com>
Update media test results to account for the presence of the
diff --git a/LayoutTests/fast/frames/frame-element-name-expected.txt b/LayoutTests/fast/frames/frame-element-name-expected.txt
new file mode 100644
index 0000000..efcb192
--- /dev/null
+++ b/LayoutTests/fast/frames/frame-element-name-expected.txt
@@ -0,0 +1,13 @@
+
+
+--------
+Frame: 'left'
+--------
+PASS escape(window.frameElement.name) is "left"
+
+
+--------
+Frame: '<!--framePath //<!--frame1-->-->'
+--------
+PASS escape(window.frameElement.name) is ""
+
diff --git a/LayoutTests/fast/frames/frame-element-name.html b/LayoutTests/fast/frames/frame-element-name.html
index f2998cc..93acb17 100644
--- a/LayoutTests/fast/frames/frame-element-name.html
+++ b/LayoutTests/fast/frames/frame-element-name.html
@@ -1,4 +1,10 @@
<html>
+<head>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpChildFramesAsText();
+</script>
+</head>
<frameset border="1" cols="500,*" style='border: solid 1px;'>
<frame marginwidth="1" src="resources/frame-element-name-left.html" name='left'>
<frame src="resources/frame-element-name-right.html">
diff --git a/LayoutTests/fast/frames/resources/frame-element-name-left.html b/LayoutTests/fast/frames/resources/frame-element-name-left.html
index f95fc8a..3c0c59d 100644
--- a/LayoutTests/fast/frames/resources/frame-element-name-left.html
+++ b/LayoutTests/fast/frames/resources/frame-element-name-left.html
@@ -1,14 +1,11 @@
<head>
<title>Left</title>
+<link rel="stylesheet" href="../../js/resources/js-test-style.css">
+<script src="../../js/resources/js-test-pre.js"></script>
</head>
<body>
+<div id="console"></div>
<script>
-try {
-
- document.write("escape(window.frameElement.name)='" + escape(window.frameElement.name) + "' (should be 'left')");
-
-} catch (ex) {
- document.write('Exception: ' + ex.description);
-}
+shouldBeEqualToString("escape(window.frameElement.name)", "left");
</script>
</body>
diff --git a/LayoutTests/fast/frames/resources/frame-element-name-right.html b/LayoutTests/fast/frames/resources/frame-element-name-right.html
index 9b76281..c09bb59 100644
--- a/LayoutTests/fast/frames/resources/frame-element-name-right.html
+++ b/LayoutTests/fast/frames/resources/frame-element-name-right.html
@@ -1,14 +1,11 @@
<head>
-<title>Left</title>
+<title>Right</title>
+<link rel="stylesheet" href="../../js/resources/js-test-style.css">
+<script src="../../js/resources/js-test-pre.js"></script>
</head>
<body>
+<div id="console"></div>
<script>
-try {
-
- document.write("escape(window.frameElement.name)='" + escape(window.frameElement.name) + "' (should be '')");
-
-} catch (ex) {
- document.write('Exception: ' + ex.description);
-}
+shouldBeEqualToString("escape(window.frameElement.name)", "");
</script>
</body>
diff --git a/LayoutTests/platform/chromium-linux/fast/frames/frame-element-name-expected.checksum b/LayoutTests/platform/chromium-linux/fast/frames/frame-element-name-expected.checksum
deleted file mode 100644
index 57642bb..0000000
--- a/LayoutTests/platform/chromium-linux/fast/frames/frame-element-name-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-0ea3081a1ed57a5fb088009d1e70d959
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/frames/frame-element-name-expected.png b/LayoutTests/platform/chromium-linux/fast/frames/frame-element-name-expected.png
deleted file mode 100644
index 207265f..0000000
Binary files a/LayoutTests/platform/chromium-linux/fast/frames/frame-element-name-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/frames/frame-element-name-expected.checksum b/LayoutTests/platform/chromium-win/fast/frames/frame-element-name-expected.checksum
deleted file mode 100644
index 77dca6e..0000000
--- a/LayoutTests/platform/chromium-win/fast/frames/frame-element-name-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-eec63219a67634fce3e9d6264a1c651c
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/frames/frame-element-name-expected.png b/LayoutTests/platform/chromium-win/fast/frames/frame-element-name-expected.png
deleted file mode 100644
index 406b9db..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/frames/frame-element-name-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/frames/frame-element-name-expected.txt b/LayoutTests/platform/chromium-win/fast/frames/frame-element-name-expected.txt
deleted file mode 100644
index 7784ccd..0000000
--- a/LayoutTests/platform/chromium-win/fast/frames/frame-element-name-expected.txt
+++ /dev/null
@@ -1,22 +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
- RenderFrameSet {FRAMESET} at (0,0) size 800x600 [border: (1px solid #000000)]
- RenderFrame {FRAME} at (0,0) size 500x600
- layer at (0,0) size 500x600
- RenderView at (0,0) size 500x600
- layer at (0,0) size 500x600
- RenderBlock {HTML} at (0,0) size 500x600
- RenderBody {BODY} at (1,8) size 498x584
- RenderText {#text} at (0,0) size 355x19
- text run at (0,0) width 355: "escape(window.frameElement.name)='left' (should be 'left')"
- RenderFrame {FRAME} at (501,0) size 299x600
- layer at (0,0) size 299x600
- RenderView at (0,0) size 299x600
- layer at (0,0) size 299x600
- RenderBlock {HTML} at (0,0) size 299x600
- RenderBody {BODY} at (8,8) size 283x584
- RenderText {#text} at (0,0) size 237x39
- text run at (0,0) width 237: "escape(window.frameElement.name)=''"
- text run at (0,20) width 78: "(should be '')"
diff --git a/LayoutTests/platform/gtk/fast/frames/frame-element-name-expected.txt b/LayoutTests/platform/gtk/fast/frames/frame-element-name-expected.txt
deleted file mode 100644
index b8e1101..0000000
--- a/LayoutTests/platform/gtk/fast/frames/frame-element-name-expected.txt
+++ /dev/null
@@ -1,22 +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
- RenderFrameSet {FRAMESET} at (0,0) size 800x600 [border: (1px solid #000000)]
- RenderFrame {FRAME} at (0,0) size 500x600
- layer at (0,0) size 500x600
- RenderView at (0,0) size 500x600
- layer at (0,0) size 500x600
- RenderBlock {HTML} at (0,0) size 500x600
- RenderBody {BODY} at (1,8) size 498x584
- RenderText {#text} at (0,0) size 355x19
- text run at (0,0) width 355: "escape(window.frameElement.name)='left' (should be 'left')"
- RenderFrame {FRAME} at (501,0) size 299x600
- layer at (0,0) size 299x600
- RenderView at (0,0) size 299x600
- layer at (0,0) size 299x600
- RenderBlock {HTML} at (0,0) size 299x600
- RenderBody {BODY} at (8,8) size 283x584
- RenderText {#text} at (0,0) size 237x38
- text run at (0,0) width 237: "escape(window.frameElement.name)=''"
- text run at (0,19) width 78: "(should be '')"
diff --git a/LayoutTests/platform/mac/fast/frames/frame-element-name-expected.checksum b/LayoutTests/platform/mac/fast/frames/frame-element-name-expected.checksum
deleted file mode 100644
index e6c0140..0000000
--- a/LayoutTests/platform/mac/fast/frames/frame-element-name-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-14dd2877c7e73202b5b6e1fdb3e23242
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/frames/frame-element-name-expected.png b/LayoutTests/platform/mac/fast/frames/frame-element-name-expected.png
deleted file mode 100644
index b9134c0..0000000
Binary files a/LayoutTests/platform/mac/fast/frames/frame-element-name-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/frames/frame-element-name-expected.txt b/LayoutTests/platform/mac/fast/frames/frame-element-name-expected.txt
deleted file mode 100644
index aa7a59e..0000000
--- a/LayoutTests/platform/mac/fast/frames/frame-element-name-expected.txt
+++ /dev/null
@@ -1,22 +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
- RenderFrameSet {FRAMESET} at (0,0) size 800x600 [border: (1px solid #000000)]
- RenderFrame {FRAME} at (0,0) size 500x600
- layer at (0,0) size 500x600
- RenderView at (0,0) size 500x600
- layer at (0,0) size 500x600
- RenderBlock {HTML} at (0,0) size 500x600
- RenderBody {BODY} at (1,8) size 498x584
- RenderText {#text} at (0,0) size 374x18
- text run at (0,0) width 374: "escape(window.frameElement.name)='left' (should be 'left')"
- RenderFrame {FRAME} at (501,0) size 299x600
- layer at (0,0) size 299x600
- RenderView at (0,0) size 299x600
- layer at (0,0) size 299x600
- RenderBlock {HTML} at (0,0) size 299x600
- RenderBody {BODY} at (8,8) size 283x584
- RenderText {#text} at (0,0) size 249x36
- text run at (0,0) width 249: "escape(window.frameElement.name)=''"
- text run at (0,18) width 81: "(should be '')"
diff --git a/LayoutTests/platform/qt/fast/frames/frame-element-name-expected.txt b/LayoutTests/platform/qt/fast/frames/frame-element-name-expected.txt
deleted file mode 100644
index 9057215..0000000
--- a/LayoutTests/platform/qt/fast/frames/frame-element-name-expected.txt
+++ /dev/null
@@ -1,24 +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
- RenderFrameSet {FRAMESET} at (0,0) size 800x600 [border: (1px solid #000000)]
- RenderFrame {FRAME} at (0,0) size 500x600
- layer at (0,0) size 500x600
- RenderView at (0,0) size 500x600
- layer at (0,0) size 500x600
- RenderBlock {HTML} at (0,0) size 500x600
- RenderBody {BODY} at (1,8) size 498x584
- RenderText {#text} at (0,0) size 374x19
- text run at (0,0) width 374: "escape(window.frameElement.name)='left' (should be 'left')"
- RenderText {#text} at (0,0) size 0x0
- RenderFrame {FRAME} at (501,0) size 299x600
- layer at (0,0) size 299x600
- RenderView at (0,0) size 299x600
- layer at (0,0) size 299x600
- RenderBlock {HTML} at (0,0) size 299x600
- RenderBody {BODY} at (8,8) size 283x584
- RenderText {#text} at (0,0) size 250x38
- text run at (0,0) width 250: "escape(window.frameElement.name)=''"
- text run at (0,19) width 82: "(should be '')"
- RenderText {#text} at (0,0) size 0x0
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list