[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:54:37 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a2dc8d5500dee31d77f3856da1a193fcbe7e51b5
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Oct 24 16:58:00 2010 +0000
2010-10-24 Daniel Bates <dbates at rim.com>
Reviewed by Antonio Gomes.
Convert layout test fast/frame/frame-src-attribute.html from
render-tree/pixel test to text-only test
https://bugs.webkit.org/show_bug.cgi?id=48200
Modified the test case LayoutTests/fast/frame/frame-src-attribute.html
to dump its output as text.
Currently, the test produces a render-tree dump. Instead, it is sufficient
for this test to dump as text since it is a PASS/FAIL-style test. This will
also make the test results platform-independent.
* fast/frames/frame-src-attribute-expected.txt: Added.
* fast/frames/frame-src-attribute.html: Modified to dump its output as text.
* platform/chromium-linux/fast/frames/frame-src-attribute-expected.checksum: Removed.
* platform/chromium-linux/fast/frames/frame-src-attribute-expected.png: Removed.
* platform/chromium-mac/fast/frames/frame-src-attribute-expected.checksum: Removed.
* platform/chromium-mac/fast/frames/frame-src-attribute-expected.png: Removed.
* platform/chromium-win/fast/frames/frame-src-attribute-expected.checksum: Removed.
* platform/chromium-win/fast/frames/frame-src-attribute-expected.png: Removed.
* platform/chromium-win/fast/frames/frame-src-attribute-expected.txt: Removed.
* platform/gtk/fast/frames/frame-src-attribute-expected.txt: Removed.
* platform/mac/fast/frames/frame-src-attribute-expected.checksum: Removed.
* platform/mac/fast/frames/frame-src-attribute-expected.png: Removed.
* platform/mac/fast/frames/frame-src-attribute-expected.txt: Removed.
* platform/qt/fast/frames/frame-src-attribute-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70416 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 41c764f..762cc45 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,33 @@
+2010-10-24 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Antonio Gomes.
+
+ Convert layout test fast/frame/frame-src-attribute.html from
+ render-tree/pixel test to text-only test
+ https://bugs.webkit.org/show_bug.cgi?id=48200
+
+ Modified the test case LayoutTests/fast/frame/frame-src-attribute.html
+ to dump its output as text.
+
+ Currently, the test produces a render-tree dump. Instead, it is sufficient
+ for this test to dump as text since it is a PASS/FAIL-style test. This will
+ also make the test results platform-independent.
+
+ * fast/frames/frame-src-attribute-expected.txt: Added.
+ * fast/frames/frame-src-attribute.html: Modified to dump its output as text.
+ * platform/chromium-linux/fast/frames/frame-src-attribute-expected.checksum: Removed.
+ * platform/chromium-linux/fast/frames/frame-src-attribute-expected.png: Removed.
+ * platform/chromium-mac/fast/frames/frame-src-attribute-expected.checksum: Removed.
+ * platform/chromium-mac/fast/frames/frame-src-attribute-expected.png: Removed.
+ * platform/chromium-win/fast/frames/frame-src-attribute-expected.checksum: Removed.
+ * platform/chromium-win/fast/frames/frame-src-attribute-expected.png: Removed.
+ * platform/chromium-win/fast/frames/frame-src-attribute-expected.txt: Removed.
+ * platform/gtk/fast/frames/frame-src-attribute-expected.txt: Removed.
+ * platform/mac/fast/frames/frame-src-attribute-expected.checksum: Removed.
+ * platform/mac/fast/frames/frame-src-attribute-expected.png: Removed.
+ * platform/mac/fast/frames/frame-src-attribute-expected.txt: Removed.
+ * platform/qt/fast/frames/frame-src-attribute-expected.txt: Removed.
+
2010-10-24 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Dimitri Glazkov.
diff --git a/LayoutTests/fast/frames/frame-src-attribute-expected.txt b/LayoutTests/fast/frames/frame-src-attribute-expected.txt
new file mode 100644
index 0000000..a86166d
--- /dev/null
+++ b/LayoutTests/fast/frames/frame-src-attribute-expected.txt
@@ -0,0 +1,13 @@
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+This test checks whether a frame element's 'src' attribute is a complete, rather than relative, URL.
+
+PASS: Frame 'src' attribute should include 'LayoutTests/fast/frames' and does.
+
+--------
+Frame: '<!--framePath //<!--frame1-->-->'
+--------
+
diff --git a/LayoutTests/fast/frames/frame-src-attribute.html b/LayoutTests/fast/frames/frame-src-attribute.html
index d23f92e..54d8aeb 100644
--- a/LayoutTests/fast/frames/frame-src-attribute.html
+++ b/LayoutTests/fast/frames/frame-src-attribute.html
@@ -1,6 +1,12 @@
<html>
<head>
<script>
+
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.dumpChildFramesAsText();
+}
+
function write(s)
{
frames[0].document.getElementById('console').appendChild(document.createTextNode(s));
diff --git a/LayoutTests/platform/chromium-linux/fast/frames/frame-src-attribute-expected.checksum b/LayoutTests/platform/chromium-linux/fast/frames/frame-src-attribute-expected.checksum
deleted file mode 100644
index a62b84d..0000000
--- a/LayoutTests/platform/chromium-linux/fast/frames/frame-src-attribute-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-81baae808ffa3bbcb8b05f5ebd632673
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/frames/frame-src-attribute-expected.png b/LayoutTests/platform/chromium-linux/fast/frames/frame-src-attribute-expected.png
deleted file mode 100644
index 841bf0a..0000000
Binary files a/LayoutTests/platform/chromium-linux/fast/frames/frame-src-attribute-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-mac/fast/frames/frame-src-attribute-expected.checksum b/LayoutTests/platform/chromium-mac/fast/frames/frame-src-attribute-expected.checksum
deleted file mode 100644
index a7db815..0000000
--- a/LayoutTests/platform/chromium-mac/fast/frames/frame-src-attribute-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-957291adbd8c3ea1d70a02402fcaa303
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/fast/frames/frame-src-attribute-expected.png b/LayoutTests/platform/chromium-mac/fast/frames/frame-src-attribute-expected.png
deleted file mode 100644
index 9d39ff0..0000000
Binary files a/LayoutTests/platform/chromium-mac/fast/frames/frame-src-attribute-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/frames/frame-src-attribute-expected.checksum b/LayoutTests/platform/chromium-win/fast/frames/frame-src-attribute-expected.checksum
deleted file mode 100644
index 0ac6219..0000000
--- a/LayoutTests/platform/chromium-win/fast/frames/frame-src-attribute-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-faf27f6924fe3411f3275fa7b12f489c
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/frames/frame-src-attribute-expected.png b/LayoutTests/platform/chromium-win/fast/frames/frame-src-attribute-expected.png
deleted file mode 100644
index 27222a4..0000000
Binary files a/LayoutTests/platform/chromium-win/fast/frames/frame-src-attribute-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/frames/frame-src-attribute-expected.txt b/LayoutTests/platform/chromium-win/fast/frames/frame-src-attribute-expected.txt
deleted file mode 100644
index 4effcb0..0000000
--- a/LayoutTests/platform/chromium-win/fast/frames/frame-src-attribute-expected.txt
+++ /dev/null
@@ -1,23 +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
- RenderFrame {FRAME} at (0,0) size 800x600
- 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 784x579
- RenderBlock {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 581x19
- text run at (0,0) width 581: "This test checks whether a frame element's 'src' attribute is a complete, rather than relative, URL."
- RenderBlock {PRE} at (0,36) size 784x16
- RenderText {#text} at (0,0) size 624x16
- text run at (0,0) width 624: "PASS: Frame 'src' attribute should include 'LayoutTests/fast/frames' and does."
- RenderFrame {FRAME} at (0,0) size 0x0
- layer at (0,0) size 8x8
- RenderView at (0,0) size 0x0
- layer at (0,0) size 8x8
- RenderBlock {HTML} at (0,0) size 0x8
- RenderBody {BODY} at (8,8) size 0x0
diff --git a/LayoutTests/platform/gtk/fast/frames/frame-src-attribute-expected.txt b/LayoutTests/platform/gtk/fast/frames/frame-src-attribute-expected.txt
deleted file mode 100644
index e78e86d..0000000
--- a/LayoutTests/platform/gtk/fast/frames/frame-src-attribute-expected.txt
+++ /dev/null
@@ -1,23 +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
- RenderFrame {FRAME} at (0,0) size 800x600
- 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 784x579
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 581x19
- text run at (0,0) width 581: "This test checks whether a frame element's 'src' attribute is a complete, rather than relative, URL."
- RenderBlock {PRE} at (0,35) size 784x15
- RenderText {#text} at (0,0) size 624x15
- text run at (0,0) width 624: "PASS: Frame 'src' attribute should include 'LayoutTests/fast/frames' and does."
- RenderFrame {FRAME} at (0,0) size 0x0
- layer at (0,0) size 8x8
- RenderView at (0,0) size 0x0
- layer at (0,0) size 8x8
- RenderBlock {HTML} at (0,0) size 0x8
- RenderBody {BODY} at (8,8) size 0x0
diff --git a/LayoutTests/platform/mac/fast/frames/frame-src-attribute-expected.checksum b/LayoutTests/platform/mac/fast/frames/frame-src-attribute-expected.checksum
deleted file mode 100644
index 587c3f2..0000000
--- a/LayoutTests/platform/mac/fast/frames/frame-src-attribute-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-4c2263ca8844028852407e45f4c35a11
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/frames/frame-src-attribute-expected.png b/LayoutTests/platform/mac/fast/frames/frame-src-attribute-expected.png
deleted file mode 100644
index ed39928..0000000
Binary files a/LayoutTests/platform/mac/fast/frames/frame-src-attribute-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/fast/frames/frame-src-attribute-expected.txt b/LayoutTests/platform/mac/fast/frames/frame-src-attribute-expected.txt
deleted file mode 100644
index c95f3f7..0000000
--- a/LayoutTests/platform/mac/fast/frames/frame-src-attribute-expected.txt
+++ /dev/null
@@ -1,23 +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
- RenderFrame {FRAME} at (0,0) size 800x600
- 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 784x579
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 607x18
- text run at (0,0) width 607: "This test checks whether a frame element's 'src' attribute is a complete, rather than relative, URL."
- RenderBlock {PRE} at (0,34) size 784x15
- RenderText {#text} at (0,0) size 624x15
- text run at (0,0) width 624: "PASS: Frame 'src' attribute should include 'LayoutTests/fast/frames' and does."
- RenderFrame {FRAME} at (0,0) size 0x0
- layer at (0,0) size 8x8
- RenderView at (0,0) size 0x0
- layer at (0,0) size 8x8
- RenderBlock {HTML} at (0,0) size 0x8
- RenderBody {BODY} at (8,8) size 0x0
diff --git a/LayoutTests/platform/qt/fast/frames/frame-src-attribute-expected.txt b/LayoutTests/platform/qt/fast/frames/frame-src-attribute-expected.txt
deleted file mode 100644
index 685b752..0000000
--- a/LayoutTests/platform/qt/fast/frames/frame-src-attribute-expected.txt
+++ /dev/null
@@ -1,23 +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
- RenderFrame {FRAME} at (0,0) size 800x600
- 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 784x578
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 616x19
- text run at (0,0) width 616: "This test checks whether a frame element's 'src' attribute is a complete, rather than relative, URL."
- RenderBlock {PRE} at (0,33) size 784x19
- RenderText {#text} at (0,1) size 624x17
- text run at (0,1) width 624: "PASS: Frame 'src' attribute should include 'LayoutTests/fast/frames' and does."
- RenderFrame {FRAME} at (0,0) size 0x0
- layer at (0,0) size 8x8
- RenderView at (0,0) size 0x0
- layer at (0,0) size 8x8
- RenderBlock {HTML} at (0,0) size 0x8
- RenderBody {BODY} at (8,8) size 0x0
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list