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

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

Issue 660653004: Move supplemental transform to rare data (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for landing Created 6 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
« no previous file with comments | « Source/core/svg/SVGGraphicsElement.cpp ('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, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
3 * Copyright (C) 2004, 2005, 2006, 2008 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005, 2006, 2008 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 TransformationMatrix t; 46 TransformationMatrix t;
47 // For now, the transform-origin is not taken into account 47 // For now, the transform-origin is not taken into account
48 // Also, any percentage values will not be taken into account 48 // Also, any percentage values will not be taken into account
49 style->applyTransform(t, IntSize(0, 0), RenderStyle::ExcludeTransformOri gin); 49 style->applyTransform(t, IntSize(0, 0), RenderStyle::ExcludeTransformOri gin);
50 // Flatten any 3D transform 50 // Flatten any 3D transform
51 matrix = t.toAffineTransform(); 51 matrix = t.toAffineTransform();
52 } else { 52 } else {
53 transform()->currentValue()->concatenate(matrix); 53 transform()->currentValue()->concatenate(matrix);
54 } 54 }
55 55
56 const AffineTransform* transform = const_cast<SVGTextElement*>(this)->supple mentalTransform(); 56 const AffineTransform* transform = const_cast<SVGTextElement*>(this)->animat eMotionTransform();
57 if (transform) 57 if (transform)
58 return *transform * matrix; 58 return *transform * matrix;
59 return matrix; 59 return matrix;
60 } 60 }
61 61
62 RenderObject* SVGTextElement::createRenderer(RenderStyle*) 62 RenderObject* SVGTextElement::createRenderer(RenderStyle*)
63 { 63 {
64 return new RenderSVGText(this); 64 return new RenderSVGText(this);
65 } 65 }
66 66
67 } 67 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGGraphicsElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698