[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
zimmermann at webkit.org
zimmermann at webkit.org
Wed Dec 22 11:16:32 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 12628fc80ec517f443a105042a24d68008e144f0
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jul 16 11:39:26 2010 +0000
2010-07-16 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Dirk Schulze.
gradientTransform + objectBoundingBox is wrong
https://bugs.webkit.org/show_bug.cgi?id=42446
gradientTransform + gradientUnits="objectBoundingBox" is wrong. Reverse multiplication order of both transforms.
* rendering/RenderSVGResourceGradient.cpp: s/multiply/multLeft/
2010-07-16 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Dirk Schulze.
gradientTransform + objectBoundingBox is wrong
https://bugs.webkit.org/show_bug.cgi?id=42446
Update pixel test results after fixing gradientTransform and gradientUnits="objectBoundingBox" usage for shapes & text.
* platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.checksum:
* platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.png:
* platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.checksum:
* platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.png:
* platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.checksum:
* platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.png:
* platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.checksum:
* platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.png:
* platform/mac/svg/text/selection-background-color-expected.checksum:
* platform/mac/svg/text/selection-background-color-expected.png:
* platform/mac/svg/text/selection-styles-expected.checksum:
* platform/mac/svg/text/selection-styles-expected.png:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63542 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1eafb25..041a25c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,27 @@
2010-07-16 Nikolas Zimmermann <nzimmermann at rim.com>
+ Reviewed by Dirk Schulze.
+
+ gradientTransform + objectBoundingBox is wrong
+ https://bugs.webkit.org/show_bug.cgi?id=42446
+
+ Update pixel test results after fixing gradientTransform and gradientUnits="objectBoundingBox" usage for shapes & text.
+
+ * platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.checksum:
+ * platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.png:
+ * platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.checksum:
+ * platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.png:
+ * platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.checksum:
+ * platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.png:
+ * platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.checksum:
+ * platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.png:
+ * platform/mac/svg/text/selection-background-color-expected.checksum:
+ * platform/mac/svg/text/selection-background-color-expected.png:
+ * platform/mac/svg/text/selection-styles-expected.checksum:
+ * platform/mac/svg/text/selection-styles-expected.png:
+
+2010-07-16 Nikolas Zimmermann <nzimmermann at rim.com>
+
Not reviewed. Forgot to land new pixel test result in r63535.
* platform/mac/svg/custom/convolution-crash-expected.checksum:
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.checksum b/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.checksum
index 2240d03..73f9203 100644
--- a/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.checksum
+++ b/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.checksum
@@ -1 +1 @@
-4967d648fd1d75c55ef408d4778b4f49
\ No newline at end of file
+efe2b023e027a41372c77f7985d501a9
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.png b/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.png
index d2e682c..7002218 100644
Binary files a/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.png and b/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-dom-gradientTransform-attr-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.checksum b/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.checksum
index 3a5c211..e261842 100644
--- a/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.checksum
+++ b/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.checksum
@@ -1 +1 @@
-44d152b79e045a40e7f21ce3519b6761
\ No newline at end of file
+3f581e729cdd588040b4ebe84017d036
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.png b/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.png
index 0583c91..5808125 100644
Binary files a/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.png and b/LayoutTests/platform/mac/svg/dynamic-updates/SVGLinearGradientElement-svgdom-gradientTransform-prop-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.checksum b/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.checksum
index 228845f..039a863 100644
--- a/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.checksum
+++ b/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.checksum
@@ -1 +1 @@
-8189d8edd7aab8f4aaafe7b815e5f141
\ No newline at end of file
+dd087c847ce5b2e0442baf95656e0eb3
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.png b/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.png
index 5d88824..cb59e44 100644
Binary files a/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.png and b/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-dom-gradientTransform-attr-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.checksum b/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.checksum
index bfee314..496f693 100644
--- a/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.checksum
+++ b/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.checksum
@@ -1 +1 @@
-2d9101cb29701567b8355b00c63fa339
\ No newline at end of file
+1e394bdc1e268fab5d80818f845bd865
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.png b/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.png
index de62970..1046ec2 100644
Binary files a/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.png and b/LayoutTests/platform/mac/svg/dynamic-updates/SVGRadialGradientElement-svgdom-gradientTransform-prop-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/text/selection-background-color-expected.checksum b/LayoutTests/platform/mac/svg/text/selection-background-color-expected.checksum
index 9d64e9c..742f6d5 100644
--- a/LayoutTests/platform/mac/svg/text/selection-background-color-expected.checksum
+++ b/LayoutTests/platform/mac/svg/text/selection-background-color-expected.checksum
@@ -1 +1 @@
-85d0354d0f36c9a53cd6037ff740cef2
\ No newline at end of file
+b26973a208c70364f2afc2cd4a4e62b6
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/text/selection-background-color-expected.png b/LayoutTests/platform/mac/svg/text/selection-background-color-expected.png
index 7989993..6e190c1 100644
Binary files a/LayoutTests/platform/mac/svg/text/selection-background-color-expected.png and b/LayoutTests/platform/mac/svg/text/selection-background-color-expected.png differ
diff --git a/LayoutTests/platform/mac/svg/text/selection-styles-expected.checksum b/LayoutTests/platform/mac/svg/text/selection-styles-expected.checksum
index 90e437c..a6fece6 100644
--- a/LayoutTests/platform/mac/svg/text/selection-styles-expected.checksum
+++ b/LayoutTests/platform/mac/svg/text/selection-styles-expected.checksum
@@ -1 +1 @@
-146cef6cd91a53705cec6673543b786f
\ No newline at end of file
+45a08ca5abe90486550e037b0ce739dd
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/svg/text/selection-styles-expected.png b/LayoutTests/platform/mac/svg/text/selection-styles-expected.png
index a8e397c..fa8ee8e 100644
Binary files a/LayoutTests/platform/mac/svg/text/selection-styles-expected.png and b/LayoutTests/platform/mac/svg/text/selection-styles-expected.png differ
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bd5c3f2..b83c70d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-16 Nikolas Zimmermann <nzimmermann at rim.com>
+
+ Reviewed by Dirk Schulze.
+
+ gradientTransform + objectBoundingBox is wrong
+ https://bugs.webkit.org/show_bug.cgi?id=42446
+
+ gradientTransform + gradientUnits="objectBoundingBox" is wrong. Reverse multiplication order of both transforms.
+
+ * rendering/RenderSVGResourceGradient.cpp: s/multiply/multLeft/
+
2010-07-16 Mikhail Naganov <mnaganov at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/rendering/RenderSVGResourceGradient.cpp b/WebCore/rendering/RenderSVGResourceGradient.cpp
index c176a92..ce51369 100644
--- a/WebCore/rendering/RenderSVGResourceGradient.cpp
+++ b/WebCore/rendering/RenderSVGResourceGradient.cpp
@@ -128,7 +128,7 @@ static inline AffineTransform clipToTextMask(GraphicsContext* context,
matrix.translate(maskBoundingBox.x(), maskBoundingBox.y());
matrix.scaleNonUniform(maskBoundingBox.width(), maskBoundingBox.height());
}
- matrix.multiply(gradientData->transform);
+ matrix.multLeft(gradientData->transform);
return matrix;
}
#endif
@@ -174,7 +174,7 @@ bool RenderSVGResourceGradient::applyResource(RenderObject* object, RenderStyle*
gradientData->userspaceTransform.scaleNonUniform(objectBoundingBox.width(), objectBoundingBox.height());
}
- gradientData->userspaceTransform.multiply(gradientData->transform);
+ gradientData->userspaceTransform.multLeft(gradientData->transform);
gradientData->gradient->setGradientSpaceTransform(gradientData->userspaceTransform);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list