LayoutTests/svg/dom/resources/svgtags.js - Issue 1006863002: Some minor touch-ups to the SVG content-model test framework

Unified Diff: LayoutTests/svg/dom/resources/svgtags.js

Issue 1006863002: Some minor touch-ups to the SVG content-model test framework (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: More SVG2 updates Created 5 years, 9 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 side-by-side diff with in-line comments

Download patch

Index: LayoutTests/svg/dom/resources/svgtags.js

diff --git a/LayoutTests/svg/dom/resources/svgtags.js b/LayoutTests/svg/dom/resources/svgtags.js

index a7236ea5be1fad1268bb3e517e870cffd6520dab..514051df357ef32a1a09134f798a599dd37cda92 100644

--- a/LayoutTests/svg/dom/resources/svgtags.js

+++ b/LayoutTests/svg/dom/resources/svgtags.js

@@ -1,69 +1,63 @@

// A list of all SVG tags plus optional properties:

// * needParent (string) - parent element required for a valid context

-// * needChld (string list) - child element(s) required for a valid context

+// * needChild (string list) - child element(s) required for a valid context

// * needAttr (string map) - attribute(s) required for a valid context

// * noRenderer (bool) - true if the element doesn't have an associated renderer

var SvgTags = {

a: { },

- altGlyph: { },

- altGlyphDef: { },

- altGlyphItem: { },

+// audio: { },

animate: { noRenderer: true },

- animateColor: { },

- animateMotion: { },

- animateTransform: { },

+ animateMotion: { noRenderer: true },

+ animateTransform: { noRenderer: true },

+// canvas: { },

circle: { },

clipPath: { },

- color_profile: { },

- cursor: { },

+ cursor: { noRenderer: true },

defs: { },

desc: { noRenderer: true },

+ discard: { noRenderer: true },

ellipse: { },

feBlend: { needParent: 'filter' },

feColorMatrix: { needParent: 'filter' },

feComponentTransfer: { needParent: 'filter' },

feComposite: { needParent: 'filter' },

feConvolveMatrix: { needParent: 'filter', needAttr: { kernelMatrix: '0 0 0 0 0 0 0 0 0' } },

- feDiffuseLighting: { needParent: 'filter', needChld: [ 'fePointLight' ] },

+ feDiffuseLighting: { needParent: 'filter', needChild: [ 'fePointLight' ] },

feDisplacementMap: { needParent: 'filter' },

feDistantLight: { needParent: 'feSpecularLighting' },

- feDropShadow: { },

+ feDropShadow: { needParent: 'filter' },

feFlood: { needParent: 'filter' },

- feFuncA: { },

- feFuncB: { },

- feFuncG: { },

- feFuncR: { },

+ feFuncA: { needParent: 'feComponentTransfer' },

+ feFuncB: { needParent: 'feComponentTransfer' },

+ feFuncG: { needParent: 'feComponentTransfer' },

+ feFuncR: { needParent: 'feComponentTransfer' },

feGaussianBlur: { needParent: 'filter' },

feImage: { needParent: 'filter' },

- feMerge: { needParent: 'filter', needChld: [ 'feMergeNode' ] },

+ feMerge: { needParent: 'filter', needChild: [ 'feMergeNode' ] },

feMergeNode: { needParent: 'feMerge' },

feMorphology: { needParent: 'filter' },

feOffset: { needParent: 'filter' },

fePointLight: { needParent: 'feSpecularLighting' },

- feSpecularLighting: { needParent: 'filter', needChld: [ 'fePointLight' ] },

+ feSpecularLighting: { needParent: 'filter', needChild: [ 'fePointLight' ] },

feSpotLight: { needParent: 'feSpecularLighting' },

feTile: { needParent: 'filter' },

feTurbulence: { needParent: 'filter' },

filter: { },

- font: { },

- font_face: { },

- font_face_format: { },

- font_face_name: { },

- font_face_src: { },

- font_face_uri: { },

foreignObject: { },

g: { },

- glyph: { },

- glyphRef: { },

- hkern: { },

+// hatch: { },

+// hatchPath: { },

+// iframe: { },

image: { },

line: { },

linearGradient: { },

marker: { },

mask: { },

+// meshGradient: { },

+// meshPatch: { },

+// meshRow: { },

metadata: { noRenderer: true },

- missing_glyph: { },

mpath: { },

path: { },

pattern: { },

@@ -71,75 +65,84 @@ var SvgTags = {

polyline: { },

radialGradient: { },

rect: { },

- script: { },

+ script: { noRenderer: true },

set: { noRenderer: true },

+// solidColor: { },

+// source: { },

stop: { },

- style: { },

+ style: { noRenderer: true },

svg: { },

switch: { },

symbol: { },

text: { },

textPath: { },

+// track: { },

title: { noRenderer: true },

- tref: { },

tspan: { },

use: { },

- view: { },

- vkern: { },

+// video: { },

+ view: { noRenderer: true },

}

// SVG element class shorthands as defined by the spec.

var SvgTagClasses = {

CLASS_ANIMATION: [

- // http://www.w3.org/TR/SVG/intro.html#TermAnimationElement

- 'animate', 'animateColor', 'animateMotion', 'animateTransform', 'set'

- ],

- CLASS_BASIC_SHAPE: [

- // http://www.w3.org/TR/SVG/intro.html#TermBasicShapeElement

- 'circle', 'ellipse', 'line', 'polygon', 'polyline', 'rect'

+ // https://svgwg.org/svg2-draft/animate.html#TermAnimationElement

+ 'animate', 'animateMotion', 'animateTransform', 'discard', 'set'

CLASS_CONTAINER: [

- // http://www.w3.org/TR/SVG/intro.html#TermContainerElement

+ // https://svgwg.org/svg2-draft/struct.html#TermContainerElement

'a', 'defs', 'glyph', 'g', 'marker', 'mask', 'missing-glyph', 'pattern', 'svg', 'switch',

fs 2015/03/13 13:59:14 Forgot to clean some of these out... Fixed.

'symbol'

CLASS_DESCRIPTIVE: [

- // http://www.w3.org/TR/SVG/intro.html#TermDescriptiveElement

+ // https://svgwg.org/svg2-draft/struct.html#TermDescriptiveElement

'desc', 'metadata', 'title'

CLASS_FILTER_PRIMITIVE: [

- // http://www.w3.org/TR/SVG/intro.html#TermFilterPrimitiveElement

+ // http://dev.w3.org/fxtf/filters/#elementdef-filter-primitive

'feBlend', 'feColorMatrix', 'feComponentTransfer', 'feComposite', 'feConvolveMatrix',

- 'feDiffuseLighting', 'feDisplacementMap', 'feFlood', 'feGaussianBlur', 'feImage',

- 'feMerge', 'feMorphology', 'feOffset', 'feSpecularLighting', 'feTile', 'feTurbulence'

+ 'feDiffuseLighting', 'feDisplacementMap', 'feDropShadow', 'feFlood', 'feGaussianBlur',

+ 'feImage', 'feMerge', 'feMorphology', 'feOffset', 'feSpecularLighting', 'feTile',

+ 'feTurbulence'

- CLASS_GRADIENT: [

- // http://www.w3.org/TR/SVG/intro.html#TermGradientElement

- 'linearGradient', 'radialGradient'

+ CLASS_GRAPHICS: [

+ // https://svgwg.org/svg2-draft/struct.html#TermGraphicsElement

+ 'audio', 'canvas', 'circle', 'ellipse', 'foreignObject', 'iframe', 'image', 'line', 'path',

+ 'polygon', 'polyline', 'rect', 'text', 'use', 'video'

- CLASS_GRAPHICS: [

- // http://www.w3.org/TR/SVG/intro.html#TermGraphicsElement

- 'circle', 'ellipse', 'image', 'line', 'path', 'polygon', 'polyline', 'rect', 'text', 'use'

+ CLASS_GRAPHICS_REFERENCING_ELEMENT: [

+ // https://svgwg.org/svg2-draft/struct.html#TermGraphicsReferencingElement

+ 'audio', 'iframe', 'image', 'use', 'video'

CLASS_LIGHT_SOURCE: [

- // http://www.w3.org/TR/SVG/intro.html#TermLightSourceElement

+ // http://dev.w3.org/fxtf/filters/#light-source

'feDistantLight', 'fePointLight', 'feSpotLight'

+ CLASS_PAINT_SERVER: [

+ // https://svgwg.org/svg2-draft/intro.html#TermPaintServerElement

+ 'solidColor', 'linearGradient', 'radialGradient', 'meshGradient', 'pattern', 'hatch'

+ ],

CLASS_SHAPE: [

- // http://www.w3.org/TR/SVG/intro.html#TermShapeElement

+ // https://svgwg.org/svg2-draft/shapes.html#TermShapeElement

'circle', 'ellipse', 'line', 'path', 'polygon', 'polyline', 'rect'

CLASS_STRUCTURAL: [

- // http://www.w3.org/TR/SVG/intro.html#TermStructuralElement

+ // https://svgwg.org/svg2-draft/intro.html#TermStructuralElement

'defs', 'g', 'svg', 'symbol', 'use'

+ CLASS_STRUCTURALLY_EXTERNAL_ELEMENTS: [

+ // https://svgwg.org/svg2-draft/intro.html#TermStructurallyExternalElement

+ 'audio', 'foreignObject', 'iframe', 'image', 'script', 'use', 'video'

+ ],

};

« no previous file with comments | « LayoutTests/svg/dom/content-model-expected.txt ('k') | no next file » | no next file with comments »