Changeset 63115 in webkit
- Timestamp:
- Jul 12, 2010 2:09:17 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r63112 r63115 1 2010-07-12 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Update HTMLTreeBuilder now that MathMLNames is always generated 6 https://bugs.webkit.org/show_bug.cgi?id=42059 7 8 We pass a bunch more tests now that our MathML code path is enabled. 9 10 * html5lib/runner-expected-html5.txt: 11 1 12 2010-07-12 Simon Fraser <simon.fraser@apple.com> 2 13 -
trunk/LayoutTests/html5lib/runner-expected-html5.txt
r63045 r63115 387 387 388 388 resources/tests9.dat: 389 1390 2391 5392 6393 7394 8395 9396 10397 11398 12399 389 13 400 390 14 … … 402 392 18 403 393 19 404 22 405 23 406 24 407 25 408 409 Test 1 of 25 in resources/tests9.dat failed. Input: 410 <!DOCTYPE html><math></math> 411 Got: 412 | <!DOCTYPE html> 413 | <html> 414 | <head> 415 | <body> 416 | <math> 417 Expected: 418 | <!DOCTYPE html> 419 | <html> 420 | <head> 421 | <body> 422 | <math math> 423 424 Test 2 of 25 in resources/tests9.dat failed. Input: 425 <!DOCTYPE html><body><math></math> 426 Got: 427 | <!DOCTYPE html> 428 | <html> 429 | <head> 430 | <body> 431 | <math> 432 Expected: 433 | <!DOCTYPE html> 434 | <html> 435 | <head> 436 | <body> 437 | <math math> 438 439 Test 5 of 25 in resources/tests9.dat failed. Input: 440 <!DOCTYPE html><body><table><math></math></table> 441 Got: 442 | <!DOCTYPE html> 443 | <html> 444 | <head> 445 | <body> 446 | <math> 447 | <table> 448 Expected: 449 | <!DOCTYPE html> 450 | <html> 451 | <head> 452 | <body> 453 | <math math> 454 | <table> 455 456 Test 6 of 25 in resources/tests9.dat failed. Input: 457 <!DOCTYPE html><body><table><math><mi>foo</mi></math></table> 458 Got: 459 | <!DOCTYPE html> 460 | <html> 461 | <head> 462 | <body> 463 | <math> 464 | <mi> 465 | "foo" 466 | <table> 467 Expected: 468 | <!DOCTYPE html> 469 | <html> 470 | <head> 471 | <body> 472 | <math math> 473 | <math mi> 474 | "foo" 475 | <table> 476 477 Test 7 of 25 in resources/tests9.dat failed. Input: 478 <!DOCTYPE html><body><table><math><mi>foo</mi><mi>bar</mi></math></table> 479 Got: 480 | <!DOCTYPE html> 481 | <html> 482 | <head> 483 | <body> 484 | <math> 485 | <mi> 486 | "foo" 487 | <mi> 488 | "bar" 489 | <table> 490 Expected: 491 | <!DOCTYPE html> 492 | <html> 493 | <head> 494 | <body> 495 | <math math> 496 | <math mi> 497 | "foo" 498 | <math mi> 499 | "bar" 500 | <table> 501 502 Test 8 of 25 in resources/tests9.dat failed. Input: 503 <!DOCTYPE html><body><table><tbody><math><mi>foo</mi><mi>bar</mi></math></tbody></table> 504 Got: 505 | <!DOCTYPE html> 506 | <html> 507 | <head> 508 | <body> 509 | <math> 510 | <mi> 511 | "foo" 512 | <mi> 513 | "bar" 514 | <table> 515 | <tbody> 516 Expected: 517 | <!DOCTYPE html> 518 | <html> 519 | <head> 520 | <body> 521 | <math math> 522 | <math mi> 523 | "foo" 524 | <math mi> 525 | "bar" 526 | <table> 527 | <tbody> 528 529 Test 9 of 25 in resources/tests9.dat failed. Input: 530 <!DOCTYPE html><body><table><tbody><tr><math><mi>foo</mi><mi>bar</mi></math></tr></tbody></table> 531 Got: 532 | <!DOCTYPE html> 533 | <html> 534 | <head> 535 | <body> 536 | <math> 537 | <mi> 538 | "foo" 539 | <mi> 540 | "bar" 541 | <table> 542 | <tbody> 543 | <tr> 544 Expected: 545 | <!DOCTYPE html> 546 | <html> 547 | <head> 548 | <body> 549 | <math math> 550 | <math mi> 551 | "foo" 552 | <math mi> 553 | "bar" 554 | <table> 555 | <tbody> 556 | <tr> 557 558 Test 10 of 25 in resources/tests9.dat failed. Input: 559 <!DOCTYPE html><body><table><tbody><tr><td><math><mi>foo</mi><mi>bar</mi></math></td></tr></tbody></table> 560 Got: 561 | <!DOCTYPE html> 562 | <html> 563 | <head> 564 | <body> 565 | <table> 566 | <tbody> 567 | <tr> 568 | <td> 569 | <math> 570 | <mi> 571 | "foo" 572 | <mi> 573 | "bar" 574 Expected: 575 | <!DOCTYPE html> 576 | <html> 577 | <head> 578 | <body> 579 | <table> 580 | <tbody> 581 | <tr> 582 | <td> 583 | <math math> 584 | <math mi> 585 | "foo" 586 | <math mi> 587 | "bar" 588 589 Test 11 of 25 in resources/tests9.dat failed. Input: 590 <!DOCTYPE html><body><table><tbody><tr><td><math><mi>foo</mi><mi>bar</mi></math><p>baz</td></tr></tbody></table> 591 Got: 592 | <!DOCTYPE html> 593 | <html> 594 | <head> 595 | <body> 596 | <table> 597 | <tbody> 598 | <tr> 599 | <td> 600 | <math> 601 | <mi> 602 | "foo" 603 | <mi> 604 | "bar" 605 | <p> 606 | "baz" 607 Expected: 608 | <!DOCTYPE html> 609 | <html> 610 | <head> 611 | <body> 612 | <table> 613 | <tbody> 614 | <tr> 615 | <td> 616 | <math math> 617 | <math mi> 618 | "foo" 619 | <math mi> 620 | "bar" 621 | <p> 622 | "baz" 623 624 Test 12 of 25 in resources/tests9.dat failed. Input: 625 <!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi></math><p>baz</caption></table> 394 395 Test 13 of 25 in resources/tests9.dat failed. Input: 396 <!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux 626 397 Got: 627 398 | <!DOCTYPE html> … … 631 402 | <table> 632 403 | <caption> 633 | <math >634 | <m i>404 | <math math> 405 | <math mi> 635 406 | "foo" 636 | <m i>407 | <math mi> 637 408 | "bar" 638 | <p> 639 | "baz" 409 | <math p> 410 | "baz" 411 | <math p> 412 | "quux" 640 413 Expected: 641 414 | <!DOCTYPE html> … … 652 425 | <p> 653 426 | "baz" 654 655 Test 13 of 25 in resources/tests9.dat failed. Input:656 <!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux657 Got:658 | <!DOCTYPE html>659 | <html>660 | <head>661 | <body>662 | <table>663 | <caption>664 | <math>665 | <mi>666 | "foo"667 | <mi>668 | "bar"669 | <p>670 | "baz"671 | <p>672 | "quux"673 Expected:674 | <!DOCTYPE html>675 | <html>676 | <head>677 | <body>678 | <table>679 | <caption>680 | <math math>681 | <math mi>682 | "foo"683 | <math mi>684 | "bar"685 | <p>686 | "baz"687 427 | <p> 688 428 | "quux" … … 691 431 <!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi>baz</table><p>quux 692 432 Got: 693 | <!DOCTYPE html>694 | <html>695 | <head>696 | <body>697 | <table>698 | <caption>699 | <math>700 | <mi>701 | "foo"702 | <mi>703 | "bar"704 | "baz"705 | <p>706 | "quux"707 Expected:708 433 | <!DOCTYPE html> 709 434 | <html> … … 718 443 | "bar" 719 444 | "baz" 445 | <math p> 446 | "quux" 447 Expected: 448 | <!DOCTYPE html> 449 | <html> 450 | <head> 451 | <body> 452 | <table> 453 | <caption> 454 | <math math> 455 | <math mi> 456 | "foo" 457 | <math mi> 458 | "bar" 459 | "baz" 720 460 | <p> 721 461 | "quux" … … 728 468 | <head> 729 469 | <body> 730 | <math >731 | <m i>732 | "foo" 733 | <m i>734 | "bar" 735 | < p>470 | <math math> 471 | <math mi> 472 | "foo" 473 | <math mi> 474 | "bar" 475 | <math p> 736 476 | "baz" 477 | <math p> 478 | "quux" 737 479 | <table> 738 480 | <colgroup> 739 | <p>740 | "quux"741 481 Expected: 742 482 | <!DOCTYPE html> … … 763 503 | <head> 764 504 | <body> 765 | <math >766 | <m i>767 | "foo" 768 | <m i>769 | "bar" 770 | < p>505 | <math math> 506 | <math mi> 507 | "foo" 508 | <math mi> 509 | "bar" 510 | <math p> 771 511 | "baz" 772 512 Expected: … … 790 530 | <head> 791 531 | <body> 792 | <math >793 | <m i>794 | "foo" 795 | <m i>796 | "bar" 797 | < p>532 | <math math> 533 | <math mi> 534 | "foo" 535 | <math mi> 536 | "bar" 537 | <math p> 798 538 | "baz" 799 539 Expected: … … 809 549 | <p> 810 550 | "baz" 811 812 Test 22 of 25 in resources/tests9.dat failed. Input:813 <!DOCTYPE html><body xlink:href=foo><math xlink:href=foo></math>814 Got:815 | <!DOCTYPE html>816 | <html>817 | <head>818 | <body>819 | xlink:href="foo"820 | <math>821 | xlink:href="foo"822 Expected:823 | <!DOCTYPE html>824 | <html>825 | <head>826 | <body>827 | xlink:href="foo"828 | <math math>829 | xlink href="foo"830 831 Test 23 of 25 in resources/tests9.dat failed. Input:832 <!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo></mi></math>833 Got:834 | <!DOCTYPE html>835 | <html>836 | <head>837 | <body>838 | xlink:href="foo"839 | xml:lang="en"840 | <math>841 | <mi>842 | xlink:href="foo"843 | xml:lang="en"844 Expected:845 | <!DOCTYPE html>846 | <html>847 | <head>848 | <body>849 | xlink:href="foo"850 | xml:lang="en"851 | <math math>852 | <math mi>853 | xlink href="foo"854 | xml lang="en"855 856 Test 24 of 25 in resources/tests9.dat failed. Input:857 <!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo /></math>858 Got:859 | <!DOCTYPE html>860 | <html>861 | <head>862 | <body>863 | xlink:href="foo"864 | xml:lang="en"865 | <math>866 | <mi>867 | xlink:href="foo"868 | xml:lang="en"869 Expected:870 | <!DOCTYPE html>871 | <html>872 | <head>873 | <body>874 | xlink:href="foo"875 | xml:lang="en"876 | <math math>877 | <math mi>878 | xlink href="foo"879 | xml lang="en"880 881 Test 25 of 25 in resources/tests9.dat failed. Input:882 <!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo />bar</math>883 Got:884 | <!DOCTYPE html>885 | <html>886 | <head>887 | <body>888 | xlink:href="foo"889 | xml:lang="en"890 | <math>891 | <mi>892 | xlink:href="foo"893 | xml:lang="en"894 | "bar"895 Expected:896 | <!DOCTYPE html>897 | <html>898 | <head>899 | <body>900 | xlink:href="foo"901 | xml:lang="en"902 | <math math>903 | <math mi>904 | xlink href="foo"905 | xml lang="en"906 | "bar"907 551 resources/tests10.dat: 908 552 13 … … 1068 712 | <p> 1069 713 | "baz" 1070 resources/tests11.dat: 1071 4 1072 8 1073 1074 Test 4 of 9 in resources/tests11.dat failed. Input: 1075 <!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> 1076 Got: 1077 | <!DOCTYPE html> 1078 | <html> 1079 | <head> 1080 | <body> 1081 | <math> 1082 | attributename="" 1083 | attributetype="" 1084 | basefrequency="" 1085 | baseprofile="" 1086 | calcmode="" 1087 | clippathunits="" 1088 | contentscripttype="" 1089 | contentstyletype="" 1090 | diffuseconstant="" 1091 | edgemode="" 1092 | externalresourcesrequired="" 1093 | filterres="" 1094 | filterunits="" 1095 | glyphref="" 1096 | gradienttransform="" 1097 | gradientunits="" 1098 | kernelmatrix="" 1099 | kernelunitlength="" 1100 | keypoints="" 1101 | keysplines="" 1102 | keytimes="" 1103 | lengthadjust="" 1104 | limitingconeangle="" 1105 | markerheight="" 1106 | markerunits="" 1107 | markerwidth="" 1108 | maskcontentunits="" 1109 | maskunits="" 1110 | numoctaves="" 1111 | pathlength="" 1112 | patterncontentunits="" 1113 | patterntransform="" 1114 | patternunits="" 1115 | pointsatx="" 1116 | pointsaty="" 1117 | pointsatz="" 1118 | preservealpha="" 1119 | preserveaspectratio="" 1120 | primitiveunits="" 1121 | refx="" 1122 | refy="" 1123 | repeatcount="" 1124 | repeatdur="" 1125 | requiredextensions="" 1126 | requiredfeatures="" 1127 | specularconstant="" 1128 | specularexponent="" 1129 | spreadmethod="" 1130 | startoffset="" 1131 | stddeviation="" 1132 | stitchtiles="" 1133 | surfacescale="" 1134 | systemlanguage="" 1135 | tablevalues="" 1136 | targetx="" 1137 | targety="" 1138 | textlength="" 1139 | viewbox="" 1140 | viewtarget="" 1141 | xchannelselector="" 1142 | ychannelselector="" 1143 | zoomandpan="" 1144 Expected: 1145 | <!DOCTYPE html> 1146 | <html> 1147 | <head> 1148 | <body> 1149 | <math math> 1150 | attributename="" 1151 | attributetype="" 1152 | basefrequency="" 1153 | baseprofile="" 1154 | calcmode="" 1155 | clippathunits="" 1156 | contentscripttype="" 1157 | contentstyletype="" 1158 | diffuseconstant="" 1159 | edgemode="" 1160 | externalresourcesrequired="" 1161 | filterres="" 1162 | filterunits="" 1163 | glyphref="" 1164 | gradienttransform="" 1165 | gradientunits="" 1166 | kernelmatrix="" 1167 | kernelunitlength="" 1168 | keypoints="" 1169 | keysplines="" 1170 | keytimes="" 1171 | lengthadjust="" 1172 | limitingconeangle="" 1173 | markerheight="" 1174 | markerunits="" 1175 | markerwidth="" 1176 | maskcontentunits="" 1177 | maskunits="" 1178 | numoctaves="" 1179 | pathlength="" 1180 | patterncontentunits="" 1181 | patterntransform="" 1182 | patternunits="" 1183 | pointsatx="" 1184 | pointsaty="" 1185 | pointsatz="" 1186 | preservealpha="" 1187 | preserveaspectratio="" 1188 | primitiveunits="" 1189 | refx="" 1190 | refy="" 1191 | repeatcount="" 1192 | repeatdur="" 1193 | requiredextensions="" 1194 | requiredfeatures="" 1195 | specularconstant="" 1196 | specularexponent="" 1197 | spreadmethod="" 1198 | startoffset="" 1199 | stddeviation="" 1200 | stitchtiles="" 1201 | surfacescale="" 1202 | systemlanguage="" 1203 | tablevalues="" 1204 | targetx="" 1205 | targety="" 1206 | textlength="" 1207 | viewbox="" 1208 | viewtarget="" 1209 | xchannelselector="" 1210 | ychannelselector="" 1211 | zoomandpan="" 1212 1213 Test 8 of 9 in resources/tests11.dat failed. Input: 1214 <!DOCTYPE html><body><math><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 /></math> 1215 Got: 1216 | <!DOCTYPE html> 1217 | <html> 1218 | <head> 1219 | <body> 1220 | <math> 1221 | <altglyph> 1222 | <altglyphdef> 1223 | <altglyphitem> 1224 | <animatecolor> 1225 | <animatemotion> 1226 | <animatetransform> 1227 | <clippath> 1228 | <feblend> 1229 | <fecolormatrix> 1230 | <fecomponenttransfer> 1231 | <fecomposite> 1232 | <feconvolvematrix> 1233 | <fediffuselighting> 1234 | <fedisplacementmap> 1235 | <fedistantlight> 1236 | <feflood> 1237 | <fefunca> 1238 | <fefuncb> 1239 | <fefuncg> 1240 | <fefuncr> 1241 | <fegaussianblur> 1242 | <feimage> 1243 | <femerge> 1244 | <femergenode> 1245 | <femorphology> 1246 | <feoffset> 1247 | <fepointlight> 1248 | <fespecularlighting> 1249 | <fespotlight> 1250 | <fetile> 1251 | <feturbulence> 1252 | <foreignobject> 1253 | <glyphref> 1254 | <lineargradient> 1255 | <radialgradient> 1256 | <textpath> 1257 Expected: 1258 | <!DOCTYPE html> 1259 | <html> 1260 | <head> 1261 | <body> 1262 | <math math> 1263 | <math altglyph> 1264 | <math altglyphdef> 1265 | <math altglyphitem> 1266 | <math animatecolor> 1267 | <math animatemotion> 1268 | <math animatetransform> 1269 | <math clippath> 1270 | <math feblend> 1271 | <math fecolormatrix> 1272 | <math fecomponenttransfer> 1273 | <math fecomposite> 1274 | <math feconvolvematrix> 1275 | <math fediffuselighting> 1276 | <math fedisplacementmap> 1277 | <math fedistantlight> 1278 | <math feflood> 1279 | <math fefunca> 1280 | <math fefuncb> 1281 | <math fefuncg> 1282 | <math fefuncr> 1283 | <math fegaussianblur> 1284 | <math feimage> 1285 | <math femerge> 1286 | <math femergenode> 1287 | <math femorphology> 1288 | <math feoffset> 1289 | <math fepointlight> 1290 | <math fespecularlighting> 1291 | <math fespotlight> 1292 | <math fetile> 1293 | <math feturbulence> 1294 | <math foreignobject> 1295 | <math glyphref> 1296 | <math lineargradient> 1297 | <math radialgradient> 1298 | <math textpath> 714 resources/tests11.dat: PASS 715 1299 716 resources/tests12.dat: 1300 717 1 … … 1310 727 | <p> 1311 728 | "foo" 1312 | <math >1313 | <m text>1314 | < i>729 | <math math> 730 | <math mtext> 731 | <math i> 1315 732 | "baz" 1316 | < annotation-xml>1317 | < svgsvg>1318 | < svgdesc>1319 | < svgb>733 | <math annotation-xml> 734 | <math svg> 735 | <math desc> 736 | <math b> 1320 737 | "eggs" 1321 | < svgg>1322 | < svg foreignObject>1323 | < svgp>738 | <math g> 739 | <math foreignobject> 740 | <math p> 1324 741 | "spam" 1325 | < svgtable>1326 | < svgtr>1327 | < svgtd>1328 | < svgimg>1329 | < svgg>742 | <math table> 743 | <math tr> 744 | <math td> 745 | <math img> 746 | <math g> 1330 747 | "quux" 1331 748 | "bar" … … 1367 784 | <body> 1368 785 | "foo" 1369 | <math >1370 | <m text>1371 | < i>786 | <math math> 787 | <math mtext> 788 | <math i> 1372 789 | "baz" 1373 | < annotation-xml>1374 | < svgsvg>1375 | < svgdesc>1376 | < svgb>790 | <math annotation-xml> 791 | <math svg> 792 | <math desc> 793 | <math b> 1377 794 | "eggs" 1378 | < svgg>1379 | < svg foreignObject>1380 | < svgp>795 | <math g> 796 | <math foreignobject> 797 | <math p> 1381 798 | "spam" 1382 | < svgtable>1383 | < svgtr>1384 | < svgtd>1385 | < svgimg>1386 | < svgg>799 | <math table> 800 | <math tr> 801 | <math td> 802 | <math img> 803 | <math g> 1387 804 | "quux" 1388 805 | "bar" -
trunk/WebCore/ChangeLog
r63112 r63115 1 2010-07-12 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Update HTMLTreeBuilder now that MathMLNames is always generated 6 https://bugs.webkit.org/show_bug.cgi?id=42059 7 8 Fix the HTMLTreeBuilder MathML code path to compile and remove 9 the MathML and SVG guards now that SVGNames and MathMLNames are 10 always compiled into ever port after: 11 https://bugs.webkit.org/show_bug.cgi?id=42050 12 13 This fixed a whole bunch of libhtml5 tests now that we have the 14 mathml code paths enabled. 15 16 * html/HTMLTreeBuilder.cpp: 17 (WebCore::HTMLTreeBuilder::processStartTagForInBody): 18 (WebCore::HTMLTreeBuilder::processStartTag): 19 (WebCore::HTMLTreeBuilder::resetInsertionModeAppropriately): 20 (WebCore::HTMLTreeBuilder::processEndTag): 21 * page/Frame.cpp: 22 (WebCore::Frame::Frame): 23 - Always init SVGNames and MathML names. 24 1 25 2010-07-12 Simon Fraser <simon.fraser@apple.com> 2 26 -
trunk/WebCore/html/HTMLTreeBuilder.cpp
r63046 r63115 42 42 #include "LegacyHTMLTreeBuilder.h" 43 43 #include "LocalizedStrings.h" 44 #if ENABLE(MATHML)45 44 #include "MathMLNames.h" 46 #endif47 45 #include "NotImplemented.h" 48 #if ENABLE(SVG)49 46 #include "SVGNames.h" 50 #endif51 47 #include "ScriptController.h" 52 48 #include "Settings.h" … … 260 256 || tagName == buttonTag 261 257 || tagName == captionTag 262 #if ENABLE(SVG_FOREIGN_OBJECT)263 258 || tagName == SVGNames::foreignObjectTag 264 #endif265 259 || tagName == htmlTag 266 260 || tagName == marqueeTag … … 677 671 } 678 672 679 #if ENABLE(SVG)680 681 // FIXME: This is a hack until we can fix SVGNames to always generate all names.682 QualifiedName svgTagNameFor(const AtomicString& localName)683 {684 return QualifiedName(nullAtom, localName, SVGNames::svgNamespaceURI);685 }686 687 673 void addName(PrefixedNameToQualifiedNameMap* map, const QualifiedName& name) 688 674 { … … 698 684 QualifiedName** svgTags = SVGNames::getSVGTags(&length); 699 685 mapLoweredLocalNameToName(caseMap, svgTags, length); 700 // FIXME: This is a hack around the fact that SVGNames does not701 // currently include all values HTML5 expects it to.702 addName(caseMap, svgTagNameFor("altGlyphDef"));703 addName(caseMap, svgTagNameFor("altGlyphItem"));704 addName(caseMap, svgTagNameFor("glyphRef"));705 686 } 706 687 … … 733 714 } 734 715 735 #endif736 737 #if ENABLE(MATHML)738 716 void adjustMathMLAttributes(AtomicHTMLToken&) 739 717 { 740 718 notImplemented(); 741 719 } 742 #endif743 720 744 721 void addNamesWithPrefix(PrefixedNameToQualifiedNameMap* map, const AtomicString& prefix, QualifiedName** names, size_t length) … … 1042 1019 return; 1043 1020 } 1044 // FIXME: These should not need #if guards.1045 #if ENABLE(MATHML)1046 1021 if (token.name() == MathMLNames::mathTag.localName()) { 1047 1022 m_tree.reconstructTheActiveFormattingElements(); … … 1055 1030 return; 1056 1031 } 1057 #endif1058 #if ENABLE(SVG)1059 1032 if (token.name() == SVGNames::svgTag.localName()) { 1060 1033 m_tree.reconstructTheActiveFormattingElements(); … … 1068 1041 return; 1069 1042 } 1070 #endif1071 1043 if (isCaptionColOrColgroupTag(token.name()) 1072 1044 || token.name() == frameTag … … 1494 1466 notImplemented(); 1495 1467 const AtomicString& currentNamespace = m_tree.currentElement()->namespaceURI(); 1496 #if ENABLE(MATHML)1497 1468 if (currentNamespace == MathMLNames::mathmlNamespaceURI) 1498 1469 adjustMathMLAttributes(token); 1499 #endif1500 #if ENABLE(SVG)1501 1470 if (currentNamespace == SVGNames::svgNamespaceURI) { 1502 1471 adjustSVGTagNameCase(token); 1503 1472 adjustSVGAttributes(token); 1504 1473 } 1505 #endif1506 1474 adjustForeignAttributes(token); 1507 1475 m_tree.insertForeignElement(token, currentNamespace); … … 1745 1713 return setInsertionModeAndEnd(BeforeHeadMode, foreign); 1746 1714 } 1747 if (false 1748 #if ENABLE(SVG) 1749 || node->namespaceURI() == SVGNames::svgNamespaceURI 1750 #endif 1751 #if ENABLE(MATHML) 1752 || node->namespaceURI() == MathMLNames::mathmlNamespaceURI 1753 #endif 1754 ) 1715 if (node->namespaceURI() == SVGNames::svgNamespaceURI 1716 || node->namespaceURI() == MathMLNames::mathmlNamespaceURI) 1755 1717 foreign = true; 1756 1718 if (last) { … … 2297 2259 break; 2298 2260 case InForeignContentMode: 2299 #if ENABLE(SVG)2300 2261 if (token.name() == SVGNames::scriptTag && m_tree.currentElement()->hasTagName(SVGNames::scriptTag)) { 2301 2262 notImplemented(); 2302 2263 return; 2303 2264 } 2304 #endif2305 2265 if (m_tree.currentElement()->namespaceURI() != xhtmlNamespaceURI) { 2306 2266 // FIXME: This code just wants an Element* iterator, instead of an ElementRecord* -
trunk/WebCore/page/Frame.cpp
r63022 r63115 96 96 #endif 97 97 98 #if ENABLE(MATHML)99 98 #include "MathMLNames.h" 100 #endif 99 #include "SVGNames.h" 100 #include "XLinkNames.h" 101 101 102 102 #if ENABLE(SVG) 103 103 #include "SVGDocument.h" 104 104 #include "SVGDocumentExtensions.h" 105 #include "SVGNames.h"106 #include "XLinkNames.h"107 105 #endif 108 106 … … 158 156 QualifiedName::init(); 159 157 MediaFeatureNames::init(); 160 161 #if ENABLE(SVG)162 158 SVGNames::init(); 163 159 XLinkNames::init(); 164 #endif 160 MathMLNames::init(); 161 XMLNSNames::init(); 162 XMLNames::init(); 165 163 166 164 #if ENABLE(WML) 167 165 WMLNames::init(); 168 166 #endif 169 170 #if ENABLE(MATHML)171 MathMLNames::init();172 #endif173 174 XMLNSNames::init();175 XMLNames::init();176 167 177 168 if (!ownerElement) {
Note: See TracChangeset
for help on using the changeset viewer.