[webkit-changes] cvs commit: SVGSupport/layout-tests/W3C-SVG-1.1
pservers-grad-03-b-expected.checksum pservers-grad-03-b-expected.png
pservers-grad-06-b-expected.checksum pservers-grad-06-b-expected.png
pservers-pattern-01-b-expected.checksum
pservers-pattern-01-b-expected.png
Eric
eseidel at opensource.apple.com
Sun Oct 23 23:55:22 PDT 2005
eseidel 05/10/23 23:55:22
Modified: . ChangeLog
kcanvas/device/quartz KRenderingPaintServerQuartz.mm
layout-tests/W3C-SVG-1.1
pservers-grad-03-b-expected.checksum
pservers-grad-03-b-expected.png
pservers-grad-06-b-expected.checksum
pservers-grad-06-b-expected.png
pservers-pattern-01-b-expected.checksum
pservers-pattern-01-b-expected.png
Log:
Bug #: 5361
Submitted by: Julien Palmas <julien.palmas at gmail.com>
Reviewed by: eseidel
Finally fix pattern "userspaceonuse" support.
Several test cases already cover this.
http://bugzilla.opendarwin.org/show_bug.cgi?id=5361
* kcanvas/device/quartz/KRenderingPaintServerQuartz.mm:
(KRenderingPaintServerPatternQuartz::draw):
* svg-tests/W3C-SVG-1.1/pservers-grad-03-b-expected.checksum:
* svg-tests/W3C-SVG-1.1/pservers-grad-03-b-expected.png:
* svg-tests/W3C-SVG-1.1/pservers-grad-06-b-expected.checksum:
* svg-tests/W3C-SVG-1.1/pservers-grad-06-b-expected.png:
* svg-tests/W3C-SVG-1.1/pservers-pattern-01-b-expected.checksum:
* svg-tests/W3C-SVG-1.1/pservers-pattern-01-b-expected.png:
Revision Changes Path
1.267 +17 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -r1.266 -r1.267
--- ChangeLog 24 Oct 2005 06:31:19 -0000 1.266
+++ ChangeLog 24 Oct 2005 06:55:17 -0000 1.267
@@ -2,6 +2,23 @@
Reviewed by eseidel.
+ Finally fix pattern "userspaceonuse" support.
+ Several test cases already cover this.
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=5361
+
+ * kcanvas/device/quartz/KRenderingPaintServerQuartz.mm:
+ (KRenderingPaintServerPatternQuartz::draw):
+ * svg-tests/W3C-SVG-1.1/pservers-grad-03-b-expected.checksum:
+ * svg-tests/W3C-SVG-1.1/pservers-grad-03-b-expected.png:
+ * svg-tests/W3C-SVG-1.1/pservers-grad-06-b-expected.checksum:
+ * svg-tests/W3C-SVG-1.1/pservers-grad-06-b-expected.png:
+ * svg-tests/W3C-SVG-1.1/pservers-pattern-01-b-expected.checksum:
+ * svg-tests/W3C-SVG-1.1/pservers-pattern-01-b-expected.png:
+
+2005-10-23 Julien Palmas <julien.palmas at gmail.com>
+
+ Reviewed by eseidel.
+
Merged over Shared -> Shared<T> change from kdom.
http://bugzilla.opendarwin.org/show_bug.cgi?id=5391
1.7 +3 -21 SVGSupport/kcanvas/device/quartz/KRenderingPaintServerQuartz.mm
Index: KRenderingPaintServerQuartz.mm
===================================================================
RCS file: /cvs/root/SVGSupport/kcanvas/device/quartz/KRenderingPaintServerQuartz.mm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KRenderingPaintServerQuartz.mm 5 Oct 2005 05:36:52 -0000 1.6
+++ KRenderingPaintServerQuartz.mm 24 Oct 2005 06:55:20 -0000 1.7
@@ -106,15 +106,10 @@
// Patterns don't seem to resepect the CTM unless we make them...
CGAffineTransform ctm = CGContextGetCTM(context);
CGAffineTransform transform = CGAffineTransform(patternTransform().qmatrix());
- CGSize phase = CGSizeMake(x(), y());
- if (boundingBoxMode()) {
- // get the object bbox
- CGRect objectBBox = CGContextGetPathBoundingBox(context);
- phase.width += objectBBox.origin.x;
- phase.height += objectBBox.origin.y;
- }
- transform = CGAffineTransformTranslate(transform, phase.width, phase.height);
transform = CGAffineTransformConcat(transform, ctm);
+
+ CGSize phase = CGSizeMake(x(), y());
+ CGContextSetPatternPhase(context, phase);
CGPatternCallbacks callbacks = {0, patternCallback, NULL};
CGPatternRef pattern = CGPatternCreate (
@@ -131,19 +126,6 @@
CGColorSpaceRef patternSpace = CGColorSpaceCreatePattern(NULL);
-
-// CGSize phase = CGSizeMake(x(), y());
-// if (boundingBoxMode()) {
-// // get the object bbox
-// CGRect objectBBox = CGContextGetPathBoundingBox(context);
-// phase.width += objectBBox.origin.x;
-// phase.height += objectBBox.origin.y;
-// }
- //CGContextSetPatternPhase(context, phase);
- CGContextSetPatternPhase(context, CGSizeZero); // FIXME: this might be right... might not.
-
- //NSLog(@"pattern phase: %f, %f transform: %@", phase.width, phase.height, CFStringFromCGAffineTransform(transform));
-
if ( (type & APPLY_TO_FILL) && style->isFilled() ) {
CGContextSetFillColorSpace(context, patternSpace);
CGContextSetFillPattern(context, pattern, &alpha);
1.2 +1 -1 SVGSupport/layout-tests/W3C-SVG-1.1/pservers-grad-03-b-expected.checksum
Index: pservers-grad-03-b-expected.checksum
===================================================================
RCS file: /cvs/root/SVGSupport/layout-tests/W3C-SVG-1.1/pservers-grad-03-b-expected.checksum,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pservers-grad-03-b-expected.checksum 18 Aug 2005 08:31:49 -0000 1.1
+++ pservers-grad-03-b-expected.checksum 24 Oct 2005 06:55:21 -0000 1.2
@@ -1 +1 @@
-358bda93d3f1c2c5ea3e999187b04f89
\ No newline at end of file
+cff4f2ac4cbdc6cd370d923afaf25869
\ No newline at end of file
1.2 +2 -2 SVGSupport/layout-tests/W3C-SVG-1.1/pservers-grad-03-b-expected.png
<<Binary file>>
1.2 +1 -1 SVGSupport/layout-tests/W3C-SVG-1.1/pservers-grad-06-b-expected.checksum
Index: pservers-grad-06-b-expected.checksum
===================================================================
RCS file: /cvs/root/SVGSupport/layout-tests/W3C-SVG-1.1/pservers-grad-06-b-expected.checksum,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pservers-grad-06-b-expected.checksum 18 Aug 2005 08:31:49 -0000 1.1
+++ pservers-grad-06-b-expected.checksum 24 Oct 2005 06:55:21 -0000 1.2
@@ -1 +1 @@
-6cc37ffa5a7f45214884ddb964543beb
\ No newline at end of file
+fbd555a75eb6d397b7ebd4ebedfde735
\ No newline at end of file
1.2 +18 -12 SVGSupport/layout-tests/W3C-SVG-1.1/pservers-grad-06-b-expected.png
<<Binary file>>
1.2 +1 -1 SVGSupport/layout-tests/W3C-SVG-1.1/pservers-pattern-01-b-expected.checksum
Index: pservers-pattern-01-b-expected.checksum
===================================================================
RCS file: /cvs/root/SVGSupport/layout-tests/W3C-SVG-1.1/pservers-pattern-01-b-expected.checksum,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pservers-pattern-01-b-expected.checksum 18 Aug 2005 08:31:51 -0000 1.1
+++ pservers-pattern-01-b-expected.checksum 24 Oct 2005 06:55:21 -0000 1.2
@@ -1 +1 @@
-641fed97291a0d9538f39f23241cf614
\ No newline at end of file
+2ac7b504147a4c4c56375cba23ad8588
\ No newline at end of file
1.2 +2 -2 SVGSupport/layout-tests/W3C-SVG-1.1/pservers-pattern-01-b-expected.png
<<Binary file>>
More information about the webkit-changes
mailing list