Skip to content

Commit 193fa43

Browse files
gsneddersgsnedders
committed
Merge in Blink changes.
This takes us up to c62ef30ff36a05ef35a7c9eb7fb81fe76c5c2b9c in the Blink repo. Conflicts: tree-construction/adoption01.dat tree-construction/domjs-unsafe.dat tree-construction/template.dat tree-construction/tests11.dat tree-construction/tests19.dat
1 parent 56c435f commit 193fa43

File tree

8 files changed

+254
-19
lines changed

8 files changed

+254
-19
lines changed

‎tree-construction/entities02.dat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,13 @@
281281
| <body>
282282
| <div>
283283
| "ZZ&prod=23"
284+
285+
#data
286+
<div>ZZ&AElig=</div>
287+
#errors
288+
#document
289+
| <html>
290+
| <head>
291+
| <body>
292+
| <div>
293+
| "ZZÆ="

‎tree-construction/math.dat

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
#data
2+
<math><tr><td><mo><tr>
3+
#errors
4+
#document-fragment
5+
td
6+
#document
7+
| <math math>
8+
| <math tr>
9+
| <math td>
10+
| <math mo>
11+
12+
#data
13+
<math><tr><td><mo><tr>
14+
#errors
15+
#document-fragment
16+
tr
17+
#document
18+
| <math math>
19+
| <math tr>
20+
| <math td>
21+
| <math mo>
22+
23+
#data
24+
<math><thead><mo><tbody>
25+
#errors
26+
#document-fragment
27+
thead
28+
#document
29+
| <math math>
30+
| <math thead>
31+
| <math mo>
32+
33+
#data
34+
<math><tfoot><mo><tbody>
35+
#errors
36+
#document-fragment
37+
tfoot
38+
#document
39+
| <math math>
40+
| <math tfoot>
41+
| <math mo>
42+
43+
#data
44+
<math><tbody><mo><tfoot>
45+
#errors
46+
#document-fragment
47+
tbody
48+
#document
49+
| <math math>
50+
| <math tbody>
51+
| <math mo>
52+
53+
#data
54+
<math><tbody><mo></table>
55+
#errors
56+
#document-fragment
57+
tbody
58+
#document
59+
| <math math>
60+
| <math tbody>
61+
| <math mo>
62+
63+
#data
64+
<math><thead><mo></table>
65+
#errors
66+
#document-fragment
67+
tbody
68+
#document
69+
| <math math>
70+
| <math thead>
71+
| <math mo>
72+
73+
#data
74+
<math><tfoot><mo></table>
75+
#errors
76+
#document-fragment
77+
tbody
78+
#document
79+
| <math math>
80+
| <math tfoot>
81+
| <math mo>

‎tree-construction/namespace-sensitivity.dat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#data
2+
<body><table><tr><td><svg><td><foreignObject><span></td>Foo
3+
#errors
4+
#document
5+
| <html>
6+
| <head>
7+
| <body>
8+
| "Foo"
9+
| <table>
10+
| <tbody>
11+
| <tr>
12+
| <td>
13+
| <svg svg>
14+
| <svg td>
15+
| <svg foreignObject>
16+
| <span>

‎tree-construction/template.dat

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,3 +1589,16 @@ eof table
15891589
| content
15901590
| <table>
15911591
| <script>
1592+
1593+
#data
1594+
<template><a><table><a>
1595+
#errors
1596+
#document
1597+
| <html>
1598+
| <head>
1599+
| <template>
1600+
| content
1601+
| <a>
1602+
| <a>
1603+
| <table>
1604+
| <body>

‎tree-construction/tests11.dat

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#data
2-
<!DOCTYPE html><body><svg attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' contentScriptType='' contentStyleType='' diffuseConstant='' edgeMode='' externalResourcesRequired='' filterRes='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelector='' yChannelSelector='' zoomAndPan=''></svg>
2+
<!DOCTYPE html><body><svg attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' diffuseConstant='' edgeMode='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelector='' yChannelSelector='' zoomAndPan=''></svg>
33
#errors
44
#document
55
| <!DOCTYPE html>
@@ -13,13 +13,9 @@
1313
| baseProfile=""
1414
| calcMode=""
1515
| clipPathUnits=""
16-
| contentscripttype=""
17-
| contentstyletype=""
1816
| diffuseConstant=""
1917
| edgeMode=""
20-
| externalresourcesrequired=""
2118
| filterUnits=""
22-
| filterres=""
2319
| glyphRef=""
2420
| gradientTransform=""
2521
| gradientUnits=""
@@ -71,7 +67,7 @@
7167
| zoomAndPan=""
7268

7369
#data
74-
<!DOCTYPE html><BODY><SVG ATTRIBUTENAME='' ATTRIBUTETYPE='' BASEFREQUENCY='' BASEPROFILE='' CALCMODE='' CLIPPATHUNITS='' CONTENTSCRIPTTYPE='' CONTENTSTYLETYPE='' DIFFUSECONSTANT='' EDGEMODE='' EXTERNALRESOURCESREQUIRED='' FILTERRES='' FILTERUNITS='' GLYPHREF='' GRADIENTTRANSFORM='' GRADIENTUNITS='' KERNELMATRIX='' KERNELUNITLENGTH='' KEYPOINTS='' KEYSPLINES='' KEYTIMES='' LENGTHADJUST='' LIMITINGCONEANGLE='' MARKERHEIGHT='' MARKERUNITS='' MARKERWIDTH='' MASKCONTENTUNITS='' MASKUNITS='' NUMOCTAVES='' PATHLENGTH='' PATTERNCONTENTUNITS='' PATTERNTRANSFORM='' PATTERNUNITS='' POINTSATX='' POINTSATY='' POINTSATZ='' PRESERVEALPHA='' PRESERVEASPECTRATIO='' PRIMITIVEUNITS='' REFX='' REFY='' REPEATCOUNT='' REPEATDUR='' REQUIREDEXTENSIONS='' REQUIREDFEATURES='' SPECULARCONSTANT='' SPECULAREXPONENT='' SPREADMETHOD='' STARTOFFSET='' STDDEVIATION='' STITCHTILES='' SURFACESCALE='' SYSTEMLANGUAGE='' TABLEVALUES='' TARGETX='' TARGETY='' TEXTLENGTH='' VIEWBOX='' VIEWTARGET='' XCHANNELSELECTOR='' YCHANNELSELECTOR='' ZOOMANDPAN=''></SVG>
70+
<!DOCTYPE html><BODY><SVG ATTRIBUTENAME='' ATTRIBUTETYPE='' BASEFREQUENCY='' BASEPROFILE='' CALCMODE='' CLIPPATHUNITS='' DIFFUSECONSTANT='' EDGEMODE='' FILTERUNITS='' GLYPHREF='' GRADIENTTRANSFORM='' GRADIENTUNITS='' KERNELMATRIX='' KERNELUNITLENGTH='' KEYPOINTS='' KEYSPLINES='' KEYTIMES='' LENGTHADJUST='' LIMITINGCONEANGLE='' MARKERHEIGHT='' MARKERUNITS='' MARKERWIDTH='' MASKCONTENTUNITS='' MASKUNITS='' NUMOCTAVES='' PATHLENGTH='' PATTERNCONTENTUNITS='' PATTERNTRANSFORM='' PATTERNUNITS='' POINTSATX='' POINTSATY='' POINTSATZ='' PRESERVEALPHA='' PRESERVEASPECTRATIO='' PRIMITIVEUNITS='' REFX='' REFY='' REPEATCOUNT='' REPEATDUR='' REQUIREDEXTENSIONS='' REQUIREDFEATURES='' SPECULARCONSTANT='' SPECULAREXPONENT='' SPREADMETHOD='' STARTOFFSET='' STDDEVIATION='' STITCHTILES='' SURFACESCALE='' SYSTEMLANGUAGE='' TABLEVALUES='' TARGETX='' TARGETY='' TEXTLENGTH='' VIEWBOX='' VIEWTARGET='' XCHANNELSELECTOR='' YCHANNELSELECTOR='' ZOOMANDPAN=''></SVG>
7571
#errors
7672
#document
7773
| <!DOCTYPE html>
@@ -85,13 +81,9 @@
8581
| baseProfile=""
8682
| calcMode=""
8783
| clipPathUnits=""
88-
| contentscripttype=""
89-
| contentstyletype=""
9084
| diffuseConstant=""
9185
| edgeMode=""
92-
| externalresourcesrequired=""
9386
| filterUnits=""
94-
| filterres=""
9587
| glyphRef=""
9688
| gradientTransform=""
9789
| gradientUnits=""
@@ -143,7 +135,7 @@
143135
| zoomAndPan=""
144136

145137
#data
146-
<!DOCTYPE html><body><svg attributename='' attributetype='' basefrequency='' baseprofile='' calcmode='' clippathunits='' contentscripttype='' contentstyletype='' diffuseconstant='' edgemode='' externalresourcesrequired='' filterres='' filterunits='' glyphref='' gradienttransform='' gradientunits='' kernelmatrix='' kernelunitlength='' keypoints='' keysplines='' keytimes='' lengthadjust='' limitingconeangle='' markerheight='' markerunits='' markerwidth='' maskcontentunits='' maskunits='' numoctaves='' pathlength='' patterncontentunits='' patterntransform='' patternunits='' pointsatx='' pointsaty='' pointsatz='' preservealpha='' preserveaspectratio='' primitiveunits='' refx='' refy='' repeatcount='' repeatdur='' requiredextensions='' requiredfeatures='' specularconstant='' specularexponent='' spreadmethod='' startoffset='' stddeviation='' stitchtiles='' surfacescale='' systemlanguage='' tablevalues='' targetx='' targety='' textlength='' viewbox='' viewtarget='' xchannelselector='' ychannelselector='' zoomandpan=''></svg>
138+
<!DOCTYPE html><body><svg attributename='' attributetype='' basefrequency='' baseprofile='' calcmode='' clippathunits='' diffuseconstant='' edgemode='' filterunits='' glyphref='' gradienttransform='' gradientunits='' kernelmatrix='' kernelunitlength='' keypoints='' keysplines='' keytimes='' lengthadjust='' limitingconeangle='' markerheight='' markerunits='' markerwidth='' maskcontentunits='' maskunits='' numoctaves='' pathlength='' patterncontentunits='' patterntransform='' patternunits='' pointsatx='' pointsaty='' pointsatz='' preservealpha='' preserveaspectratio='' primitiveunits='' refx='' refy='' repeatcount='' repeatdur='' requiredextensions='' requiredfeatures='' specularconstant='' specularexponent='' spreadmethod='' startoffset='' stddeviation='' stitchtiles='' surfacescale='' systemlanguage='' tablevalues='' targetx='' targety='' textlength='' viewbox='' viewtarget='' xchannelselector='' ychannelselector='' zoomandpan=''></svg>
147139
#errors
148140
#document
149141
| <!DOCTYPE html>
@@ -157,11 +149,8 @@
157149
| baseProfile=""
158150
| calcMode=""
159151
| clipPathUnits=""
160-
| contentscripttype=""
161-
| contentstyletype=""
162152
| diffuseConstant=""
163153
| edgeMode=""
164-
| externalresourcesrequired=""
165154
| filterUnits=""
166155
| filterres=""
167156
| glyphRef=""
@@ -215,7 +204,7 @@
215204
| zoomAndPan=""
216205

217206
#data
218-
<!DOCTYPE html><body><math attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' contentScriptType='' contentStyleType='' diffuseConstant='' edgeMode='' externalResourcesRequired='' filterRes='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelector='' yChannelSelector='' zoomAndPan=''></math>
207+
<!DOCTYPE html><body><math attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' diffuseConstant='' edgeMode='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelector='' yChannelSelector='' zoomAndPan=''></math>
219208
#errors
220209
#document
221210
| <!DOCTYPE html>
@@ -229,12 +218,8 @@
229218
| baseprofile=""
230219
| calcmode=""
231220
| clippathunits=""
232-
| contentscripttype=""
233-
| contentstyletype=""
234221
| diffuseconstant=""
235222
| edgemode=""
236-
| externalresourcesrequired=""
237-
| filterres=""
238223
| filterunits=""
239224
| glyphref=""
240225
| gradienttransform=""

‎tree-construction/tests7.dat

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,20 @@ unexpected text in table
135135
| <p>
136136
| "X"
137137

138+
#data
139+
<!doctype html><p><object type="application/x-non-existant-plugin"><p>X</p></object>
140+
#errors
141+
#document
142+
| <!DOCTYPE html>
143+
| <html>
144+
| <head>
145+
| <body>
146+
| <p>
147+
| <object>
148+
| type="application/x-non-existant-plugin"
149+
| <p>
150+
| "X"
151+
138152
#data
139153
<!doctype html><listing>
140154
X</listing>

‎tree-construction/webkit01.dat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,22 @@ console.log("FOO<span>BAR</span>BAZ");
650650
| <em>
651651
| <desc>
652652

653+
#data
654+
<table><tr><td><svg><desc><td></desc><circle>
655+
#errors
656+
#document
657+
| <html>
658+
| <head>
659+
| <body>
660+
| <table>
661+
| <tbody>
662+
| <tr>
663+
| <td>
664+
| <svg svg>
665+
| <svg desc>
666+
| <td>
667+
| <circle>
668+
653669
#data
654670
<svg><tfoot></mi><td>
655671
#errors

‎tree-construction/webkit02.dat

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,103 @@
132132
| <tr>
133133
| <td>
134134
| "A"
135+
136+
#data
137+
<legend>test</legend>
138+
#errors
139+
#document
140+
| <html>
141+
| <head>
142+
| <body>
143+
| <legend>
144+
| "test"
145+
146+
#data
147+
<table><input>
148+
#errors
149+
#document
150+
| <html>
151+
| <head>
152+
| <body>
153+
| <input>
154+
| <table>
155+
156+
#data
157+
<b><em><foo><foob><foob><foob><foob><fooc><fooc><fooc><fooc><food><aside></b></em>
158+
#errors
159+
#document-fragment
160+
div
161+
#document
162+
| <b>
163+
| <em>
164+
| <foo>
165+
| <foob>
166+
| <foob>
167+
| <foob>
168+
| <foob>
169+
| <fooc>
170+
| <fooc>
171+
| <fooc>
172+
| <fooc>
173+
| <food>
174+
| <aside>
175+
| <b>
176+
177+
#data
178+
<isindex action="x">
179+
#errors
180+
#document-fragment
181+
table
182+
#document
183+
| <form>
184+
| action="x"
185+
| <hr>
186+
| <label>
187+
| "This is a searchable index. Enter search keywords: "
188+
| <input>
189+
| name="isindex"
190+
| <hr>
191+
192+
#data
193+
<option><XH<optgroup></optgroup>
194+
#errors
195+
#document-fragment
196+
select
197+
#document
198+
| <option>
199+
200+
#data
201+
<svg><foreignObject><div>foo</div><plaintext></foreignObject></svg><div>bar</div>
202+
#errors
203+
#document
204+
| <html>
205+
| <head>
206+
| <body>
207+
| <svg svg>
208+
| <svg foreignObject>
209+
| <div>
210+
| "foo"
211+
| <plaintext>
212+
| "</foreignObject></svg><div>bar</div>"
213+
214+
#data
215+
<svg><foreignObject></foreignObject><title></svg>foo
216+
#errors
217+
#document
218+
| <html>
219+
| <head>
220+
| <body>
221+
| <svg svg>
222+
| <svg foreignObject>
223+
| <svg title>
224+
| "foo"
225+
226+
#data
227+
</foreignObject><plaintext><div>foo</div>
228+
#errors
229+
#document
230+
| <html>
231+
| <head>
232+
| <body>
233+
| <plaintext>
234+
| "<div>foo</div>"

0 commit comments

Comments
 (0)