[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
hamaji at chromium.org
hamaji at chromium.org
Thu Feb 4 21:24:52 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit d15bf1a019139327fd49f87e7b2d963f8c0e839f
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 22 14:28:56 2010 +0000
2010-01-22 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
incorrect results for css2.1 layout tests that use setTimeout in body onload event
https://bugs.webkit.org/show_bug.cgi?id=17557
* css2.1/README.txt: Added.
* css2.1/t1204-increment-00-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-increment-00-c-o.html.
* css2.1/t1204-increment-01-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-increment-01-c-o.html.
* css2.1/t1204-increment-02-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-increment-02-c-o.html.
* css2.1/t1204-reset-00-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-reset-00-c-o.html.
* css2.1/t1204-reset-01-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-reset-01-c-o.html.
* css2.1/t1204-reset-02-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-reset-02-c-o.html.
* fast/css/counters/counter-increment-000-expected.txt: Renamed from LayoutTests/fast/css/counters/t1204-increment-00-c-o-expected.txt.
* fast/css/counters/counter-increment-000.html: Renamed from LayoutTests/fast/css/counters/t1204-increment-00-c-o.html.
* fast/css/counters/counter-increment-001-expected.txt: Renamed from LayoutTests/fast/css/counters/t1204-increment-01-c-o-expected.txt.
* fast/css/counters/counter-increment-001.html: Renamed from LayoutTests/fast/css/counters/t1204-increment-01-c-o.html.
* fast/css/counters/counter-reset-001-expected.txt: Added.
* fast/css/counters/counter-reset-001.html: Added.
* platform/mac/css2.1/t1204-increment-00-c-o-expected.checksum: Removed.
* platform/mac/css2.1/t1204-increment-00-c-o-expected.png: Removed.
* platform/mac/css2.1/t1204-increment-00-c-o-expected.txt: Removed.
* platform/mac/css2.1/t1204-increment-01-c-o-expected.checksum: Removed.
* platform/mac/css2.1/t1204-increment-01-c-o-expected.png: Removed.
* platform/mac/css2.1/t1204-increment-01-c-o-expected.txt: Removed.
* platform/mac/css2.1/t1204-increment-02-c-o-expected.checksum: Removed.
* platform/mac/css2.1/t1204-increment-02-c-o-expected.png: Removed.
* platform/mac/css2.1/t1204-increment-02-c-o-expected.txt: Removed.
* platform/mac/css2.1/t1204-reset-00-c-o-expected.checksum: Removed.
* platform/mac/css2.1/t1204-reset-00-c-o-expected.png: Removed.
* platform/mac/css2.1/t1204-reset-00-c-o-expected.txt: Removed.
* platform/mac/css2.1/t1204-reset-01-c-o-expected.checksum: Removed.
* platform/mac/css2.1/t1204-reset-01-c-o-expected.png: Removed.
* platform/mac/css2.1/t1204-reset-01-c-o-expected.txt: Removed.
* platform/mac/css2.1/t1204-reset-02-c-o-expected.checksum: Removed.
* platform/mac/css2.1/t1204-reset-02-c-o-expected.png: Removed.
* platform/mac/css2.1/t1204-reset-02-c-o-expected.txt: Removed.
* platform/qt/css2.1/t1204-increment-00-c-o-expected.txt: Removed.
* platform/qt/css2.1/t1204-increment-01-c-o-expected.txt: Removed.
* platform/qt/css2.1/t1204-increment-02-c-o-expected.txt: Removed.
* platform/qt/css2.1/t1204-reset-00-c-o-expected.txt: Removed.
* platform/qt/css2.1/t1204-reset-01-c-o-expected.txt: Removed.
* platform/qt/css2.1/t1204-reset-02-c-o-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53701 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cb87851..ce62de1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,48 @@
+2010-01-22 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ incorrect results for css2.1 layout tests that use setTimeout in body onload event
+ https://bugs.webkit.org/show_bug.cgi?id=17557
+
+ * css2.1/README.txt: Added.
+ * css2.1/t1204-increment-00-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-increment-00-c-o.html.
+ * css2.1/t1204-increment-01-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-increment-01-c-o.html.
+ * css2.1/t1204-increment-02-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-increment-02-c-o.html.
+ * css2.1/t1204-reset-00-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-reset-00-c-o.html.
+ * css2.1/t1204-reset-01-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-reset-01-c-o.html.
+ * css2.1/t1204-reset-02-c-o.html-disabled: Renamed from LayoutTests/css2.1/t1204-reset-02-c-o.html.
+ * fast/css/counters/counter-increment-000-expected.txt: Renamed from LayoutTests/fast/css/counters/t1204-increment-00-c-o-expected.txt.
+ * fast/css/counters/counter-increment-000.html: Renamed from LayoutTests/fast/css/counters/t1204-increment-00-c-o.html.
+ * fast/css/counters/counter-increment-001-expected.txt: Renamed from LayoutTests/fast/css/counters/t1204-increment-01-c-o-expected.txt.
+ * fast/css/counters/counter-increment-001.html: Renamed from LayoutTests/fast/css/counters/t1204-increment-01-c-o.html.
+ * fast/css/counters/counter-reset-001-expected.txt: Added.
+ * fast/css/counters/counter-reset-001.html: Added.
+ * platform/mac/css2.1/t1204-increment-00-c-o-expected.checksum: Removed.
+ * platform/mac/css2.1/t1204-increment-00-c-o-expected.png: Removed.
+ * platform/mac/css2.1/t1204-increment-00-c-o-expected.txt: Removed.
+ * platform/mac/css2.1/t1204-increment-01-c-o-expected.checksum: Removed.
+ * platform/mac/css2.1/t1204-increment-01-c-o-expected.png: Removed.
+ * platform/mac/css2.1/t1204-increment-01-c-o-expected.txt: Removed.
+ * platform/mac/css2.1/t1204-increment-02-c-o-expected.checksum: Removed.
+ * platform/mac/css2.1/t1204-increment-02-c-o-expected.png: Removed.
+ * platform/mac/css2.1/t1204-increment-02-c-o-expected.txt: Removed.
+ * platform/mac/css2.1/t1204-reset-00-c-o-expected.checksum: Removed.
+ * platform/mac/css2.1/t1204-reset-00-c-o-expected.png: Removed.
+ * platform/mac/css2.1/t1204-reset-00-c-o-expected.txt: Removed.
+ * platform/mac/css2.1/t1204-reset-01-c-o-expected.checksum: Removed.
+ * platform/mac/css2.1/t1204-reset-01-c-o-expected.png: Removed.
+ * platform/mac/css2.1/t1204-reset-01-c-o-expected.txt: Removed.
+ * platform/mac/css2.1/t1204-reset-02-c-o-expected.checksum: Removed.
+ * platform/mac/css2.1/t1204-reset-02-c-o-expected.png: Removed.
+ * platform/mac/css2.1/t1204-reset-02-c-o-expected.txt: Removed.
+ * platform/qt/css2.1/t1204-increment-00-c-o-expected.txt: Removed.
+ * platform/qt/css2.1/t1204-increment-01-c-o-expected.txt: Removed.
+ * platform/qt/css2.1/t1204-increment-02-c-o-expected.txt: Removed.
+ * platform/qt/css2.1/t1204-reset-00-c-o-expected.txt: Removed.
+ * platform/qt/css2.1/t1204-reset-01-c-o-expected.txt: Removed.
+ * platform/qt/css2.1/t1204-reset-02-c-o-expected.txt: Removed.
+
2010-01-22 Csaba Osztrogonác <ossy at webkit.org>
[Qt] Skip test introduced in r53684 because of missing eventSender.textZoomIn()
diff --git a/LayoutTests/css2.1/README.txt b/LayoutTests/css2.1/README.txt
new file mode 100644
index 0000000..91b34e8
--- /dev/null
+++ b/LayoutTests/css2.1/README.txt
@@ -0,0 +1,15 @@
+This is the copy of W3C's CSS2.1 test suite.
+
+http://www.w3.org/Style/CSS/Test/CSS2.1/20061011/
+
+We should not add files into this directory and should not modify the
+files in this directory. If you find invalid test cases in this
+directory, report the problem to W3C and update the files of this
+directory after they fixed the issue.
+
+* About t1204-(increment|reset)-
+
+These 6 tests produce wrong results with DumpRenderTree because they
+use setTimeout but there are no waitUntilDone call. We disabled them
+in this directory and have modified version of them as
+fast/css/counters/counter-(increment|reset)-* .
diff --git a/LayoutTests/css2.1/t1204-increment-00-c-o.html b/LayoutTests/css2.1/t1204-increment-00-c-o.html-disabled
similarity index 100%
rename from LayoutTests/css2.1/t1204-increment-00-c-o.html
rename to LayoutTests/css2.1/t1204-increment-00-c-o.html-disabled
diff --git a/LayoutTests/css2.1/t1204-increment-01-c-o.html b/LayoutTests/css2.1/t1204-increment-01-c-o.html-disabled
similarity index 100%
rename from LayoutTests/css2.1/t1204-increment-01-c-o.html
rename to LayoutTests/css2.1/t1204-increment-01-c-o.html-disabled
diff --git a/LayoutTests/css2.1/t1204-increment-02-c-o.html b/LayoutTests/css2.1/t1204-increment-02-c-o.html-disabled
similarity index 100%
rename from LayoutTests/css2.1/t1204-increment-02-c-o.html
rename to LayoutTests/css2.1/t1204-increment-02-c-o.html-disabled
diff --git a/LayoutTests/css2.1/t1204-reset-00-c-o.html b/LayoutTests/css2.1/t1204-reset-00-c-o.html-disabled
similarity index 100%
rename from LayoutTests/css2.1/t1204-reset-00-c-o.html
rename to LayoutTests/css2.1/t1204-reset-00-c-o.html-disabled
diff --git a/LayoutTests/css2.1/t1204-reset-01-c-o.html b/LayoutTests/css2.1/t1204-reset-01-c-o.html-disabled
similarity index 100%
rename from LayoutTests/css2.1/t1204-reset-01-c-o.html
rename to LayoutTests/css2.1/t1204-reset-01-c-o.html-disabled
diff --git a/LayoutTests/css2.1/t1204-reset-02-c-o.html b/LayoutTests/css2.1/t1204-reset-02-c-o.html-disabled
similarity index 100%
rename from LayoutTests/css2.1/t1204-reset-02-c-o.html
rename to LayoutTests/css2.1/t1204-reset-02-c-o.html-disabled
diff --git a/LayoutTests/fast/css/counters/t1204-increment-00-c-o-expected.txt b/LayoutTests/fast/css/counters/counter-increment-000-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/counters/t1204-increment-00-c-o-expected.txt
rename to LayoutTests/fast/css/counters/counter-increment-000-expected.txt
diff --git a/LayoutTests/fast/css/counters/t1204-increment-00-c-o.html b/LayoutTests/fast/css/counters/counter-increment-000.html
similarity index 100%
rename from LayoutTests/fast/css/counters/t1204-increment-00-c-o.html
rename to LayoutTests/fast/css/counters/counter-increment-000.html
diff --git a/LayoutTests/fast/css/counters/t1204-increment-01-c-o-expected.txt b/LayoutTests/fast/css/counters/counter-increment-001-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/counters/t1204-increment-01-c-o-expected.txt
rename to LayoutTests/fast/css/counters/counter-increment-001-expected.txt
diff --git a/LayoutTests/fast/css/counters/t1204-increment-01-c-o.html b/LayoutTests/fast/css/counters/counter-increment-001.html
similarity index 100%
rename from LayoutTests/fast/css/counters/t1204-increment-01-c-o.html
rename to LayoutTests/fast/css/counters/counter-increment-001.html
diff --git a/LayoutTests/fast/css/counters/counter-reset-001-expected.txt b/LayoutTests/fast/css/counters/counter-reset-001-expected.txt
new file mode 100644
index 0000000..59894af
--- /dev/null
+++ b/LayoutTests/fast/css/counters/counter-reset-001-expected.txt
@@ -0,0 +1,4 @@
+The following two lines should be the same:
+
+1-2-3-
+1-2-3-
diff --git a/LayoutTests/fast/css/counters/counter-reset-001.html b/LayoutTests/fast/css/counters/counter-reset-001.html
new file mode 100644
index 0000000..d5371cc
--- /dev/null
+++ b/LayoutTests/fast/css/counters/counter-reset-001.html
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+ <head>
+ <title>CSS 2.1 Test Suite: dynamic changes to 'counter-increment'</title>
+ <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#counters">
+ <link rel="help" href="http://www.w3.org/TR/CSS21/generate.html#propdef-content">
+ <link rel="help" href="http://www.w3.org/TR/CSS21/syndata.html#counter">
+ <meta http-equiv="Content-Script-Type" content="text/javascript"></meta>
+ <style type="text/css">
+
+ body { white-space: nowrap; }
+
+
+ #test, .reset { counter-reset: c; }
+ .increment:before { content: counters(c, ".") "-"; }
+ .increment { counter-increment: c; }
+
+ </style>
+ <script type="text/javascript">
+
+ function run() {
+ if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ // This call ensures the layout happened before we modify the DOM tree.
+ layoutTestController.counterValueForElementById("span1");
+ }
+
+ var t = document.getElementById("test");
+ t.removeChild(t.childNodes.item(1));
+
+ if (window.layoutTestController) {
+ testElement = document.getElementById("test");
+ console = document.getElementById("console");
+ spanList = testElement.getElementsByTagName("span");
+ for (i = 0; i < spanList.length; ++i ) {
+ newSpanElement = document.createElement("span");
+ newSpanElement.innerText = layoutTestController.counterValueForElementById(spanList.item(i).getAttribute("id"));
+ if (newSpanElement.innerText.length)
+ newSpanElement.innerText = newSpanElement.innerText + "-";
+ console.appendChild(newSpanElement);
+ }
+ }
+ }
+
+ </script>
+ </head>
+ <body onload="run();">
+
+ <p>The following two lines should be the same:</p>
+
+ <div id="test"><span id="span1" class="increment"></span><span id="span2" class="reset"></span><span id="span3" class="increment"></span><span id="span4" class="increment"></span></div>
+
+ <div id="reference">1-2-3-</div>
+ <hr>
+ <div id="console"/>
+ </body>
+</html>
diff --git a/LayoutTests/platform/mac/css2.1/t1204-increment-00-c-o-expected.checksum b/LayoutTests/platform/mac/css2.1/t1204-increment-00-c-o-expected.checksum
deleted file mode 100644
index 8af2484..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-increment-00-c-o-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-acabdcf878b6d8b3320ef403a236f9bb
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/css2.1/t1204-increment-00-c-o-expected.png b/LayoutTests/platform/mac/css2.1/t1204-increment-00-c-o-expected.png
deleted file mode 100644
index b7dd4e2..0000000
Binary files a/LayoutTests/platform/mac/css2.1/t1204-increment-00-c-o-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/t1204-increment-00-c-o-expected.txt b/LayoutTests/platform/mac/css2.1/t1204-increment-00-c-o-expected.txt
deleted file mode 100644
index 734fc4c..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-increment-00-c-o-expected.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x94
- RenderBlock {HTML} at (0,0) size 800x94
- RenderBody {BODY} at (8,16) size 784x70
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 279x18
- text run at (0,0) width 279: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,34) size 784x18
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (0,0) size 8x18
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x18
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (13,0) size 8x18
- text run at (13,0) width 8: "2"
- RenderText at (21,0) size 5x18
- text run at (21,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (26,0) size 8x18
- text run at (26,0) width 8: "3"
- RenderText at (34,0) size 5x18
- text run at (34,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x18
- RenderText {#text} at (0,0) size 84x18
- text run at (0,0) width 84: "1-2-new-3-4-"
diff --git a/LayoutTests/platform/mac/css2.1/t1204-increment-01-c-o-expected.checksum b/LayoutTests/platform/mac/css2.1/t1204-increment-01-c-o-expected.checksum
deleted file mode 100644
index 1039c47..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-increment-01-c-o-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-07e48cae2d35d59c9eaa46872b157c8f
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/css2.1/t1204-increment-01-c-o-expected.png b/LayoutTests/platform/mac/css2.1/t1204-increment-01-c-o-expected.png
deleted file mode 100644
index 22a698c..0000000
Binary files a/LayoutTests/platform/mac/css2.1/t1204-increment-01-c-o-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/t1204-increment-01-c-o-expected.txt b/LayoutTests/platform/mac/css2.1/t1204-increment-01-c-o-expected.txt
deleted file mode 100644
index d49632d..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-increment-01-c-o-expected.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x94
- RenderBlock {HTML} at (0,0) size 800x94
- RenderBody {BODY} at (8,16) size 784x70
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 279x18
- text run at (0,0) width 279: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,34) size 784x18
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (0,0) size 8x18
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x18
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 54x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (13,0) size 8x18
- text run at (13,0) width 8: "2"
- RenderText at (21,0) size 5x18
- text run at (21,0) width 5: "-"
- RenderText {#text} at (26,0) size 41x18
- text run at (26,0) width 41: "FAIL-"
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (67,0) size 8x18
- text run at (67,0) width 8: "3"
- RenderText at (75,0) size 5x18
- text run at (75,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (80,0) size 8x18
- text run at (80,0) width 8: "4"
- RenderText at (88,0) size 5x18
- text run at (88,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x18
- RenderText {#text} at (0,0) size 39x18
- text run at (0,0) width 39: "1-2-3-"
diff --git a/LayoutTests/platform/mac/css2.1/t1204-increment-02-c-o-expected.checksum b/LayoutTests/platform/mac/css2.1/t1204-increment-02-c-o-expected.checksum
deleted file mode 100644
index d9f5960..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-increment-02-c-o-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-86e870f35174f8dc5df4f9f687dd004d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/css2.1/t1204-increment-02-c-o-expected.png b/LayoutTests/platform/mac/css2.1/t1204-increment-02-c-o-expected.png
deleted file mode 100644
index 5393eb0..0000000
Binary files a/LayoutTests/platform/mac/css2.1/t1204-increment-02-c-o-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/t1204-increment-02-c-o-expected.txt b/LayoutTests/platform/mac/css2.1/t1204-increment-02-c-o-expected.txt
deleted file mode 100644
index f21b544..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-increment-02-c-o-expected.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x94
- RenderBlock {HTML} at (0,0) size 800x94
- RenderBody {BODY} at (8,16) size 784x70
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 279x18
- text run at (0,0) width 279: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,34) size 784x18
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (0,0) size 8x18
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x18
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 50x18
- RenderInline {SPAN} at (0,0) size 50x18
- RenderInline {SPAN} at (0,0) size 25x18
- RenderInline (generated) at (0,0) size 25x18
- RenderCounter at (13,0) size 20x18
- text run at (13,0) width 20: "1.1"
- RenderText at (33,0) size 5x18
- text run at (33,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 25x18
- RenderInline (generated) at (0,0) size 25x18
- RenderCounter at (38,0) size 20x18
- text run at (38,0) width 20: "1.2"
- RenderText at (58,0) size 5x18
- text run at (58,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (63,0) size 8x18
- text run at (63,0) width 8: "1"
- RenderText at (71,0) size 5x18
- text run at (71,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (76,0) size 8x18
- text run at (76,0) width 8: "2"
- RenderText at (84,0) size 5x18
- text run at (84,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x18
- RenderText {#text} at (0,0) size 76x18
- text run at (0,0) width 76: "0.1-0.2-1-2-"
diff --git a/LayoutTests/platform/mac/css2.1/t1204-reset-00-c-o-expected.checksum b/LayoutTests/platform/mac/css2.1/t1204-reset-00-c-o-expected.checksum
deleted file mode 100644
index a700c1b..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-reset-00-c-o-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-ba67e1e09eeab4d5c0f423c35766d704
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/css2.1/t1204-reset-00-c-o-expected.png b/LayoutTests/platform/mac/css2.1/t1204-reset-00-c-o-expected.png
deleted file mode 100644
index be0ce39..0000000
Binary files a/LayoutTests/platform/mac/css2.1/t1204-reset-00-c-o-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/t1204-reset-00-c-o-expected.txt b/LayoutTests/platform/mac/css2.1/t1204-reset-00-c-o-expected.txt
deleted file mode 100644
index d0bd15d..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-reset-00-c-o-expected.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x94
- RenderBlock {HTML} at (0,0) size 800x94
- RenderBody {BODY} at (8,16) size 784x70
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 279x18
- text run at (0,0) width 279: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,34) size 784x18
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (0,0) size 8x18
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x18
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (13,0) size 8x18
- text run at (13,0) width 8: "2"
- RenderText at (21,0) size 5x18
- text run at (21,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (26,0) size 8x18
- text run at (26,0) width 8: "3"
- RenderText at (34,0) size 5x18
- text run at (34,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x18
- RenderText {#text} at (0,0) size 63x18
- text run at (0,0) width 63: "1-1.1-1.2-"
diff --git a/LayoutTests/platform/mac/css2.1/t1204-reset-01-c-o-expected.checksum b/LayoutTests/platform/mac/css2.1/t1204-reset-01-c-o-expected.checksum
deleted file mode 100644
index 414aa2b..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-reset-01-c-o-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-ea0cc7dd3617ba8a01a768e9a8dbd226
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/css2.1/t1204-reset-01-c-o-expected.png b/LayoutTests/platform/mac/css2.1/t1204-reset-01-c-o-expected.png
deleted file mode 100644
index fa057b3..0000000
Binary files a/LayoutTests/platform/mac/css2.1/t1204-reset-01-c-o-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/t1204-reset-01-c-o-expected.txt b/LayoutTests/platform/mac/css2.1/t1204-reset-01-c-o-expected.txt
deleted file mode 100644
index 4f7d86c..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-reset-01-c-o-expected.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x94
- RenderBlock {HTML} at (0,0) size 800x94
- RenderBody {BODY} at (8,16) size 784x70
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 279x18
- text run at (0,0) width 279: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,34) size 784x18
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (0,0) size 8x18
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x18
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 0x18
- RenderInline {SPAN} at (0,0) size 25x18
- RenderInline (generated) at (0,0) size 25x18
- RenderCounter at (13,0) size 20x18
- text run at (13,0) width 20: "1.1"
- RenderText at (33,0) size 5x18
- text run at (33,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 25x18
- RenderInline (generated) at (0,0) size 25x18
- RenderCounter at (38,0) size 20x18
- text run at (38,0) width 20: "1.2"
- RenderText at (58,0) size 5x18
- text run at (58,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x18
- RenderText {#text} at (0,0) size 39x18
- text run at (0,0) width 39: "1-2-3-"
diff --git a/LayoutTests/platform/mac/css2.1/t1204-reset-02-c-o-expected.checksum b/LayoutTests/platform/mac/css2.1/t1204-reset-02-c-o-expected.checksum
deleted file mode 100644
index 0173f52..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-reset-02-c-o-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-4555c089ba9b5beee369134cb52c50c4
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/css2.1/t1204-reset-02-c-o-expected.png b/LayoutTests/platform/mac/css2.1/t1204-reset-02-c-o-expected.png
deleted file mode 100644
index a5f63d6..0000000
Binary files a/LayoutTests/platform/mac/css2.1/t1204-reset-02-c-o-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/mac/css2.1/t1204-reset-02-c-o-expected.txt b/LayoutTests/platform/mac/css2.1/t1204-reset-02-c-o-expected.txt
deleted file mode 100644
index beb3d6f..0000000
--- a/LayoutTests/platform/mac/css2.1/t1204-reset-02-c-o-expected.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x94
- RenderBlock {HTML} at (0,0) size 800x94
- RenderBody {BODY} at (8,16) size 784x70
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 279x18
- text run at (0,0) width 279: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,34) size 784x18
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (0,0) size 8x18
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x18
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (13,0) size 8x18
- text run at (13,0) width 8: "2"
- RenderText at (21,0) size 5x18
- text run at (21,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (26,0) size 8x18
- text run at (26,0) width 8: "3"
- RenderText at (34,0) size 5x18
- text run at (34,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 25x18
- RenderInline {SPAN} at (0,0) size 25x18
- RenderInline {SPAN} at (0,0) size 25x18
- RenderInline (generated) at (0,0) size 25x18
- RenderCounter at (39,0) size 20x18
- text run at (39,0) width 20: "3.1"
- RenderText at (59,0) size 5x18
- text run at (59,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x18
- RenderInline (generated) at (0,0) size 13x18
- RenderCounter at (64,0) size 8x18
- text run at (64,0) width 8: "4"
- RenderText at (72,0) size 5x18
- text run at (72,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x18
- RenderText {#text} at (0,0) size 77x18
- text run at (0,0) width 77: "1-1.1-2-3-4-"
diff --git a/LayoutTests/platform/qt/css2.1/t1204-increment-00-c-o-expected.txt b/LayoutTests/platform/qt/css2.1/t1204-increment-00-c-o-expected.txt
deleted file mode 100644
index ded711d..0000000
--- a/LayoutTests/platform/qt/css2.1/t1204-increment-00-c-o-expected.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x93
- RenderBlock {HTML} at (0,0) size 800x93
- RenderBody {BODY} at (8,14) size 784x71
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 276x19
- text run at (0,0) width 276: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,33) size 784x19
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (0,0) size 8x19
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x19
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (13,0) size 8x19
- text run at (13,0) width 8: "2"
- RenderText at (21,0) size 5x19
- text run at (21,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (26,0) size 8x19
- text run at (26,0) width 8: "3"
- RenderText at (34,0) size 5x19
- text run at (34,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x19
- RenderText {#text} at (0,0) size 83x19
- text run at (0,0) width 83: "1-2-new-3-4-"
diff --git a/LayoutTests/platform/qt/css2.1/t1204-increment-01-c-o-expected.txt b/LayoutTests/platform/qt/css2.1/t1204-increment-01-c-o-expected.txt
deleted file mode 100644
index 6781ba0..0000000
--- a/LayoutTests/platform/qt/css2.1/t1204-increment-01-c-o-expected.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x93
- RenderBlock {HTML} at (0,0) size 800x93
- RenderBody {BODY} at (8,14) size 784x71
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 276x19
- text run at (0,0) width 276: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,33) size 784x19
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (0,0) size 8x19
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x19
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 48x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (13,0) size 8x19
- text run at (13,0) width 8: "2"
- RenderText at (21,0) size 5x19
- text run at (21,0) width 5: "-"
- RenderText {#text} at (26,0) size 35x19
- text run at (26,0) width 35: "FAIL-"
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (61,0) size 8x19
- text run at (61,0) width 8: "3"
- RenderText at (69,0) size 5x19
- text run at (69,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (74,0) size 8x19
- text run at (74,0) width 8: "4"
- RenderText at (82,0) size 5x19
- text run at (82,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x19
- RenderText {#text} at (0,0) size 39x19
- text run at (0,0) width 39: "1-2-3-"
diff --git a/LayoutTests/platform/qt/css2.1/t1204-increment-02-c-o-expected.txt b/LayoutTests/platform/qt/css2.1/t1204-increment-02-c-o-expected.txt
deleted file mode 100644
index b9bfe0d..0000000
--- a/LayoutTests/platform/qt/css2.1/t1204-increment-02-c-o-expected.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x93
- RenderBlock {HTML} at (0,0) size 800x93
- RenderBody {BODY} at (8,14) size 784x71
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 276x19
- text run at (0,0) width 276: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,33) size 784x19
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (0,0) size 8x19
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x19
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 50x19
- RenderInline {SPAN} at (0,0) size 50x19
- RenderInline {SPAN} at (0,0) size 25x19
- RenderInline (generated) at (0,0) size 25x19
- RenderCounter at (13,0) size 20x19
- text run at (13,0) width 20: "1.1"
- RenderText at (33,0) size 5x19
- text run at (33,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 25x19
- RenderInline (generated) at (0,0) size 25x19
- RenderCounter at (38,0) size 20x19
- text run at (38,0) width 20: "1.2"
- RenderText at (58,0) size 5x19
- text run at (58,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (63,0) size 8x19
- text run at (63,0) width 8: "1"
- RenderText at (71,0) size 5x19
- text run at (71,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (76,0) size 8x19
- text run at (76,0) width 8: "2"
- RenderText at (84,0) size 5x19
- text run at (84,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x19
- RenderText {#text} at (0,0) size 76x19
- text run at (0,0) width 76: "0.1-0.2-1-2-"
diff --git a/LayoutTests/platform/qt/css2.1/t1204-reset-00-c-o-expected.txt b/LayoutTests/platform/qt/css2.1/t1204-reset-00-c-o-expected.txt
deleted file mode 100644
index 355b1d2..0000000
--- a/LayoutTests/platform/qt/css2.1/t1204-reset-00-c-o-expected.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x93
- RenderBlock {HTML} at (0,0) size 800x93
- RenderBody {BODY} at (8,14) size 784x71
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 276x19
- text run at (0,0) width 276: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,33) size 784x19
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (0,0) size 8x19
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x19
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (13,0) size 8x19
- text run at (13,0) width 8: "2"
- RenderText at (21,0) size 5x19
- text run at (21,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (26,0) size 8x19
- text run at (26,0) width 8: "3"
- RenderText at (34,0) size 5x19
- text run at (34,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x19
- RenderText {#text} at (0,0) size 63x19
- text run at (0,0) width 63: "1-1.1-1.2-"
diff --git a/LayoutTests/platform/qt/css2.1/t1204-reset-01-c-o-expected.txt b/LayoutTests/platform/qt/css2.1/t1204-reset-01-c-o-expected.txt
deleted file mode 100644
index 47be767..0000000
--- a/LayoutTests/platform/qt/css2.1/t1204-reset-01-c-o-expected.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x93
- RenderBlock {HTML} at (0,0) size 800x93
- RenderBody {BODY} at (8,14) size 784x71
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 276x19
- text run at (0,0) width 276: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,33) size 784x19
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (0,0) size 8x19
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x19
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 0x19
- RenderInline {SPAN} at (0,0) size 25x19
- RenderInline (generated) at (0,0) size 25x19
- RenderCounter at (13,0) size 20x19
- text run at (13,0) width 20: "1.1"
- RenderText at (33,0) size 5x19
- text run at (33,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 25x19
- RenderInline (generated) at (0,0) size 25x19
- RenderCounter at (38,0) size 20x19
- text run at (38,0) width 20: "1.2"
- RenderText at (58,0) size 5x19
- text run at (58,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x19
- RenderText {#text} at (0,0) size 39x19
- text run at (0,0) width 39: "1-2-3-"
diff --git a/LayoutTests/platform/qt/css2.1/t1204-reset-02-c-o-expected.txt b/LayoutTests/platform/qt/css2.1/t1204-reset-02-c-o-expected.txt
deleted file mode 100644
index 47ff85e..0000000
--- a/LayoutTests/platform/qt/css2.1/t1204-reset-02-c-o-expected.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x93
- RenderBlock {HTML} at (0,0) size 800x93
- RenderBody {BODY} at (8,14) size 784x71
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 276x19
- text run at (0,0) width 276: "The following two lines should be the same:"
- RenderBlock {DIV} at (0,33) size 784x19
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (0,0) size 8x19
- text run at (0,0) width 8: "1"
- RenderText at (8,0) size 5x19
- text run at (8,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (13,0) size 8x19
- text run at (13,0) width 8: "2"
- RenderText at (21,0) size 5x19
- text run at (21,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (26,0) size 8x19
- text run at (26,0) width 8: "3"
- RenderText at (34,0) size 5x19
- text run at (34,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 25x19
- RenderInline {SPAN} at (0,0) size 25x19
- RenderInline {SPAN} at (0,0) size 25x19
- RenderInline (generated) at (0,0) size 25x19
- RenderCounter at (39,0) size 20x19
- text run at (39,0) width 20: "3.1"
- RenderText at (59,0) size 5x19
- text run at (59,0) width 5: "-"
- RenderInline {SPAN} at (0,0) size 13x19
- RenderInline (generated) at (0,0) size 13x19
- RenderCounter at (64,0) size 8x19
- text run at (64,0) width 8: "4"
- RenderText at (72,0) size 5x19
- text run at (72,0) width 5: "-"
- RenderBlock {DIV} at (0,52) size 784x19
- RenderText {#text} at (0,0) size 77x19
- text run at (0,0) width 77: "1-1.1-2-3-4-"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list