[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ossy at webkit.org
ossy at webkit.org
Wed Dec 22 15:54:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a17537f831e779648e388d97ef18c5ab3d4cbc49
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 16 12:22:56 2010 +0000
Unreviewed.
[Qt] Add printing/page-rule-in-media-query.html to the skipped
list because of missing layoutTestController.setPrinting().
And remove incorrect Qt specific expected result.
* platform/qt/Skipped: printing/page-rule-in-media-query.html added until fix.
* platform/qt/printing: Removed.
* platform/qt/printing/page-rule-in-media-query-expected.checksum: Removed.
* platform/qt/printing/page-rule-in-media-query-expected.png: Removed.
* platform/qt/printing/page-rule-in-media-query-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72083 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1e5aaef..2628376 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-16 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed.
+
+ [Qt] Add printing/page-rule-in-media-query.html to the skipped
+ list because of missing layoutTestController.setPrinting().
+
+ And remove incorrect Qt specific expected result.
+
+ * platform/qt/Skipped: printing/page-rule-in-media-query.html added until fix.
+ * platform/qt/printing: Removed.
+ * platform/qt/printing/page-rule-in-media-query-expected.checksum: Removed.
+ * platform/qt/printing/page-rule-in-media-query-expected.png: Removed.
+ * platform/qt/printing/page-rule-in-media-query-expected.txt: Removed.
+
2010-11-12 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Simon Fraser.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 26922d1..f25a73a 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -714,6 +714,9 @@ fast/encoding/mailto-always-utf-8.html
# Missing layoutTestController.setAlwaysAcceptCookies()
http/tests/xmlhttprequest/access-control-basic-allow-preflight-cache-timeout.html
+# Missing layoutTestController.setPrinting()
+printing/page-rule-in-media-query.html
+
# Missing layoutTestController.setUseDashboardCompatibilityMode()
http/tests/xmlhttprequest/default-content-type-dashboard.html
http/tests/xmlhttprequest/svg-created-by-xhr-disallowed-in-dashboard.html
diff --git a/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.checksum b/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.checksum
deleted file mode 100644
index fd950e5..0000000
--- a/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-5cc776ab7988e5332b34fa11ad78e0b2
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.png b/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.png
deleted file mode 100644
index 7e1e85a..0000000
Binary files a/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.txt b/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.txt
deleted file mode 100644
index b841300..0000000
--- a/LayoutTests/platform/qt/printing/page-rule-in-media-query-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-CONSOLE MESSAGE: line 20: TypeError: Result of expression 'layoutTestController.setPrinting' [undefined] is not a function.
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (1,1) size 798x75
- RenderBlock {HTML} at (1,1) size 798x75
- RenderBody {BODY} at (1,1) size 796x73
- RenderBlock {DIV} at (1,0) size 794x73 [border: (1px solid #000000)]
- RenderBlock (anonymous) at (1,1) size 792x21
- RenderText {#text} at (0,0) size 42x21
- text run at (0,0) width 42: "DIV 1"
- RenderBlock {DIV} at (2,23) size 790x48 [border: (1px solid #000000)]
- RenderBlock (anonymous) at (1,1) size 788x21
- RenderText {#text} at (0,0) size 42x21
- text run at (0,0) width 42: "DIV 2"
- RenderBlock {DIV} at (2,23) size 786x23 [border: (1px solid #000000)]
- RenderText {#text} at (1,1) size 344x21
- text run at (1,1) width 344: "The margins of divs should remain 1px in printing."
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list