[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dglazkov at chromium.org
dglazkov at chromium.org
Wed Dec 22 14:58:43 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit db34ecfc0e75cbbd5f4aa938c176ce4427dc6ef4
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 26 20:26:24 2010 +0000
[Chromium] Add/change baselines after r70546 and added Chromium-mac
specific test to expectations.
https://bugs.webkit.org/show_bug.cgi?id=48157
https://bugs.webkit.org/show_bug.cgi?id=46868
* platform/chromium-linux/fast/blockflow/english-rl-text-expected.checksum: Added.
* platform/chromium-linux/fast/multicol/nested-columns-expected.checksum: Updated.
* platform/chromium-linux/fast/multicol/nested-columns-expected.png: Updated.
* platform/chromium-linux/fast/multicol/nested-columns-expected.txt: Removed.
* platform/chromium-win/fast/blockflow/english-rl-text-expected.checksum: Added.
* platform/chromium-win/fast/blockflow/english-rl-text-expected.png: Added.
* platform/chromium-win/fast/blockflow/english-rl-text-expected.txt: Added.
* platform/chromium-win/fast/multicol/nested-columns-expected.checksum: Updated.
* platform/chromium-win/fast/multicol/nested-columns-expected.png: Updated.
* platform/chromium-win/fast/multicol/nested-columns-expected.txt: Updated.
* platform/chromium/test_expectations.txt: Tweaked.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70563 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dfe52cd..18c9287 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,24 @@
2010-10-26 Dimitri Glazkov <dglazkov at chromium.org>
+ [Chromium] Add/change baselines after r70546 and added Chromium-mac
+ specific test to expectations.
+ https://bugs.webkit.org/show_bug.cgi?id=48157
+ https://bugs.webkit.org/show_bug.cgi?id=46868
+
+ * platform/chromium-linux/fast/blockflow/english-rl-text-expected.checksum: Added.
+ * platform/chromium-linux/fast/multicol/nested-columns-expected.checksum: Updated.
+ * platform/chromium-linux/fast/multicol/nested-columns-expected.png: Updated.
+ * platform/chromium-linux/fast/multicol/nested-columns-expected.txt: Removed.
+ * platform/chromium-win/fast/blockflow/english-rl-text-expected.checksum: Added.
+ * platform/chromium-win/fast/blockflow/english-rl-text-expected.png: Added.
+ * platform/chromium-win/fast/blockflow/english-rl-text-expected.txt: Added.
+ * platform/chromium-win/fast/multicol/nested-columns-expected.checksum: Updated.
+ * platform/chromium-win/fast/multicol/nested-columns-expected.png: Updated.
+ * platform/chromium-win/fast/multicol/nested-columns-expected.txt: Updated.
+ * platform/chromium/test_expectations.txt: Tweaked.
+
+2010-10-26 Dimitri Glazkov <dglazkov at chromium.org>
+
[Chromium] Add yet another flake.
https://bugs.webkit.org/show_bug.cgi?id=48352
diff --git a/LayoutTests/platform/chromium-linux/fast/blockflow/english-rl-text-expected.checksum b/LayoutTests/platform/chromium-linux/fast/blockflow/english-rl-text-expected.checksum
index 655d22a..f2efb24 100644
--- a/LayoutTests/platform/chromium-linux/fast/blockflow/english-rl-text-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/fast/blockflow/english-rl-text-expected.checksum
@@ -1 +1 @@
-0394b485972b29df3b8da120775d5341
\ No newline at end of file
+81eda49a5e37d70126f6dd59950be110
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/multicol/nested-columns-expected.checksum b/LayoutTests/platform/chromium-linux/fast/multicol/nested-columns-expected.checksum
index 70042b3..8f45477 100644
--- a/LayoutTests/platform/chromium-linux/fast/multicol/nested-columns-expected.checksum
+++ b/LayoutTests/platform/chromium-linux/fast/multicol/nested-columns-expected.checksum
@@ -1 +1 @@
-c178aaaea65fa79af15005597e828d16
\ No newline at end of file
+685c62650a68ea32c0a7bc679ffa7542
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/multicol/nested-columns-expected.png b/LayoutTests/platform/chromium-linux/fast/multicol/nested-columns-expected.png
index b508b3f..755fb52 100644
Binary files a/LayoutTests/platform/chromium-linux/fast/multicol/nested-columns-expected.png and b/LayoutTests/platform/chromium-linux/fast/multicol/nested-columns-expected.png differ
diff --git a/LayoutTests/platform/chromium-linux/fast/multicol/nested-columns-expected.txt b/LayoutTests/platform/chromium-linux/fast/multicol/nested-columns-expected.txt
deleted file mode 100644
index ad1df6a..0000000
--- a/LayoutTests/platform/chromium-linux/fast/multicol/nested-columns-expected.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-layer at (0,0) size 1141x600
- RenderView at (0,0) size 800x585
-layer at (0,0) size 1141x600
- RenderBlock {HTML} at (0,0) size 800x600
-layer at (8,8) size 1133x500
- RenderBody {BODY} at (8,8) size 750x500
- RenderBlock {H1} at (0,0) size 367x37
- RenderText {#text} at (0,0) size 166x36
- text run at (0,0) width 166: "Header One"
- RenderBlock (anonymous) at (0,58) size 367x220
- RenderText {#text} at (0,0) size 367x219
- text run at (0,0) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,20) width 367: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis lectus."
- text run at (0,40) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,60) width 358: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (0,80) width 365: "aliquam. Cras convallis adipiscing sem. Nam nonummy enim."
- text run at (0,100) width 329: "Nullam bibendum lobortis neque. Vestibulum velit orci,"
- text run at (0,120) width 309: "tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (0,140) width 321: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (0,160) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae"
- text run at (0,180) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,200) width 21: "elit."
- RenderBlock {H1} at (0,299) size 367x37
- RenderText {#text} at (0,0) size 169x36
- text run at (0,0) width 169: "Header Two"
- RenderBlock (anonymous) at (0,357) size 367x223
- RenderText {#text} at (0,0) size 367x222
- text run at (0,0) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,20) width 367: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis lectus."
- text run at (0,40) width 362: "Quisque adipiscing rhoncus sem. Proin nulla purus, vulputate"
- text run at (0,60) width 358: "vel, varius ut, euismod et, nisi. Sed vitae felis vel orci sagittis"
- text run at (0,80) width 365: "aliquam. Cras convallis adipiscing sem. Nam nonummy enim."
- text run at (0,100) width 329: "Nullam bibendum lobortis neque. Vestibulum velit orci,"
- text run at (0,120) width 309: "tempus euismod, pretium quis, interdum vitae, nulla."
- text run at (0,143) width 321: "Phasellus eget ante et tortor condimentum vestibulum."
- text run at (0,163) width 360: "Suspendisse hendrerit quam nec felis. Sed varius turpis vitae"
- text run at (0,183) width 350: "pede. Lorem ipsum dolor sit amet, consectetuer adipiscing"
- text run at (0,203) width 21: "elit."
- RenderBlock {H1} at (0,601) size 367x37
- RenderText {#text} at (0,0) size 190x36
- text run at (0,0) width 190: "Header Three"
- RenderBlock {H1} at (0,920) size 367x37
- RenderText {#text} at (0,0) size 177x36
- text run at (0,0) width 177: "Header Four"
- RenderBlock (anonymous) at (0,978) size 367x42
- RenderText {#text} at (0,0) size 337x41
- text run at (0,0) width 337: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
- text run at (0,22) width 143: "Nulla varius enim ac mi."
diff --git a/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.checksum b/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.checksum
index 54d1313..3b1fe2c 100644
--- a/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.checksum
+++ b/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.checksum
@@ -1 +1 @@
-0f6372c5ed48944334dfcb276be1ebd6
\ No newline at end of file
+34de847334db22a75b0a72de07778c0c
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.png b/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.png
index 9eb6309..81f42a9 100644
Binary files a/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.png and b/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.txt b/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.txt
index 099f4c4..070c60a 100644
--- a/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/blockflow/english-rl-text-expected.txt
@@ -1,7 +1,7 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 785x600
- RenderBlock {HTML} at (0,0) size 785x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 504x584 [border: (2px solid #000000)]
RenderBlock {DIV} at (18,2) size 204x580 [border: (2px solid #800000)]
RenderBlock (floating) {DIV} at (2,478) size 100x100 [bgcolor=#00FF00]
diff --git a/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.checksum b/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.checksum
index 54ab2e3..25c0676 100644
--- a/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.checksum
+++ b/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.checksum
@@ -1 +1 @@
-bdf63f6c38de5cc0a101334531932591
\ No newline at end of file
+71cf6221283a48d16b459905e555e106
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.png b/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.png
index 8b555d3..ef52f49 100644
Binary files a/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.png and b/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.txt b/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.txt
index ad1df6a..a191aa4 100644
--- a/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.txt
+++ b/LayoutTests/platform/chromium-win/fast/multicol/nested-columns-expected.txt
@@ -1,7 +1,7 @@
-layer at (0,0) size 1141x600
+layer at (0,0) size 1141x585
RenderView at (0,0) size 800x585
-layer at (0,0) size 1141x600
- RenderBlock {HTML} at (0,0) size 800x600
+layer at (0,0) size 1141x585
+ RenderBlock {HTML} at (0,0) size 800x585
layer at (8,8) size 1133x500
RenderBody {BODY} at (8,8) size 750x500
RenderBlock {H1} at (0,0) size 367x37
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index e74fc23..c5ccbce 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3258,3 +3258,6 @@ BUGWK48341 : svg/W3C-SVG-1.1/masking-intro-01-f.svg = CRASH PASS
BUGWK48352 : fast/blockflow/block-level-images.html = IMAGE PASS
// needs assignment.
BUGWK48164 : plugins/invalid-mime-with-valid-extension-shows-missing-plugin.html = TEXT
+
+// Chromium-mac-specific test
+BUGWK46868 WONTFIX LINUX WIN : platform/chromium/fast/text/chromium-mac-duplicate-ime-composition.html = TEXT
\ No newline at end of file
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list