[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
victorw at chromium.org
victorw at chromium.org
Wed Dec 22 11:33:02 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 60c3ccc98a10ffe9c71fb65a8592519756e5c8ee
Author: victorw at chromium.org <victorw at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 29 01:52:40 2010 +0000
2010-07-28 Alex Nicolaou <anicolao at chromium.org>
Reviewed by Ojan Vafai.
Set incorrect but close expectations for mask-colorspace.svg on mac
https://bugs.webkit.org/show_bug.cgi?id=43102
Blocks:
[chromium] r63450 caused some svg mask tests to fail pixel tests
https://bugs.webkit.org/show_bug.cgi?id=42403
ImageBufferCG.cpp uses CoreGraphics to do the transform of SVG masks
into LinearRGB, but only for MAC which means not for CHROMIUM, so I
have changed the #if to account for both platforms. I am assuming this
isn't in for windows because it's missing in CG itself, but I didn't
verify that.
* platform/graphics/cg/ImageBufferCG.cpp:
(WebCore::ImageBuffer::ImageBuffer):
2010-07-28 Alex Nicolaou <anicolao at chromium.org>
Reviewed by Ojan Vafai.
Set incorrect but close expectations for mask-colorspace.svg on mac
https://bugs.webkit.org/show_bug.cgi?id=43102
Blocks:
[chromium] r63450 caused some svg mask tests to fail pixel tests
https://bugs.webkit.org/show_bug.cgi?id=42403
On my Mac, after my best efforts, the mask colorspace doesn't
seem to come out right. Though the pixel values in the test
rectangle should be 111, they come out to 104, and ultimately
it is because the pixel values coming out of ImageBufferCG are
not linearized properly. Checking in this expected result because
visually the colours are close enough and I want to catch other
regressions, but if this starts to fail because the first image
has color 111,111,111 in the rectange and 76,76,76 or 78,78,78 in
the circle, the actual problem will have been corrected. (111 and
78 are the correct values).
Also removed fail expectations for those tests that are now
passing on my Mac.
* platform/chromium/test_expectations.txt:
* platform/mac/svg/custom/mask-colorspace-expected.checksum:
* platform/mac/svg/custom/mask-colorspace-expected.png:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64254 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8097790..496ee46 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,32 @@
+2010-07-28 Alex Nicolaou <anicolao at chromium.org>
+
+ Reviewed by Ojan Vafai.
+
+ Set incorrect but close expectations for mask-colorspace.svg on mac
+ https://bugs.webkit.org/show_bug.cgi?id=43102
+
+ Blocks:
+ [chromium] r63450 caused some svg mask tests to fail pixel tests
+ https://bugs.webkit.org/show_bug.cgi?id=42403
+
+ On my Mac, after my best efforts, the mask colorspace doesn't
+ seem to come out right. Though the pixel values in the test
+ rectangle should be 111, they come out to 104, and ultimately
+ it is because the pixel values coming out of ImageBufferCG are
+ not linearized properly. Checking in this expected result because
+ visually the colours are close enough and I want to catch other
+ regressions, but if this starts to fail because the first image
+ has color 111,111,111 in the rectange and 76,76,76 or 78,78,78 in
+ the circle, the actual problem will have been corrected. (111 and
+ 78 are the correct values).
+
+ Also removed fail expectations for those tests that are now
+ passing on my Mac.
+
+ * platform/chromium/test_expectations.txt:
+ * platform/mac/svg/custom/mask-colorspace-expected.checksum:
+ * platform/mac/svg/custom/mask-colorspace-expected.png:
+
2010-07-28 Kent Tamura <tkent at chromium.org>
Unreviewed, test expectation update.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index d187e15..82154bf 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2390,7 +2390,6 @@ BUG29737 MAC : svg/W3C-SVG-1.1/filters-gauss-01-b.svg = IMAGE
BUG29737 MAC : svg/W3C-SVG-1.1/filters-morph-01-f.svg = IMAGE
BUG29737 MAC : svg/W3C-SVG-1.1/filters-offset-01-b.svg = IMAGE
BUG29737 MAC : svg/batik/filters/feTile.svg = IMAGE
-BUG29737 MAC : svg/custom/empty-merge.svg = IMAGE
BUG29737 MAC : svg/custom/feComponentTransfer-Discrete.svg = IMAGE
BUG29737 MAC : svg/custom/feComponentTransfer-Gamma.svg = IMAGE
BUG29737 MAC : svg/custom/feComponentTransfer-Linear.svg = IMAGE
@@ -2398,9 +2397,7 @@ BUG29737 MAC : svg/custom/feComponentTransfer-Table.svg = IMAGE
BUG29737 MAC : svg/custom/text-filter.svg = IMAGE
BUG29737 MAC : svg/filters/feComposite.svg = IMAGE
BUG29737 MAC : svg/filters/feDisplacementMap.svg = IMAGE
-BUG29737 MAC : svg/filters/feGaussianBlur.svg = IMAGE
BUG29737 MAC : svg/filters/feTile.svg = IMAGE
-BUG29737 MAC : svg/filters/shadow-on-filter.svg = IMAGE
BUG29737 MAC : svg/custom/use-elementInstance-event-target.svg = IMAGE
BUG29737 SLOW MAC : svg/filters/big-sized-filter.svg = IMAGE
BUG29737 MAC : svg/W3C-SVG-1.1/struct-image-02-b.svg = IMAGE
@@ -2699,7 +2696,7 @@ BUGJAMESR MAC : svg/custom/resource-invalidate-on-target-update.svg = IMAGE PASS
BUGJAMESR LINUX : svg/custom/resource-invalidate-on-target-update.svg = IMAGE
BUGJAMESR : svg/filters/filter-clip.svg = IMAGE
BUGJAMESR : svg/filters/filter-source-position.svg = IMAGE
-BUGJAMESR BUG30048 BUG29737 : svg/filters/shadow-on-rect-with-filter.svg = IMAGE
+BUGJAMESR BUG30048 BUG29737 WIN LINUX : svg/filters/shadow-on-rect-with-filter.svg = IMAGE
// New layoutTestController function added at r57986
BUG42691 : fast/lists/ol-nested-items-dynamic-insert.html = TEXT
@@ -3099,7 +3096,7 @@ BUGWK42371 : ietestcenter/Javascript/15.2.3.8-1.html = FAIL
BUGWK42403 LINUX WIN : svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE
BUGWK42403 LINUX WIN : svg/css/circle-in-mask-with-shadow.svg = IMAGE
BUGWK42403 LINUX WIN : svg/custom/grayscale-gradient-mask.svg = IMAGE
-BUGWK42403 WIN MAC : svg/custom/mask-colorspace.svg = IMAGE
+BUGWK42403 WIN : svg/custom/mask-colorspace.svg = IMAGE
BUGWK42428 : svg/custom/convolution-crash.svg = IMAGE
BUGWK42428 LINUX WIN : svg/W3C-SVG-1.1/filters-conv-01-f.svg = IMAGE+TEXT
diff --git a/LayoutTests/platform/mac/svg/custom/mask-colorspace-expected.checksum b/LayoutTests/platform/mac/svg/custom/mask-colorspace-expected.checksum
index 6ec0d1c..ad51413 100644
--- a/LayoutTests/platform/mac/svg/custom/mask-colorspace-expected.checksum
+++ b/LayoutTests/platform/mac/svg/custom/mask-colorspace-expected.checksum
@@ -1 +1 @@
-4e688331e96a4cbb8d8f29e277c8309e
\ No newline at end of file
+17b0a6317452a58d5a85f7142d6989a4
\ No newline at end of file
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b458a52..e74cb6f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-07-28 Alex Nicolaou <anicolao at chromium.org>
+
+ Reviewed by Ojan Vafai.
+
+ Set incorrect but close expectations for mask-colorspace.svg on mac
+ https://bugs.webkit.org/show_bug.cgi?id=43102
+
+ Blocks:
+ [chromium] r63450 caused some svg mask tests to fail pixel tests
+ https://bugs.webkit.org/show_bug.cgi?id=42403
+
+ ImageBufferCG.cpp uses CoreGraphics to do the transform of SVG masks
+ into LinearRGB, but only for MAC which means not for CHROMIUM, so I
+ have changed the #if to account for both platforms. I am assuming this
+ isn't in for windows because it's missing in CG itself, but I didn't
+ verify that.
+
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::ImageBuffer):
+
2010-07-28 Kent Tamura <tkent at chromium.org>
Reviewed by Darin Fisher.
diff --git a/WebCore/platform/graphics/cg/ImageBufferCG.cpp b/WebCore/platform/graphics/cg/ImageBufferCG.cpp
index fe7f83a..feb8cec 100644
--- a/WebCore/platform/graphics/cg/ImageBufferCG.cpp
+++ b/WebCore/platform/graphics/cg/ImageBufferCG.cpp
@@ -80,7 +80,7 @@ ImageBuffer::ImageBuffer(const IntSize& size, ImageColorSpace imageColorSpace, b
case GrayScale:
colorSpace.adoptCF(CGColorSpaceCreateDeviceGray());
break;
-#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)
+#if ((PLATFORM(MAC) || PLATFORM(CHROMIUM)) && !defined(BUILDING_ON_TIGER))
case LinearRGB:
colorSpace.adoptCF(CGColorSpaceCreateWithName(kCGColorSpaceGenericRGBLinear));
break;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list