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

Side by Side Diff: third_party/WebKit/WebCore/svg/SVGTransformDistance.cpp

Issue 21184: WebKit merge 40722:40785 (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 10 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
OLDNEW
1 /* 1 /*
2 Copyright (C) 2007 Eric Seidel <eric@webkit.org> 2 Copyright (C) 2007 Eric Seidel <eric@webkit.org>
3 3
4 This file is part of the WebKit project 4 This file is part of the WebKit project
5 5
6 This library is free software; you can redistribute it and/or 6 This library is free software; you can redistribute it and/or
7 modify it under the terms of the GNU Library General Public 7 modify it under the terms of the GNU Library General Public
8 License as published by the Free Software Foundation; either 8 License as published by the Free Software Foundation; either
9 version 2 of the License, or (at your option) any later version. 9 version 2 of the License, or (at your option) any later version.
10 10
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 case SVGTransform::SVG_TRANSFORM_TRANSLATE: 72 case SVGTransform::SVG_TRANSFORM_TRANSLATE:
73 { 73 {
74 FloatSize translationDistance = toSVGTransform.translate() - fromSVGTran sform.translate(); 74 FloatSize translationDistance = toSVGTransform.translate() - fromSVGTran sform.translate();
75 m_transform.translate(translationDistance.width(), translationDistance.h eight()); 75 m_transform.translate(translationDistance.width(), translationDistance.h eight());
76 return; 76 return;
77 } 77 }
78 case SVGTransform::SVG_TRANSFORM_SCALE: 78 case SVGTransform::SVG_TRANSFORM_SCALE:
79 { 79 {
80 float scaleX = toSVGTransform.scale().width() - fromSVGTransform.scale() .width(); 80 float scaleX = toSVGTransform.scale().width() - fromSVGTransform.scale() .width();
81 float scaleY = toSVGTransform.scale().height() - fromSVGTransform.scale( ).height(); 81 float scaleY = toSVGTransform.scale().height() - fromSVGTransform.scale( ).height();
82 m_transform.scale(scaleX, scaleY); 82 m_transform.scaleNonUniform(scaleX, scaleY);
83 return; 83 return;
84 } 84 }
85 case SVGTransform::SVG_TRANSFORM_SKEWX: 85 case SVGTransform::SVG_TRANSFORM_SKEWX:
86 case SVGTransform::SVG_TRANSFORM_SKEWY: 86 case SVGTransform::SVG_TRANSFORM_SKEWY:
87 m_angle = toSVGTransform.angle() - fromSVGTransform.angle(); 87 m_angle = toSVGTransform.angle() - fromSVGTransform.angle();
88 return; 88 return;
89 } 89 }
90 } 90 }
91 91
92 SVGTransformDistance SVGTransformDistance::scaledDistance(float scaleFactor) con st 92 SVGTransformDistance SVGTransformDistance::scaledDistance(float scaleFactor) con st
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 { 181 {
182 float dx = absoluteValue ? fabsf(transform.translate().x()) : transform. translate().x(); 182 float dx = absoluteValue ? fabsf(transform.translate().x()) : transform. translate().x();
183 float dy = absoluteValue ? fabsf(transform.translate().y()) : transform. translate().y(); 183 float dy = absoluteValue ? fabsf(transform.translate().y()) : transform. translate().y();
184 m_transform.translate(dx, dy); 184 m_transform.translate(dx, dy);
185 return; 185 return;
186 } 186 }
187 case SVGTransform::SVG_TRANSFORM_SCALE: 187 case SVGTransform::SVG_TRANSFORM_SCALE:
188 { 188 {
189 float scaleX = absoluteValue ? fabsf(transform.scale().width()) : transf orm.scale().width(); 189 float scaleX = absoluteValue ? fabsf(transform.scale().width()) : transf orm.scale().width();
190 float scaleY = absoluteValue ? fabsf(transform.scale().height()) : trans form.scale().height(); 190 float scaleY = absoluteValue ? fabsf(transform.scale().height()) : trans form.scale().height();
191 m_transform.scale(scaleX, scaleY); 191 m_transform.scaleNonUniform(scaleX, scaleY);
192 return; 192 return;
193 } 193 }
194 case SVGTransform::SVG_TRANSFORM_SKEWX: 194 case SVGTransform::SVG_TRANSFORM_SKEWX:
195 case SVGTransform::SVG_TRANSFORM_SKEWY: 195 case SVGTransform::SVG_TRANSFORM_SKEWY:
196 m_angle += absoluteValue ? fabsf(transform.angle()) : transform.angle(); 196 m_angle += absoluteValue ? fabsf(transform.angle()) : transform.angle();
197 return; 197 return;
198 } 198 }
199 199
200 ASSERT_NOT_REACHED(); 200 ASSERT_NOT_REACHED();
201 return; 201 return;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 case SVGTransform::SVG_TRANSFORM_SKEWY: 269 case SVGTransform::SVG_TRANSFORM_SKEWY:
270 return m_angle; 270 return m_angle;
271 } 271 }
272 ASSERT_NOT_REACHED(); 272 ASSERT_NOT_REACHED();
273 return 0.0f; 273 return 0.0f;
274 } 274 }
275 275
276 } 276 }
277 277
278 #endif 278 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/svg/SVGTransform.cpp ('k') | third_party/WebKit/WebCore/svg/graphics/SVGResourceClipper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698