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

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

Issue 21042009: [SVG2] Merge SVGStyledElement into SVGElement (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 4 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 | « Source/core/svg/SVGGraphicsElement.h ('k') | Source/core/svg/SVGGraphicsElement.idl » ('j') | 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 18 matching lines...) Expand all
29 #include "core/rendering/svg/SVGPathData.h" 29 #include "core/rendering/svg/SVGPathData.h"
30 #include "core/svg/SVGElementInstance.h" 30 #include "core/svg/SVGElementInstance.h"
31 31
32 namespace WebCore { 32 namespace WebCore {
33 33
34 // Animated property definitions 34 // Animated property definitions
35 DEFINE_ANIMATED_TRANSFORM_LIST(SVGGraphicsElement, SVGNames::transformAttr, Tran sform, transform) 35 DEFINE_ANIMATED_TRANSFORM_LIST(SVGGraphicsElement, SVGNames::transformAttr, Tran sform, transform)
36 36
37 BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGGraphicsElement) 37 BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGGraphicsElement)
38 REGISTER_LOCAL_ANIMATED_PROPERTY(transform) 38 REGISTER_LOCAL_ANIMATED_PROPERTY(transform)
39 REGISTER_PARENT_ANIMATED_PROPERTIES(SVGStyledElement) 39 REGISTER_PARENT_ANIMATED_PROPERTIES(SVGElement)
40 REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests) 40 REGISTER_PARENT_ANIMATED_PROPERTIES(SVGTests)
41 END_REGISTER_ANIMATED_PROPERTIES 41 END_REGISTER_ANIMATED_PROPERTIES
42 42
43 SVGGraphicsElement::SVGGraphicsElement(const QualifiedName& tagName, Document* d ocument, ConstructionType constructionType) 43 SVGGraphicsElement::SVGGraphicsElement(const QualifiedName& tagName, Document* d ocument, ConstructionType constructionType)
44 : SVGStyledElement(tagName, document, constructionType) 44 : SVGElement(tagName, document, constructionType)
45 { 45 {
46 registerAnimatedPropertiesForSVGGraphicsElement(); 46 registerAnimatedPropertiesForSVGGraphicsElement();
47 } 47 }
48 48
49 SVGGraphicsElement::~SVGGraphicsElement() 49 SVGGraphicsElement::~SVGGraphicsElement()
50 { 50 {
51 } 51 }
52 52
53 AffineTransform SVGGraphicsElement::getCTM(StyleUpdateStrategy styleUpdateStrate gy) 53 AffineTransform SVGGraphicsElement::getCTM(StyleUpdateStrategy styleUpdateStrate gy)
54 { 54 {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 if (supportedAttributes.isEmpty()) { 96 if (supportedAttributes.isEmpty()) {
97 SVGTests::addSupportedAttributes(supportedAttributes); 97 SVGTests::addSupportedAttributes(supportedAttributes);
98 supportedAttributes.add(SVGNames::transformAttr); 98 supportedAttributes.add(SVGNames::transformAttr);
99 } 99 }
100 return supportedAttributes.contains<SVGAttributeHashTranslator>(attrName); 100 return supportedAttributes.contains<SVGAttributeHashTranslator>(attrName);
101 } 101 }
102 102
103 void SVGGraphicsElement::parseAttribute(const QualifiedName& name, const AtomicS tring& value) 103 void SVGGraphicsElement::parseAttribute(const QualifiedName& name, const AtomicS tring& value)
104 { 104 {
105 if (!isSupportedAttribute(name)) { 105 if (!isSupportedAttribute(name)) {
106 SVGStyledElement::parseAttribute(name, value); 106 SVGElement::parseAttribute(name, value);
107 return; 107 return;
108 } 108 }
109 109
110 if (name == SVGNames::transformAttr) { 110 if (name == SVGNames::transformAttr) {
111 SVGTransformList newList; 111 SVGTransformList newList;
112 newList.parse(value); 112 newList.parse(value);
113 detachAnimatedTransformListWrappers(newList.size()); 113 detachAnimatedTransformListWrappers(newList.size());
114 setTransformBaseValue(newList); 114 setTransformBaseValue(newList);
115 return; 115 return;
116 } else if (SVGTests::parseAttribute(name, value)) { 116 } else if (SVGTests::parseAttribute(name, value)) {
117 return; 117 return;
118 } 118 }
119 119
120 ASSERT_NOT_REACHED(); 120 ASSERT_NOT_REACHED();
121 } 121 }
122 122
123 void SVGGraphicsElement::svgAttributeChanged(const QualifiedName& attrName) 123 void SVGGraphicsElement::svgAttributeChanged(const QualifiedName& attrName)
124 { 124 {
125 if (!isSupportedAttribute(attrName)) { 125 if (!isSupportedAttribute(attrName)) {
126 SVGStyledElement::svgAttributeChanged(attrName); 126 SVGElement::svgAttributeChanged(attrName);
127 return; 127 return;
128 } 128 }
129 129
130 SVGElementInstance::InvalidationGuard invalidationGuard(this); 130 SVGElementInstance::InvalidationGuard invalidationGuard(this);
131 131
132 if (SVGTests::handleAttributeChange(this, attrName)) 132 if (SVGTests::handleAttributeChange(this, attrName))
133 return; 133 return;
134 134
135 RenderObject* object = renderer(); 135 RenderObject* object = renderer();
136 if (!object) 136 if (!object)
(...skipping 30 matching lines...) Expand all
167 } 167 }
168 168
169 void SVGGraphicsElement::toClipPath(Path& path) 169 void SVGGraphicsElement::toClipPath(Path& path)
170 { 170 {
171 updatePathFromGraphicsElement(this, path); 171 updatePathFromGraphicsElement(this, path);
172 // FIXME: How do we know the element has done a layout? 172 // FIXME: How do we know the element has done a layout?
173 path.transform(animatedLocalTransform()); 173 path.transform(animatedLocalTransform());
174 } 174 }
175 175
176 } 176 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGGraphicsElement.h ('k') | Source/core/svg/SVGGraphicsElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698