Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: Source/core/svg/SVGGraphicsElement.cpp

Issue 40293002: [SVG] Fix CSS transform handling when zoomed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « LayoutTests/svg/zoom/page/zoom-css-transforms-expected.svg ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 // If CSS property was set, use that, otherwise fallback to attribute (if se t). 68 // If CSS property was set, use that, otherwise fallback to attribute (if se t).
69 if (style && style->hasTransform()) { 69 if (style && style->hasTransform()) {
70 // Note: objectBoundingBox is an emptyRect for elements like pattern or clipPath. 70 // Note: objectBoundingBox is an emptyRect for elements like pattern or clipPath.
71 // See the "Object bounding box units" section of http://dev.w3.org/cssw g/css3-transforms/ 71 // See the "Object bounding box units" section of http://dev.w3.org/cssw g/css3-transforms/
72 TransformationMatrix transform; 72 TransformationMatrix transform;
73 style->applyTransform(transform, renderer()->objectBoundingBox()); 73 style->applyTransform(transform, renderer()->objectBoundingBox());
74 74
75 // Flatten any 3D transform. 75 // Flatten any 3D transform.
76 matrix = transform.toAffineTransform(); 76 matrix = transform.toAffineTransform();
77
78 // CSS bakes the zoom factor into lengths, including translation compone nts.
79 // In order to align CSS & SVG transforms, we need to invert this operat ion.
80 float zoom = style->effectiveZoom();
81 if (zoom != 1) {
82 matrix.setE(matrix.e() / zoom);
83 matrix.setF(matrix.f() / zoom);
84 }
77 } else { 85 } else {
78 transformCurrentValue().concatenate(matrix); 86 transformCurrentValue().concatenate(matrix);
79 } 87 }
80 88
81 if (m_supplementalTransform) 89 if (m_supplementalTransform)
82 return *m_supplementalTransform * matrix; 90 return *m_supplementalTransform * matrix;
83 return matrix; 91 return matrix;
84 } 92 }
85 93
86 AffineTransform* SVGGraphicsElement::supplementalTransform() 94 AffineTransform* SVGGraphicsElement::supplementalTransform()
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 } 175 }
168 176
169 void SVGGraphicsElement::toClipPath(Path& path) 177 void SVGGraphicsElement::toClipPath(Path& path)
170 { 178 {
171 updatePathFromGraphicsElement(this, path); 179 updatePathFromGraphicsElement(this, path);
172 // FIXME: How do we know the element has done a layout? 180 // FIXME: How do we know the element has done a layout?
173 path.transform(animatedLocalTransform()); 181 path.transform(animatedLocalTransform());
174 } 182 }
175 183
176 } 184 }
OLDNEW
« no previous file with comments | « LayoutTests/svg/zoom/page/zoom-css-transforms-expected.svg ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698