[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
simon.fraser at apple.com
simon.fraser at apple.com
Wed Dec 22 15:21:05 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 578ea6f8e469cdc0513928671bef18642fc0fb02
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 1 21:30:00 2010 +0000
2010-11-01 Simon Fraser <simon.fraser at apple.com>
Fix test failures on Qt by avoiding references to external image files.
* fast/backgrounds/multiple-backgrounds-computed-style-expected.txt:
* fast/backgrounds/script-tests/multiple-backgrounds-computed-style.js:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71058 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dae56c1..8ef1440 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-01 Simon Fraser <simon.fraser at apple.com>
+
+ Fix test failures on Qt by avoiding references to external image files.
+
+ * fast/backgrounds/multiple-backgrounds-computed-style-expected.txt:
+ * fast/backgrounds/script-tests/multiple-backgrounds-computed-style.js:
+
2010-11-01 Mihai Parparita <mihaip at chromium.org>
Update the pixel expectations for fast/selectors for the Mac port.
diff --git a/LayoutTests/fast/backgrounds/multiple-backgrounds-computed-style-expected.txt b/LayoutTests/fast/backgrounds/multiple-backgrounds-computed-style-expected.txt
index 2dad0aa..79c2334 100644
--- a/LayoutTests/fast/backgrounds/multiple-backgrounds-computed-style-expected.txt
+++ b/LayoutTests/fast/backgrounds/multiple-backgrounds-computed-style-expected.txt
@@ -1,13 +1,11 @@
-Blocked access to external URL http://example.com/foo.png
-Blocked access to external URL http://example.com/bar.png
This tests checks that all of the input values for background-repeat parse correctly.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS test("backgroundImage", "background: none 10px 10px, url(http://example.com/foo.png) 20px 20px;") is "none, url(http://example.com/foo.png)"
-PASS test("backgroundPosition", "background: none 10px 10px, url(http://example.com/foo.png) 20px 20px;") is "10px 10px, 20px 20px"
-PASS test("backgroundImage", "background-image: url(http://example.com/foo.png), none, url(http://example.com/bar.png);") is "url(http://example.com/foo.png), none, url(http://example.com/bar.png)"
+PASS test("backgroundImage", "background: none 10px 10px, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC) 20px 20px;") is "none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC)"
+PASS test("backgroundPosition", "background: none 10px 10px, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC) 20px 20px;") is "10px 10px, 20px 20px"
+PASS test("backgroundImage", "background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC), none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC)") is "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC), none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC)"
PASS test("backgroundRepeat", "background-repeat: repeat-x, repeat-y, repeat, no-repeat;") is "repeat-x, repeat-y, repeat, no-repeat"
PASS test("backgroundSize", "background-size: contain, cover, 20px 10%;") is "contain, cover, 20px 10%"
PASS test("webkitBackgroundSize", "-webkit-background-size: contain, cover, 20px 10%;") is "contain, cover, 20px 10%"
@@ -20,9 +18,9 @@ PASS test("webkitBackgroundOrigin", "-webkit-background-origin: border-box, padd
PASS test("backgroundPosition", "background-position: 20px 30px, 10% 90%, top, left, center;") is "20px 30px, 10% 90%, 50% 0%, 0% 50%, 50% 50%"
PASS test("backgroundPositionX", "background-position-x: 20px, 10%, right, left, center;") is "20px, 10%, 100%, 0%, 50%"
PASS test("backgroundPositionY", "background-position-y: 20px, 10%, bottom, top, center;") is "20px, 10%, 100%, 0%, 50%"
-PASS test("webkitMaskImage", "-webkit-mask: none 10px 10px, url(http://example.com/foo.png) 20px 20px;") is "none, url(http://example.com/foo.png)"
-PASS test("webkitMaskPosition", "-webkit-mask: none 10px 10px, url(http://example.com/foo.png) 20px 20px;") is "10px 10px, 20px 20px"
-PASS test("webkitMaskImage", "-webkit-mask-image: none, url(http://example.com/bar.png);") is "none, url(http://example.com/bar.png)"
+PASS test("webkitMaskImage", "-webkit-mask: none 10px 10px, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC) 20px 20px;") is "none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC)"
+PASS test("webkitMaskPosition", "-webkit-mask: none 10px 10px, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC) 20px 20px;") is "10px 10px, 20px 20px"
+PASS test("webkitMaskImage", "-webkit-mask-image: none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);") is "none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC)"
PASS test("webkitMaskSize", "-webkit-mask-size: contain, cover, 20px 10%;") is "contain, cover, 20px 10%"
PASS test("webkitMaskRepeat", "-webkit-mask-repeat: repeat-x, repeat-y, repeat, no-repeat;") is "repeat-x, repeat-y, repeat, no-repeat"
PASS test("webkitMaskClip", "-webkit-mask-clip: border-box, padding-box;") is "border-box, padding-box"
diff --git a/LayoutTests/fast/backgrounds/script-tests/multiple-backgrounds-computed-style.js b/LayoutTests/fast/backgrounds/script-tests/multiple-backgrounds-computed-style.js
index 2a30520..40fcda6 100644
--- a/LayoutTests/fast/backgrounds/script-tests/multiple-backgrounds-computed-style.js
+++ b/LayoutTests/fast/backgrounds/script-tests/multiple-backgrounds-computed-style.js
@@ -12,11 +12,13 @@ function test(property, value)
}
// shorthands
-shouldBe('test("backgroundImage", "background: none 10px 10px, url(http://example.com/foo.png) 20px 20px;")', '"none, url(http://example.com/foo.png)"');
-shouldBe('test("backgroundPosition", "background: none 10px 10px, url(http://example.com/foo.png) 20px 20px;")', '"10px 10px, 20px 20px"');
+shouldBe('test("backgroundImage", "background: none 10px 10px, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC) 20px 20px;")',
+ '"none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC)"');
+shouldBe('test("backgroundPosition", "background: none 10px 10px, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC) 20px 20px;")', '"10px 10px, 20px 20px"');
// background longhands
-shouldBe('test("backgroundImage", "background-image: url(http://example.com/foo.png), none, url(http://example.com/bar.png);")', '"url(http://example.com/foo.png), none, url(http://example.com/bar.png)"');
+shouldBe('test("backgroundImage", "background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC), none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC)")',
+ '"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC), none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC)"');
shouldBe('test("backgroundRepeat", "background-repeat: repeat-x, repeat-y, repeat, no-repeat;")', '"repeat-x, repeat-y, repeat, no-repeat"');
shouldBe('test("backgroundSize", "background-size: contain, cover, 20px 10%;")', '"contain, cover, 20px 10%"');
shouldBe('test("webkitBackgroundSize", "-webkit-background-size: contain, cover, 20px 10%;")', '"contain, cover, 20px 10%"');
@@ -31,11 +33,11 @@ shouldBe('test("backgroundPositionX", "background-position-x: 20px, 10%, right,
shouldBe('test("backgroundPositionY", "background-position-y: 20px, 10%, bottom, top, center;")', '"20px, 10%, 100%, 0%, 50%"');
// mask shorthands
-shouldBe('test("webkitMaskImage", "-webkit-mask: none 10px 10px, url(http://example.com/foo.png) 20px 20px;")', '"none, url(http://example.com/foo.png)"');
-shouldBe('test("webkitMaskPosition", "-webkit-mask: none 10px 10px, url(http://example.com/foo.png) 20px 20px;")', '"10px 10px, 20px 20px"');
+shouldBe('test("webkitMaskImage", "-webkit-mask: none 10px 10px, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC) 20px 20px;")', '"none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC)"');
+shouldBe('test("webkitMaskPosition", "-webkit-mask: none 10px 10px, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC) 20px 20px;")', '"10px 10px, 20px 20px"');
// mask longhands
-shouldBe('test("webkitMaskImage", "-webkit-mask-image: none, url(http://example.com/bar.png);")', '"none, url(http://example.com/bar.png)"');
+shouldBe('test("webkitMaskImage", "-webkit-mask-image: none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC);")', '"none, url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAADElEQVR42mP4%2F58BAAT%2FAf9jgNErAAAAAElFTkSuQmCC)"');
shouldBe('test("webkitMaskSize", "-webkit-mask-size: contain, cover, 20px 10%;")', '"contain, cover, 20px 10%"');
shouldBe('test("webkitMaskRepeat", "-webkit-mask-repeat: repeat-x, repeat-y, repeat, no-repeat;")', '"repeat-x, repeat-y, repeat, no-repeat"');
shouldBe('test("webkitMaskClip", "-webkit-mask-clip: border-box, padding-box;")', '"border-box, padding-box"');
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list