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

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

Issue 62083002: Remove support for the externalResourcesRequired attribute. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebaseline test Created 6 years, 11 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/SVGFilterElement.h ('k') | Source/core/svg/SVGFilterElement.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, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org> 2 * Copyright (C) 2004, 2005, 2006, 2007 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 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> 4 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
5 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> 5 * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 24 matching lines...) Expand all
35 // Animated property definitions 35 // Animated property definitions
36 DEFINE_ANIMATED_ENUMERATION(SVGFilterElement, SVGNames::filterUnitsAttr, FilterU nits, filterUnits, SVGUnitTypes::SVGUnitType) 36 DEFINE_ANIMATED_ENUMERATION(SVGFilterElement, SVGNames::filterUnitsAttr, FilterU nits, filterUnits, SVGUnitTypes::SVGUnitType)
37 DEFINE_ANIMATED_ENUMERATION(SVGFilterElement, SVGNames::primitiveUnitsAttr, Prim itiveUnits, primitiveUnits, SVGUnitTypes::SVGUnitType) 37 DEFINE_ANIMATED_ENUMERATION(SVGFilterElement, SVGNames::primitiveUnitsAttr, Prim itiveUnits, primitiveUnits, SVGUnitTypes::SVGUnitType)
38 DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::xAttr, X, x) 38 DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::xAttr, X, x)
39 DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::yAttr, Y, y) 39 DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::yAttr, Y, y)
40 DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::widthAttr, Width, width) 40 DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::widthAttr, Width, width)
41 DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::heightAttr, Height, height) 41 DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::heightAttr, Height, height)
42 DEFINE_ANIMATED_INTEGER_MULTIPLE_WRAPPERS(SVGFilterElement, SVGNames::filterResA ttr, filterResXIdentifier(), FilterResX, filterResX) 42 DEFINE_ANIMATED_INTEGER_MULTIPLE_WRAPPERS(SVGFilterElement, SVGNames::filterResA ttr, filterResXIdentifier(), FilterResX, filterResX)
43 DEFINE_ANIMATED_INTEGER_MULTIPLE_WRAPPERS(SVGFilterElement, SVGNames::filterResA ttr, filterResYIdentifier(), FilterResY, filterResY) 43 DEFINE_ANIMATED_INTEGER_MULTIPLE_WRAPPERS(SVGFilterElement, SVGNames::filterResA ttr, filterResYIdentifier(), FilterResY, filterResY)
44 DEFINE_ANIMATED_STRING(SVGFilterElement, XLinkNames::hrefAttr, Href, href) 44 DEFINE_ANIMATED_STRING(SVGFilterElement, XLinkNames::hrefAttr, Href, href)
45 DEFINE_ANIMATED_BOOLEAN(SVGFilterElement, SVGNames::externalResourcesRequiredAtt r, ExternalResourcesRequired, externalResourcesRequired)
46 45
47 BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFilterElement) 46 BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFilterElement)
48 REGISTER_LOCAL_ANIMATED_PROPERTY(filterUnits) 47 REGISTER_LOCAL_ANIMATED_PROPERTY(filterUnits)
49 REGISTER_LOCAL_ANIMATED_PROPERTY(primitiveUnits) 48 REGISTER_LOCAL_ANIMATED_PROPERTY(primitiveUnits)
50 REGISTER_LOCAL_ANIMATED_PROPERTY(x) 49 REGISTER_LOCAL_ANIMATED_PROPERTY(x)
51 REGISTER_LOCAL_ANIMATED_PROPERTY(y) 50 REGISTER_LOCAL_ANIMATED_PROPERTY(y)
52 REGISTER_LOCAL_ANIMATED_PROPERTY(width) 51 REGISTER_LOCAL_ANIMATED_PROPERTY(width)
53 REGISTER_LOCAL_ANIMATED_PROPERTY(height) 52 REGISTER_LOCAL_ANIMATED_PROPERTY(height)
54 REGISTER_LOCAL_ANIMATED_PROPERTY(filterResX) 53 REGISTER_LOCAL_ANIMATED_PROPERTY(filterResX)
55 REGISTER_LOCAL_ANIMATED_PROPERTY(filterResY) 54 REGISTER_LOCAL_ANIMATED_PROPERTY(filterResY)
56 REGISTER_LOCAL_ANIMATED_PROPERTY(href) 55 REGISTER_LOCAL_ANIMATED_PROPERTY(href)
57 REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
58 END_REGISTER_ANIMATED_PROPERTIES 56 END_REGISTER_ANIMATED_PROPERTIES
59 57
60 inline SVGFilterElement::SVGFilterElement(Document& document) 58 inline SVGFilterElement::SVGFilterElement(Document& document)
61 : SVGElement(SVGNames::filterTag, document) 59 : SVGElement(SVGNames::filterTag, document)
62 , m_filterUnits(SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) 60 , m_filterUnits(SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX)
63 , m_primitiveUnits(SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE) 61 , m_primitiveUnits(SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE)
64 , m_x(LengthModeWidth, "-10%") 62 , m_x(LengthModeWidth, "-10%")
65 , m_y(LengthModeHeight, "-10%") 63 , m_y(LengthModeHeight, "-10%")
66 , m_width(LengthModeWidth, "120%") 64 , m_width(LengthModeWidth, "120%")
67 , m_height(LengthModeHeight, "120%") 65 , m_height(LengthModeHeight, "120%")
(...skipping 29 matching lines...) Expand all
97 RenderSVGResourceContainer* renderer = toRenderSVGResourceContainer(this->re nderer()); 95 RenderSVGResourceContainer* renderer = toRenderSVGResourceContainer(this->re nderer());
98 if (renderer) 96 if (renderer)
99 renderer->invalidateCacheAndMarkForLayout(); 97 renderer->invalidateCacheAndMarkForLayout();
100 } 98 }
101 99
102 bool SVGFilterElement::isSupportedAttribute(const QualifiedName& attrName) 100 bool SVGFilterElement::isSupportedAttribute(const QualifiedName& attrName)
103 { 101 {
104 DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ()); 102 DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ());
105 if (supportedAttributes.isEmpty()) { 103 if (supportedAttributes.isEmpty()) {
106 SVGURIReference::addSupportedAttributes(supportedAttributes); 104 SVGURIReference::addSupportedAttributes(supportedAttributes);
107 SVGExternalResourcesRequired::addSupportedAttributes(supportedAttributes );
108 supportedAttributes.add(SVGNames::filterUnitsAttr); 105 supportedAttributes.add(SVGNames::filterUnitsAttr);
109 supportedAttributes.add(SVGNames::primitiveUnitsAttr); 106 supportedAttributes.add(SVGNames::primitiveUnitsAttr);
110 supportedAttributes.add(SVGNames::xAttr); 107 supportedAttributes.add(SVGNames::xAttr);
111 supportedAttributes.add(SVGNames::yAttr); 108 supportedAttributes.add(SVGNames::yAttr);
112 supportedAttributes.add(SVGNames::widthAttr); 109 supportedAttributes.add(SVGNames::widthAttr);
113 supportedAttributes.add(SVGNames::heightAttr); 110 supportedAttributes.add(SVGNames::heightAttr);
114 supportedAttributes.add(SVGNames::filterResAttr); 111 supportedAttributes.add(SVGNames::filterResAttr);
115 } 112 }
116 return supportedAttributes.contains<SVGAttributeHashTranslator>(attrName); 113 return supportedAttributes.contains<SVGAttributeHashTranslator>(attrName);
117 } 114 }
(...skipping 19 matching lines...) Expand all
137 else if (name == SVGNames::widthAttr) 134 else if (name == SVGNames::widthAttr)
138 setWidthBaseValue(SVGLength::construct(LengthModeWidth, value, parseErro r)); 135 setWidthBaseValue(SVGLength::construct(LengthModeWidth, value, parseErro r));
139 else if (name == SVGNames::heightAttr) 136 else if (name == SVGNames::heightAttr)
140 setHeightBaseValue(SVGLength::construct(LengthModeHeight, value, parseEr ror)); 137 setHeightBaseValue(SVGLength::construct(LengthModeHeight, value, parseEr ror));
141 else if (name == SVGNames::filterResAttr) { 138 else if (name == SVGNames::filterResAttr) {
142 float x, y; 139 float x, y;
143 if (parseNumberOptionalNumber(value, x, y)) { 140 if (parseNumberOptionalNumber(value, x, y)) {
144 setFilterResXBaseValue(x); 141 setFilterResXBaseValue(x);
145 setFilterResYBaseValue(y); 142 setFilterResYBaseValue(y);
146 } 143 }
147 } else if (SVGURIReference::parseAttribute(name, value) 144 } else if (SVGURIReference::parseAttribute(name, value)) {
148 || SVGExternalResourcesRequired::parseAttribute(name, value)) {
149 } else 145 } else
150 ASSERT_NOT_REACHED(); 146 ASSERT_NOT_REACHED();
151 147
152 reportAttributeParsingError(parseError, name, value); 148 reportAttributeParsingError(parseError, name, value);
153 } 149 }
154 150
155 void SVGFilterElement::svgAttributeChanged(const QualifiedName& attrName) 151 void SVGFilterElement::svgAttributeChanged(const QualifiedName& attrName)
156 { 152 {
157 if (!isSupportedAttribute(attrName)) { 153 if (!isSupportedAttribute(attrName)) {
158 SVGElement::svgAttributeChanged(attrName); 154 SVGElement::svgAttributeChanged(attrName);
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 m_clientsToAdd.add(client); 244 m_clientsToAdd.add(client);
249 } 245 }
250 246
251 void SVGFilterElement::removeClient(Node* client) 247 void SVGFilterElement::removeClient(Node* client)
252 { 248 {
253 ASSERT(client); 249 ASSERT(client);
254 m_clientsToAdd.remove(client); 250 m_clientsToAdd.remove(client);
255 } 251 }
256 252
257 } 253 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGFilterElement.h ('k') | Source/core/svg/SVGFilterElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698