Skip to content

Commit d65d470

Browse files
namusyakanigeltao
namusyaka
authored and
nigeltao
committed
html: remove a few attributes from svg attribute adjustments
As per the current spec, "contentScriptType", "contentStyleType" and "externalResourcesRequired" have been removed from the svg attribute adjustments. See: https://html.spec.whatwg.org/multipage/parsing.html#adjust-svg-attributes Change-Id: I904914691c3a3c3958868f7e49ba10f7d6f9ec09 Reviewed-on: https://go-review.googlesource.com/c/net/+/263398 Trust: Kunpei Sakai <namusyaka@gmail.com> Trust: Nigel Tao <nigeltao@golang.org> Run-TryBot: Kunpei Sakai <namusyaka@gmail.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Nigel Tao <nigeltao@golang.org>
1 parent 7b1cca2 commit d65d470

File tree

2 files changed

+114
-61
lines changed

2 files changed

+114
-61
lines changed

‎html/foreign.go

Lines changed: 58 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -161,65 +161,62 @@ var mathMLAttributeAdjustments = map[string]string{
161161
}
162162

163163
var svgAttributeAdjustments = map[string]string{
164-
"attributename": "attributeName",
165-
"attributetype": "attributeType",
166-
"basefrequency": "baseFrequency",
167-
"baseprofile": "baseProfile",
168-
"calcmode": "calcMode",
169-
"clippathunits": "clipPathUnits",
170-
"contentscripttype": "contentScriptType",
171-
"contentstyletype": "contentStyleType",
172-
"diffuseconstant": "diffuseConstant",
173-
"edgemode": "edgeMode",
174-
"externalresourcesrequired": "externalResourcesRequired",
175-
"filterunits": "filterUnits",
176-
"glyphref": "glyphRef",
177-
"gradienttransform": "gradientTransform",
178-
"gradientunits": "gradientUnits",
179-
"kernelmatrix": "kernelMatrix",
180-
"kernelunitlength": "kernelUnitLength",
181-
"keypoints": "keyPoints",
182-
"keysplines": "keySplines",
183-
"keytimes": "keyTimes",
184-
"lengthadjust": "lengthAdjust",
185-
"limitingconeangle": "limitingConeAngle",
186-
"markerheight": "markerHeight",
187-
"markerunits": "markerUnits",
188-
"markerwidth": "markerWidth",
189-
"maskcontentunits": "maskContentUnits",
190-
"maskunits": "maskUnits",
191-
"numoctaves": "numOctaves",
192-
"pathlength": "pathLength",
193-
"patterncontentunits": "patternContentUnits",
194-
"patterntransform": "patternTransform",
195-
"patternunits": "patternUnits",
196-
"pointsatx": "pointsAtX",
197-
"pointsaty": "pointsAtY",
198-
"pointsatz": "pointsAtZ",
199-
"preservealpha": "preserveAlpha",
200-
"preserveaspectratio": "preserveAspectRatio",
201-
"primitiveunits": "primitiveUnits",
202-
"refx": "refX",
203-
"refy": "refY",
204-
"repeatcount": "repeatCount",
205-
"repeatdur": "repeatDur",
206-
"requiredextensions": "requiredExtensions",
207-
"requiredfeatures": "requiredFeatures",
208-
"specularconstant": "specularConstant",
209-
"specularexponent": "specularExponent",
210-
"spreadmethod": "spreadMethod",
211-
"startoffset": "startOffset",
212-
"stddeviation": "stdDeviation",
213-
"stitchtiles": "stitchTiles",
214-
"surfacescale": "surfaceScale",
215-
"systemlanguage": "systemLanguage",
216-
"tablevalues": "tableValues",
217-
"targetx": "targetX",
218-
"targety": "targetY",
219-
"textlength": "textLength",
220-
"viewbox": "viewBox",
221-
"viewtarget": "viewTarget",
222-
"xchannelselector": "xChannelSelector",
223-
"ychannelselector": "yChannelSelector",
224-
"zoomandpan": "zoomAndPan",
164+
"attributename": "attributeName",
165+
"attributetype": "attributeType",
166+
"basefrequency": "baseFrequency",
167+
"baseprofile": "baseProfile",
168+
"calcmode": "calcMode",
169+
"clippathunits": "clipPathUnits",
170+
"diffuseconstant": "diffuseConstant",
171+
"edgemode": "edgeMode",
172+
"filterunits": "filterUnits",
173+
"glyphref": "glyphRef",
174+
"gradienttransform": "gradientTransform",
175+
"gradientunits": "gradientUnits",
176+
"kernelmatrix": "kernelMatrix",
177+
"kernelunitlength": "kernelUnitLength",
178+
"keypoints": "keyPoints",
179+
"keysplines": "keySplines",
180+
"keytimes": "keyTimes",
181+
"lengthadjust": "lengthAdjust",
182+
"limitingconeangle": "limitingConeAngle",
183+
"markerheight": "markerHeight",
184+
"markerunits": "markerUnits",
185+
"markerwidth": "markerWidth",
186+
"maskcontentunits": "maskContentUnits",
187+
"maskunits": "maskUnits",
188+
"numoctaves": "numOctaves",
189+
"pathlength": "pathLength",
190+
"patterncontentunits": "patternContentUnits",
191+
"patterntransform": "patternTransform",
192+
"patternunits": "patternUnits",
193+
"pointsatx": "pointsAtX",
194+
"pointsaty": "pointsAtY",
195+
"pointsatz": "pointsAtZ",
196+
"preservealpha": "preserveAlpha",
197+
"preserveaspectratio": "preserveAspectRatio",
198+
"primitiveunits": "primitiveUnits",
199+
"refx": "refX",
200+
"refy": "refY",
201+
"repeatcount": "repeatCount",
202+
"repeatdur": "repeatDur",
203+
"requiredextensions": "requiredExtensions",
204+
"requiredfeatures": "requiredFeatures",
205+
"specularconstant": "specularConstant",
206+
"specularexponent": "specularExponent",
207+
"spreadmethod": "spreadMethod",
208+
"startoffset": "startOffset",
209+
"stddeviation": "stdDeviation",
210+
"stitchtiles": "stitchTiles",
211+
"surfacescale": "surfaceScale",
212+
"systemlanguage": "systemLanguage",
213+
"tablevalues": "tableValues",
214+
"targetx": "targetX",
215+
"targety": "targetY",
216+
"textlength": "textLength",
217+
"viewbox": "viewBox",
218+
"viewtarget": "viewTarget",
219+
"xchannelselector": "xChannelSelector",
220+
"ychannelselector": "yChannelSelector",
221+
"zoomandpan": "zoomAndPan",
225222
}

‎html/testdata/webkit/tests11.dat

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,62 @@
271271
| ychannelselector=""
272272
| zoomandpan=""
273273

274+
#data
275+
<!DOCTYPE html><body><svg contentScriptType='' contentStyleType='' externalResourcesRequired='' filterRes=''></svg>
276+
#errors
277+
#document
278+
| <!DOCTYPE html>
279+
| <html>
280+
| <head>
281+
| <body>
282+
| <svg svg>
283+
| contentscripttype=""
284+
| contentstyletype=""
285+
| externalresourcesrequired=""
286+
| filterres=""
287+
288+
#data
289+
<!DOCTYPE html><body><svg CONTENTSCRIPTTYPE='' CONTENTSTYLETYPE='' EXTERNALRESOURCESREQUIRED='' FILTERRES=''></svg>
290+
#errors
291+
#document
292+
| <!DOCTYPE html>
293+
| <html>
294+
| <head>
295+
| <body>
296+
| <svg svg>
297+
| contentscripttype=""
298+
| contentstyletype=""
299+
| externalresourcesrequired=""
300+
| filterres=""
301+
302+
#data
303+
<!DOCTYPE html><body><svg contentscripttype='' contentstyletype='' externalresourcesrequired='' filterres=''></svg>
304+
#errors
305+
#document
306+
| <!DOCTYPE html>
307+
| <html>
308+
| <head>
309+
| <body>
310+
| <svg svg>
311+
| contentscripttype=""
312+
| contentstyletype=""
313+
| externalresourcesrequired=""
314+
| filterres=""
315+
316+
#data
317+
<!DOCTYPE html><body><math contentScriptType='' contentStyleType='' externalResourcesRequired='' filterRes=''></math>
318+
#errors
319+
#document
320+
| <!DOCTYPE html>
321+
| <html>
322+
| <head>
323+
| <body>
324+
| <math math>
325+
| contentscripttype=""
326+
| contentstyletype=""
327+
| externalresourcesrequired=""
328+
| filterres=""
329+
274330
#data
275331
<!DOCTYPE html><body><svg><altGlyph /><altGlyphDef /><altGlyphItem /><animateColor /><animateMotion /><animateTransform /><clipPath /><feBlend /><feColorMatrix /><feComponentTransfer /><feComposite /><feConvolveMatrix /><feDiffuseLighting /><feDisplacementMap /><feDistantLight /><feFlood /><feFuncA /><feFuncB /><feFuncG /><feFuncR /><feGaussianBlur /><feImage /><feMerge /><feMergeNode /><feMorphology /><feOffset /><fePointLight /><feSpecularLighting /><feSpotLight /><feTile /><feTurbulence /><foreignObject /><glyphRef /><linearGradient /><radialGradient /><textPath /></svg>
276332
#errors

0 commit comments

Comments
 (0)