Changeset 91331 in webkit
- Timestamp:
- Jul 19, 2011 7:48:33 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 9 added
- 23 edited
-
LayoutTests/ChangeLog (modified) (1 diff)
-
LayoutTests/platform/chromium-linux/svg/W3C-SVG-1.1/text-altglyph-01-b-expected.png (modified) (previous)
-
Source/WebCore/CMakeLists.txt (modified) (4 diffs)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/CodeGenerators.pri (modified) (2 diffs)
-
Source/WebCore/DerivedSources.cpp (modified) (2 diffs)
-
Source/WebCore/DerivedSources.make (modified) (2 diffs)
-
Source/WebCore/GNUmakefile.list.am (modified) (4 diffs)
-
Source/WebCore/WebCore.exp.in (modified) (2 diffs)
-
Source/WebCore/WebCore.gypi (modified) (4 diffs)
-
Source/WebCore/WebCore.pro (modified) (4 diffs)
-
Source/WebCore/WebCore.vcproj/WebCore.vcproj (modified) (5 diffs)
-
Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (17 diffs)
-
Source/WebCore/bindings/objc/DOM.mm (modified) (2 diffs)
-
Source/WebCore/bindings/objc/DOMSVG.h (modified) (2 diffs)
-
Source/WebCore/page/DOMWindow.idl (modified) (2 diffs)
-
Source/WebCore/svg/SVGAllInOne.cpp (modified) (2 diffs)
-
Source/WebCore/svg/SVGAltGlyphDefElement.cpp (added)
-
Source/WebCore/svg/SVGAltGlyphDefElement.h (added)
-
Source/WebCore/svg/SVGAltGlyphDefElement.idl (added)
-
Source/WebCore/svg/SVGAltGlyphElement.cpp (modified) (3 diffs)
-
Source/WebCore/svg/SVGAltGlyphElement.h (modified) (2 diffs)
-
Source/WebCore/svg/SVGAltGlyphItemElement.cpp (added)
-
Source/WebCore/svg/SVGAltGlyphItemElement.h (added)
-
Source/WebCore/svg/SVGAltGlyphItemElement.idl (added)
-
Source/WebCore/svg/SVGFontData.cpp (modified) (3 diffs)
-
Source/WebCore/svg/SVGGlyphRefElement.cpp (added)
-
Source/WebCore/svg/SVGGlyphRefElement.h (added)
-
Source/WebCore/svg/SVGGlyphRefElement.idl (added)
-
Source/WebCore/svg/svgtags.in (modified) (2 diffs)
-
Source/WebKit/mac/ChangeLog (modified) (1 diff)
-
Source/WebKit/mac/MigrateHeaders.make (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r91329 r91331 1 2011-07-19 Leo Yang <leoyang.webkit@gmail.com> 2 3 SVG: Missing implementation of <altGlyphDef>, <altGlyphItem> and <glyphRef> 4 https://bugs.webkit.org/show_bug.cgi?id=60850 5 6 Reviewed by Nikolas Zimmermann. 7 8 SVG spec: http://www.w3.org/TR/SVG/text.html#AlternateGlyphDefinitions. 9 This patch is to implement SVG <altGlyphDef>, <altGlyphItem> and <glyphRef> 10 elements for alternative glyph features. 11 12 Updated test expectation. 13 14 * platform/chromium-linux/svg/W3C-SVG-1.1/text-altglyph-01-b-expected.png: 15 1 16 2011-07-19 Ryosuke Niwa <rniwa@webkit.org> 2 17 -
trunk/Source/WebCore/CMakeLists.txt
r91250 r91331 1663 1663 svg/ColorDistance.cpp 1664 1664 svg/SVGAElement.cpp 1665 svg/SVGAltGlyphDefElement.cpp 1665 1666 svg/SVGAltGlyphElement.cpp 1667 svg/SVGAltGlyphItemElement.cpp 1666 1668 svg/SVGAngle.cpp 1667 1669 svg/SVGAnimateColorElement.cpp … … 1738 1740 svg/SVGGElement.cpp 1739 1741 svg/SVGGlyphElement.cpp 1742 svg/SVGGlyphRefElement.cpp 1740 1743 svg/SVGGradientElement.cpp 1741 1744 svg/SVGHKernElement.cpp … … 1821 1824 LIST(APPEND WebCore_IDL_FILES 1822 1825 svg/SVGAElement.idl 1826 svg/SVGAltGlyphDefElement.idl 1823 1827 svg/SVGAltGlyphElement.idl 1828 svg/SVGAltGlyphItemElement.idl 1824 1829 svg/SVGAngle.idl 1825 1830 svg/SVGAnimateColorElement.idl … … 1888 1893 svg/SVGGElement.idl 1889 1894 svg/SVGGlyphElement.idl 1895 svg/SVGGlyphRefElement.idl 1890 1896 svg/SVGGradientElement.idl 1891 1897 svg/SVGHKernElement.idl -
trunk/Source/WebCore/ChangeLog
r91325 r91331 1 2011-07-19 Leo Yang <leoyang.webkit@gmail.com> 2 3 SVG: Missing implementation of <altGlyphDef>, <altGlyphItem> and <glyphRef> 4 https://bugs.webkit.org/show_bug.cgi?id=60850 5 6 Reviewed by Nikolas Zimmermann. 7 8 SVG spec: http://www.w3.org/TR/SVG/text.html#AlternateGlyphDefinitions. 9 This patch is to implement SVG <altGlyphDef>, <altGlyphItem> and <glyphRef> 10 elements for alternative glyph features. 11 12 NOTE: x, y, dx, dy, format and glyphRef attributes on <glyphRef> are not 13 honored yet, so neither are the reaction of dynamic change of them. They 14 will be honored in separated patches. 15 16 Test: svg/W3C-SVG-1.1/text-altglyph-01-b.svg 17 With this patch this test works as expected. 18 19 * CMakeLists.txt: 20 * CodeGenerators.pri: 21 * DerivedSources.cpp: 22 * DerivedSources.make: 23 * GNUmakefile.list.am: 24 * WebCore.exp.in: 25 * WebCore.gypi: 26 * WebCore.pro: 27 * WebCore.vcproj/WebCore.vcproj: 28 * WebCore.xcodeproj/project.pbxproj: 29 * bindings/objc/DOM.mm: 30 (WebCore::createElementClassMap): 31 * bindings/objc/DOMSVG.h: 32 * page/DOMWindow.idl: 33 * svg/SVGAllInOne.cpp: 34 * svg/SVGAltGlyphDefElement.cpp: Added. 35 (WebCore::SVGAltGlyphDefElement::SVGAltGlyphDefElement): 36 (WebCore::SVGAltGlyphDefElement::create): 37 (WebCore::SVGAltGlyphDefElement::hasValidGlyphElements): 38 * svg/SVGAltGlyphDefElement.h: Added. 39 * svg/SVGAltGlyphDefElement.idl: Added. 40 * svg/SVGAltGlyphElement.cpp: 41 (WebCore::SVGAltGlyphElement::hasValidGlyphElements): 42 * svg/SVGAltGlyphElement.h: 43 * svg/SVGAltGlyphItemElement.cpp: Added. 44 (WebCore::SVGAltGlyphItemElement::SVGAltGlyphItemElement): 45 (WebCore::SVGAltGlyphItemElement::create): 46 (WebCore::SVGAltGlyphItemElement::hasValidGlyphElements): 47 * svg/SVGAltGlyphItemElement.h: Added. 48 * svg/SVGAltGlyphItemElement.idl: Added. 49 * svg/SVGFontData.cpp: 50 (WebCore::SVGFontData::applySVGGlyphSelection): 51 * svg/SVGGlyphRefElement.cpp: Added. 52 (WebCore::SVGGlyphRefElement::SVGGlyphRefElement): 53 (WebCore::SVGGlyphRefElement::create): 54 (WebCore::SVGGlyphRefElement::hasValidGlyphElement): 55 (WebCore::SVGGlyphRefElement::parseMappedAttribute): 56 (WebCore::SVGGlyphRefElement::glyphRef): 57 (WebCore::SVGGlyphRefElement::setGlyphRef): 58 (WebCore::SVGGlyphRefElement::setX): 59 (WebCore::SVGGlyphRefElement::setY): 60 (WebCore::SVGGlyphRefElement::setDx): 61 (WebCore::SVGGlyphRefElement::setDy): 62 * svg/SVGGlyphRefElement.h: Added. 63 * svg/SVGGlyphRefElement.idl: Added. 64 * svg/svgtags.in: 65 1 66 2011-07-19 Adam Roben <aroben@apple.com> 2 67 -
trunk/Source/WebCore/CodeGenerators.pri
r90392 r91331 442 442 svg/SVGZoomEvent.idl \ 443 443 svg/SVGAElement.idl \ 444 svg/SVGAltGlyphDefElement.idl \ 444 445 svg/SVGAltGlyphElement.idl \ 446 svg/SVGAltGlyphItemElement.idl \ 445 447 svg/SVGAngle.idl \ 446 448 svg/SVGAnimateColorElement.idl \ … … 509 511 svg/SVGGElement.idl \ 510 512 svg/SVGGlyphElement.idl \ 513 svg/SVGGlyphRefElement.idl \ 511 514 svg/SVGGradientElement.idl \ 512 515 svg/SVGHKernElement.idl \ -
trunk/Source/WebCore/DerivedSources.cpp
r89567 r91331 300 300 #include "JSStyleSheetList.cpp" 301 301 #include "JSSVGAElement.cpp" 302 #include "JSSVGAltGlyphDefElement.cpp" 302 303 #include "JSSVGAltGlyphElement.cpp" 304 #include "JSSVGAltGlyphItemElement.cpp" 303 305 #include "JSSVGAngle.cpp" 304 306 #include "JSSVGAnimateColorElement.cpp" … … 367 369 #include "JSSVGGElement.cpp" 368 370 #include "JSSVGGlyphElement.cpp" 371 #include "JSSVGGlyphRefElement.cpp" 369 372 #include "JSSVGGradientElement.cpp" 370 373 #include "JSSVGHKernElement.cpp" -
trunk/Source/WebCore/DerivedSources.make
r91281 r91331 373 373 StringCallback \ 374 374 SVGAElement \ 375 SVGAltGlyphDefElement \ 375 376 SVGAltGlyphElement \ 377 SVGAltGlyphItemElement \ 376 378 SVGAngle \ 377 379 SVGAnimateColorElement \ … … 443 445 SVGGElement \ 444 446 SVGGlyphElement \ 447 SVGGlyphRefElement \ 445 448 SVGGradientElement \ 446 449 SVGHKernElement \ -
trunk/Source/WebCore/GNUmakefile.list.am
r91250 r91331 3434 3434 Source/WebCore/svg/SVGAElement.cpp \ 3435 3435 Source/WebCore/svg/SVGAElement.h \ 3436 Source/WebCore/svg/SVGAltGlyphDefElement.cpp \ 3437 Source/WebCore/svg/SVGAltGlyphDefElement.h \ 3436 3438 Source/WebCore/svg/SVGAltGlyphElement.cpp \ 3437 3439 Source/WebCore/svg/SVGAltGlyphElement.h \ 3440 Source/WebCore/svg/SVGAltGlyphItemElement.cpp \ 3441 Source/WebCore/svg/SVGAltGlyphItemElement.h \ 3438 3442 Source/WebCore/svg/SVGAngle.cpp \ 3439 3443 Source/WebCore/svg/SVGAngle.h \ … … 3590 3594 Source/WebCore/svg/SVGGlyphElement.cpp \ 3591 3595 Source/WebCore/svg/SVGGlyphElement.h \ 3596 Source/WebCore/svg/SVGGlyphRefElement.cpp \ 3597 Source/WebCore/svg/SVGGlyphRefElement.h \ 3592 3598 Source/WebCore/svg/SVGGlyphMap.h \ 3593 3599 Source/WebCore/svg/SVGGradientElement.cpp \ … … 4221 4227 DerivedSources/WebCore/JSSVGAElement.cpp \ 4222 4228 DerivedSources/WebCore/JSSVGAElement.h \ 4229 DerivedSources/WebCore/JSSVGAltGlyphDefElement.cpp \ 4230 DerivedSources/WebCore/JSSVGAltGlyphDefElement.h \ 4223 4231 DerivedSources/WebCore/JSSVGAltGlyphElement.cpp \ 4224 4232 DerivedSources/WebCore/JSSVGAltGlyphElement.h \ 4233 DerivedSources/WebCore/JSSVGAltGlyphItemElement.cpp \ 4234 DerivedSources/WebCore/JSSVGAltGlyphItemElement.h \ 4225 4235 DerivedSources/WebCore/JSSVGAngle.cpp \ 4226 4236 DerivedSources/WebCore/JSSVGAngle.h \ … … 4357 4367 DerivedSources/WebCore/JSSVGGlyphElement.cpp \ 4358 4368 DerivedSources/WebCore/JSSVGGlyphElement.h \ 4369 DerivedSources/WebCore/JSSVGGlyphRefElement.cpp \ 4370 DerivedSources/WebCore/JSSVGGlyphRefElement.h \ 4359 4371 DerivedSources/WebCore/JSSVGGradientElement.cpp \ 4360 4372 DerivedSources/WebCore/JSSVGGradientElement.h \ -
trunk/Source/WebCore/WebCore.exp.in
r91235 r91331 1692 1692 #if ENABLE(SVG) && ENABLE(SVG_DOM_OBJC_BINDINGS) 1693 1693 .objc_class_name_DOMSVGAElement 1694 .objc_class_name_DOMSVGAltGlyphDefElement 1694 1695 .objc_class_name_DOMSVGAltGlyphElement 1696 .objc_class_name_DOMSVGAltGlyphItemElement 1695 1697 .objc_class_name_DOMSVGAngle 1696 1698 .objc_class_name_DOMSVGAnimateColorElement … … 1720 1722 .objc_class_name_DOMSVGEllipseElement 1721 1723 .objc_class_name_DOMSVGGElement 1724 .objc_class_name_DOMSVGGlyphRefElement 1722 1725 .objc_class_name_DOMSVGGradientElement 1723 1726 .objc_class_name_DOMSVGImageElement -
trunk/Source/WebCore/WebCore.gypi
r91281 r91331 1476 1476 'svg/SVGAElement.idl', 1477 1477 'svg/SVGAltGlyphElement.idl', 1478 'svg/SVGAltGlyphItemElement.idl', 1479 'svg/SVGAltGlyphDefElement.idl', 1478 1480 'svg/SVGAngle.idl', 1479 1481 'svg/SVGAnimateColorElement.idl', … … 1545 1547 'svg/SVGGElement.idl', 1546 1548 'svg/SVGGlyphElement.idl', 1549 'svg/SVGGlyphRefElement.idl', 1547 1550 'svg/SVGGradientElement.idl', 1548 1551 'svg/SVGHKernElement.idl', … … 5690 5693 'svg/SVGAElement.h', 5691 5694 'svg/SVGAllInOne.cpp', 5695 'svg/SVGAltGlyphDefElement.cpp', 5696 'svg/SVGAltGlyphDefElement.h', 5692 5697 'svg/SVGAltGlyphElement.cpp', 5693 5698 'svg/SVGAltGlyphElement.h', 5699 'svg/SVGAltGlyphItemElement.cpp', 5700 'svg/SVGAltGlyphItemElement.h', 5694 5701 'svg/SVGAngle.cpp', 5695 5702 'svg/SVGAnimateColorElement.cpp', … … 5823 5830 'svg/SVGGlyphElement.cpp', 5824 5831 'svg/SVGGlyphElement.h', 5832 'svg/SVGGlyphRefElement.cpp', 5833 'svg/SVGGlyphRefElement.h', 5825 5834 'svg/SVGGlyphMap.h', 5826 5835 'svg/SVGGradientElement.cpp', -
trunk/Source/WebCore/WebCore.pro
r91250 r91331 2332 2332 svg/properties/SVGTransformListPropertyTearOff.h \ 2333 2333 svg/SVGAElement.h \ 2334 svg/SVGAltGlyphDefElement.h \ 2334 2335 svg/SVGAltGlyphElement.h \ 2336 svg/SVGAltGlyphItemElement.h \ 2335 2337 svg/SVGAngle.h \ 2336 2338 svg/SVGAnimateColorElement.h \ … … 2412 2414 svg/SVGGElement.h \ 2413 2415 svg/SVGGlyphElement.h \ 2416 svg/SVGGlyphRefElement.h \ 2414 2417 svg/SVGGradientElement.h \ 2415 2418 svg/SVGHKernElement.h \ … … 3339 3342 svg/ColorDistance.cpp \ 3340 3343 svg/SVGAElement.cpp \ 3344 svg/SVGAltGlyphDefElement.cpp \ 3341 3345 svg/SVGAltGlyphElement.cpp \ 3346 svg/SVGAltGlyphItemElement.cpp \ 3342 3347 svg/SVGAngle.cpp \ 3343 3348 svg/SVGAnimateColorElement.cpp \ … … 3413 3418 svg/SVGGElement.cpp \ 3414 3419 svg/SVGGlyphElement.cpp \ 3420 svg/SVGGlyphRefElement.cpp \ 3415 3421 svg/SVGGradientElement.cpp \ 3416 3422 svg/SVGHKernElement.cpp \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r91250 r91331 14047 14047 </File> 14048 14048 <File 14049 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGAltGlyphDefElement.cpp" 14050 > 14051 <FileConfiguration 14052 Name="Debug|Win32" 14053 ExcludedFromBuild="true" 14054 > 14055 <Tool 14056 Name="VCCLCompilerTool" 14057 /> 14058 </FileConfiguration> 14059 <FileConfiguration 14060 Name="Release|Win32" 14061 ExcludedFromBuild="true" 14062 > 14063 <Tool 14064 Name="VCCLCompilerTool" 14065 /> 14066 </FileConfiguration> 14067 <FileConfiguration 14068 Name="Debug_Cairo_CFLite|Win32" 14069 ExcludedFromBuild="true" 14070 > 14071 <Tool 14072 Name="VCCLCompilerTool" 14073 /> 14074 </FileConfiguration> 14075 <FileConfiguration 14076 Name="Release_Cairo_CFLite|Win32" 14077 ExcludedFromBuild="true" 14078 > 14079 <Tool 14080 Name="VCCLCompilerTool" 14081 /> 14082 </FileConfiguration> 14083 <FileConfiguration 14084 Name="Debug_All|Win32" 14085 ExcludedFromBuild="true" 14086 > 14087 <Tool 14088 Name="VCCLCompilerTool" 14089 /> 14090 </FileConfiguration> 14091 <FileConfiguration 14092 Name="Production|Win32" 14093 ExcludedFromBuild="true" 14094 > 14095 <Tool 14096 Name="VCCLCompilerTool" 14097 /> 14098 </FileConfiguration> 14099 </File> 14100 <File 14101 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGAltGlyphDefElement.h" 14102 > 14103 </File> 14104 <File 14049 14105 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGAltGlyphElement.cpp" 14050 14106 > … … 14103 14159 </File> 14104 14160 <File 14161 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGAltGlyphItemElement.cpp" 14162 > 14163 <FileConfiguration 14164 Name="Debug|Win32" 14165 ExcludedFromBuild="true" 14166 > 14167 <Tool 14168 Name="VCCLCompilerTool" 14169 /> 14170 </FileConfiguration> 14171 <FileConfiguration 14172 Name="Release|Win32" 14173 ExcludedFromBuild="true" 14174 > 14175 <Tool 14176 Name="VCCLCompilerTool" 14177 /> 14178 </FileConfiguration> 14179 <FileConfiguration 14180 Name="Debug_Cairo_CFLite|Win32" 14181 ExcludedFromBuild="true" 14182 > 14183 <Tool 14184 Name="VCCLCompilerTool" 14185 /> 14186 </FileConfiguration> 14187 <FileConfiguration 14188 Name="Release_Cairo_CFLite|Win32" 14189 ExcludedFromBuild="true" 14190 > 14191 <Tool 14192 Name="VCCLCompilerTool" 14193 /> 14194 </FileConfiguration> 14195 <FileConfiguration 14196 Name="Debug_All|Win32" 14197 ExcludedFromBuild="true" 14198 > 14199 <Tool 14200 Name="VCCLCompilerTool" 14201 /> 14202 </FileConfiguration> 14203 <FileConfiguration 14204 Name="Production|Win32" 14205 ExcludedFromBuild="true" 14206 > 14207 <Tool 14208 Name="VCCLCompilerTool" 14209 /> 14210 </FileConfiguration> 14211 </File> 14212 <File 14213 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGAltGlyphItemElement.h" 14214 > 14215 </File> 14216 <File 14105 14217 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGAngle.cpp" 14106 14218 > … … 17756 17868 <File 17757 17869 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGGlyphElement.h" 17870 > 17871 </File> 17872 <File 17873 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGGlyphRefElement.cpp" 17874 > 17875 <FileConfiguration 17876 Name="Debug|Win32" 17877 ExcludedFromBuild="true" 17878 > 17879 <Tool 17880 Name="VCCLCompilerTool" 17881 /> 17882 </FileConfiguration> 17883 <FileConfiguration 17884 Name="Release|Win32" 17885 ExcludedFromBuild="true" 17886 > 17887 <Tool 17888 Name="VCCLCompilerTool" 17889 /> 17890 </FileConfiguration> 17891 <FileConfiguration 17892 Name="Debug_Cairo_CFLite|Win32" 17893 ExcludedFromBuild="true" 17894 > 17895 <Tool 17896 Name="VCCLCompilerTool" 17897 /> 17898 </FileConfiguration> 17899 <FileConfiguration 17900 Name="Release_Cairo_CFLite|Win32" 17901 ExcludedFromBuild="true" 17902 > 17903 <Tool 17904 Name="VCCLCompilerTool" 17905 /> 17906 </FileConfiguration> 17907 <FileConfiguration 17908 Name="Debug_All|Win32" 17909 ExcludedFromBuild="true" 17910 > 17911 <Tool 17912 Name="VCCLCompilerTool" 17913 /> 17914 </FileConfiguration> 17915 <FileConfiguration 17916 Name="Production|Win32" 17917 ExcludedFromBuild="true" 17918 > 17919 <Tool 17920 Name="VCCLCompilerTool" 17921 /> 17922 </FileConfiguration> 17923 </File> 17924 <File 17925 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\JSSVGGlyphRefElement.h" 17758 17926 > 17759 17927 </File> … … 65615 65783 </File> 65616 65784 <File 65785 RelativePath="..\svg\SVGAltGlyphDefElement.h" 65786 > 65787 </File> 65788 <File 65617 65789 RelativePath="..\svg\SVGAltGlyphElement.h" 65618 65790 > 65619 65791 </File> 65620 65792 <File 65793 RelativePath="..\svg\SVGAltGlyphItemElement.h" 65794 > 65795 </File> 65796 <File 65621 65797 RelativePath="..\svg\SVGAngle.h" 65622 65798 > … … 66036 66212 <File 66037 66213 RelativePath="..\svg\SVGGlyphElement.h" 66214 > 66215 </File> 66216 <File 66217 RelativePath="..\svg\SVGGlyphRefElement.cpp" 66218 > 66219 <FileConfiguration 66220 Name="Debug|Win32" 66221 ExcludedFromBuild="true" 66222 > 66223 <Tool 66224 Name="VCCLCompilerTool" 66225 /> 66226 </FileConfiguration> 66227 <FileConfiguration 66228 Name="Release|Win32" 66229 ExcludedFromBuild="true" 66230 > 66231 <Tool 66232 Name="VCCLCompilerTool" 66233 /> 66234 </FileConfiguration> 66235 <FileConfiguration 66236 Name="Debug_Cairo_CFLite|Win32" 66237 ExcludedFromBuild="true" 66238 > 66239 <Tool 66240 Name="VCCLCompilerTool" 66241 /> 66242 </FileConfiguration> 66243 <FileConfiguration 66244 Name="Release_Cairo_CFLite|Win32" 66245 ExcludedFromBuild="true" 66246 > 66247 <Tool 66248 Name="VCCLCompilerTool" 66249 /> 66250 </FileConfiguration> 66251 <FileConfiguration 66252 Name="Debug_All|Win32" 66253 ExcludedFromBuild="true" 66254 > 66255 <Tool 66256 Name="VCCLCompilerTool" 66257 /> 66258 </FileConfiguration> 66259 <FileConfiguration 66260 Name="Production|Win32" 66261 ExcludedFromBuild="true" 66262 > 66263 <Tool 66264 Name="VCCLCompilerTool" 66265 /> 66266 </FileConfiguration> 66267 </File> 66268 <File 66269 RelativePath="..\svg\SVGGlyphRefElement.h" 66038 66270 > 66039 66271 </File> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r91281 r91331 616 616 22BD9F81135364FE009BD102 /* ImageBufferDataCG.h in Headers */ = {isa = PBXBuildFile; fileRef = 22BD9F80135364FE009BD102 /* ImageBufferDataCG.h */; }; 617 617 245D80A313280E40003492A6 /* SQLCallbackWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 245D80A213280E40003492A6 /* SQLCallbackWrapper.h */; }; 618 24AA568D13CC94CE00E902F6 /* DOMSVGAltGlyphItemElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 24D912A313CA977D00D21915 /* DOMSVGAltGlyphItemElementInternal.h */; }; 619 24AA568E13CC950900E902F6 /* DOMSVGAltGlyphItemElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 24D912A113CA977D00D21915 /* DOMSVGAltGlyphItemElement.h */; }; 620 24AA569013CC952F00E902F6 /* DOMSVGAltGlyphDefElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 24D9129B13CA975A00D21915 /* DOMSVGAltGlyphDefElement.h */; }; 621 24AA569213CC954E00E902F6 /* DOMSVGAltGlyphDefElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 24D9129D13CA975A00D21915 /* DOMSVGAltGlyphDefElementInternal.h */; }; 622 24AA569713CC95A800E902F6 /* DOMSVGGlyphRefElement.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 24D912A713CA97CF00D21915 /* DOMSVGGlyphRefElement.h */; }; 623 24AA569913CC95CC00E902F6 /* DOMSVGGlyphRefElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 24D912A913CA97CF00D21915 /* DOMSVGGlyphRefElementInternal.h */; }; 624 24D9129113CA951E00D21915 /* JSSVGAltGlyphDefElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24D9128F13CA951E00D21915 /* JSSVGAltGlyphDefElement.cpp */; }; 625 24D9129213CA951E00D21915 /* JSSVGAltGlyphDefElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D9129013CA951E00D21915 /* JSSVGAltGlyphDefElement.h */; }; 626 24D9129513CA956100D21915 /* JSSVGAltGlyphItemElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24D9129313CA956100D21915 /* JSSVGAltGlyphItemElement.cpp */; }; 627 24D9129613CA956100D21915 /* JSSVGAltGlyphItemElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D9129413CA956100D21915 /* JSSVGAltGlyphItemElement.h */; }; 628 24D9129813CA96DE00D21915 /* JSSVGGlyphRefElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24D9129713CA96DE00D21915 /* JSSVGGlyphRefElement.cpp */; }; 629 24D9129A13CA971400D21915 /* JSSVGGlyphRefElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D9129913CA971400D21915 /* JSSVGGlyphRefElement.h */; }; 630 24D9129E13CA975A00D21915 /* DOMSVGAltGlyphDefElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D9129B13CA975A00D21915 /* DOMSVGAltGlyphDefElement.h */; }; 631 24D9129F13CA975A00D21915 /* DOMSVGAltGlyphDefElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 24D9129C13CA975A00D21915 /* DOMSVGAltGlyphDefElement.mm */; }; 632 24D912A013CA975A00D21915 /* DOMSVGAltGlyphDefElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D9129D13CA975A00D21915 /* DOMSVGAltGlyphDefElementInternal.h */; }; 633 24D912A413CA977D00D21915 /* DOMSVGAltGlyphItemElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D912A113CA977D00D21915 /* DOMSVGAltGlyphItemElement.h */; }; 634 24D912A513CA977D00D21915 /* DOMSVGAltGlyphItemElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 24D912A213CA977D00D21915 /* DOMSVGAltGlyphItemElement.mm */; }; 635 24D912A613CA977D00D21915 /* DOMSVGAltGlyphItemElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D912A313CA977D00D21915 /* DOMSVGAltGlyphItemElementInternal.h */; }; 636 24D912AA13CA97CF00D21915 /* DOMSVGGlyphRefElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D912A713CA97CF00D21915 /* DOMSVGGlyphRefElement.h */; }; 637 24D912AB13CA97CF00D21915 /* DOMSVGGlyphRefElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = 24D912A813CA97CF00D21915 /* DOMSVGGlyphRefElement.mm */; }; 638 24D912AC13CA97CF00D21915 /* DOMSVGGlyphRefElementInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D912A913CA97CF00D21915 /* DOMSVGGlyphRefElementInternal.h */; }; 639 24D912B013CA9A1F00D21915 /* SVGAltGlyphDefElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24D912AD13CA9A1F00D21915 /* SVGAltGlyphDefElement.cpp */; }; 640 24D912B113CA9A1F00D21915 /* SVGAltGlyphDefElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D912AE13CA9A1F00D21915 /* SVGAltGlyphDefElement.h */; }; 641 24D912B713CA9A6900D21915 /* SVGAltGlyphItemElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24D912B413CA9A6900D21915 /* SVGAltGlyphItemElement.cpp */; }; 642 24D912B813CA9A6900D21915 /* SVGAltGlyphItemElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D912B513CA9A6900D21915 /* SVGAltGlyphItemElement.h */; }; 643 24D912BD13CA9A9700D21915 /* SVGGlyphRefElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24D912BA13CA9A9700D21915 /* SVGGlyphRefElement.cpp */; }; 644 24D912BE13CA9A9700D21915 /* SVGGlyphRefElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 24D912BB13CA9A9700D21915 /* SVGGlyphRefElement.h */; }; 618 645 24F54EAC101FE914000AE741 /* ApplicationCacheHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 24F54EAA101FE914000AE741 /* ApplicationCacheHost.cpp */; }; 619 646 24F54EAD101FE914000AE741 /* ApplicationCacheHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 24F54EAB101FE914000AE741 /* ApplicationCacheHost.h */; settings = {ATTRIBUTES = (); }; }; … … 6136 6163 A8F46AE40CB20A9D003A9670 /* DOMSVGAElement.h in Copy Generated Headers */, 6137 6164 A80F3B620CCDCE24002DD990 /* DOMSVGAElementInternal.h in Copy Generated Headers */, 6165 24AA569013CC952F00E902F6 /* DOMSVGAltGlyphDefElement.h in Copy Generated Headers */, 6166 24AA569213CC954E00E902F6 /* DOMSVGAltGlyphDefElementInternal.h in Copy Generated Headers */, 6138 6167 E17A4A1B0D97991D00FC10C6 /* DOMSVGAltGlyphElement.h in Copy Generated Headers */, 6139 6168 E17A4A1C0D97991D00FC10C6 /* DOMSVGAltGlyphElementInternal.h in Copy Generated Headers */, 6169 24AA568E13CC950900E902F6 /* DOMSVGAltGlyphItemElement.h in Copy Generated Headers */, 6170 24AA568D13CC94CE00E902F6 /* DOMSVGAltGlyphItemElementInternal.h in Copy Generated Headers */, 6140 6171 A80F3B3B0CCDCE24002DD990 /* DOMSVGAngle.h in Copy Generated Headers */, 6141 6172 A80F3B860CCDCE24002DD990 /* DOMSVGAngleInternal.h in Copy Generated Headers */, … … 6263 6294 A80F3B630CCDCE24002DD990 /* DOMSVGGElementInternal.h in Copy Generated Headers */, 6264 6295 B27B285D0CEF0D7200D39D54 /* DOMSVGGlyphElement.h in Copy Generated Headers */, 6296 24AA569713CC95A800E902F6 /* DOMSVGGlyphRefElement.h in Copy Generated Headers */, 6297 24AA569913CC95CC00E902F6 /* DOMSVGGlyphRefElementInternal.h in Copy Generated Headers */, 6265 6298 A8F46A880CB20A9D003A9670 /* DOMSVGGradientElement.h in Copy Generated Headers */, 6266 6299 A80F3B780CCDCE24002DD990 /* DOMSVGGradientElementInternal.h in Copy Generated Headers */, … … 7050 7083 2442BBF81194C9D300D49469 /* HashChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashChangeEvent.h; sourceTree = "<group>"; }; 7051 7084 245D80A213280E40003492A6 /* SQLCallbackWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLCallbackWrapper.h; sourceTree = "<group>"; }; 7085 24D9128F13CA951E00D21915 /* JSSVGAltGlyphDefElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGAltGlyphDefElement.cpp; sourceTree = "<group>"; }; 7086 24D9129013CA951E00D21915 /* JSSVGAltGlyphDefElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGAltGlyphDefElement.h; sourceTree = "<group>"; }; 7087 24D9129313CA956100D21915 /* JSSVGAltGlyphItemElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGAltGlyphItemElement.cpp; sourceTree = "<group>"; }; 7088 24D9129413CA956100D21915 /* JSSVGAltGlyphItemElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGAltGlyphItemElement.h; sourceTree = "<group>"; }; 7089 24D9129713CA96DE00D21915 /* JSSVGGlyphRefElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGGlyphRefElement.cpp; sourceTree = "<group>"; }; 7090 24D9129913CA971400D21915 /* JSSVGGlyphRefElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGGlyphRefElement.h; sourceTree = "<group>"; }; 7091 24D9129B13CA975A00D21915 /* DOMSVGAltGlyphDefElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGAltGlyphDefElement.h; sourceTree = "<group>"; }; 7092 24D9129C13CA975A00D21915 /* DOMSVGAltGlyphDefElement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGAltGlyphDefElement.mm; sourceTree = "<group>"; }; 7093 24D9129D13CA975A00D21915 /* DOMSVGAltGlyphDefElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGAltGlyphDefElementInternal.h; sourceTree = "<group>"; }; 7094 24D912A113CA977D00D21915 /* DOMSVGAltGlyphItemElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGAltGlyphItemElement.h; sourceTree = "<group>"; }; 7095 24D912A213CA977D00D21915 /* DOMSVGAltGlyphItemElement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGAltGlyphItemElement.mm; sourceTree = "<group>"; }; 7096 24D912A313CA977D00D21915 /* DOMSVGAltGlyphItemElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGAltGlyphItemElementInternal.h; sourceTree = "<group>"; }; 7097 24D912A713CA97CF00D21915 /* DOMSVGGlyphRefElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGGlyphRefElement.h; sourceTree = "<group>"; }; 7098 24D912A813CA97CF00D21915 /* DOMSVGGlyphRefElement.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DOMSVGGlyphRefElement.mm; sourceTree = "<group>"; }; 7099 24D912A913CA97CF00D21915 /* DOMSVGGlyphRefElementInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSVGGlyphRefElementInternal.h; sourceTree = "<group>"; }; 7100 24D912AD13CA9A1F00D21915 /* SVGAltGlyphDefElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAltGlyphDefElement.cpp; sourceTree = "<group>"; }; 7101 24D912AE13CA9A1F00D21915 /* SVGAltGlyphDefElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAltGlyphDefElement.h; sourceTree = "<group>"; }; 7102 24D912AF13CA9A1F00D21915 /* SVGAltGlyphDefElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGAltGlyphDefElement.idl; sourceTree = "<group>"; }; 7103 24D912B413CA9A6900D21915 /* SVGAltGlyphItemElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAltGlyphItemElement.cpp; sourceTree = "<group>"; }; 7104 24D912B513CA9A6900D21915 /* SVGAltGlyphItemElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAltGlyphItemElement.h; sourceTree = "<group>"; }; 7105 24D912B613CA9A6900D21915 /* SVGAltGlyphItemElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGAltGlyphItemElement.idl; sourceTree = "<group>"; }; 7106 24D912BA13CA9A9700D21915 /* SVGGlyphRefElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGGlyphRefElement.cpp; sourceTree = "<group>"; }; 7107 24D912BB13CA9A9700D21915 /* SVGGlyphRefElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGGlyphRefElement.h; sourceTree = "<group>"; }; 7108 24D912BC13CA9A9700D21915 /* SVGGlyphRefElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SVGGlyphRefElement.idl; sourceTree = "<group>"; }; 7052 7109 24F54EAA101FE914000AE741 /* ApplicationCacheHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ApplicationCacheHost.cpp; sourceTree = "<group>"; }; 7053 7110 24F54EAB101FE914000AE741 /* ApplicationCacheHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationCacheHost.h; sourceTree = "<group>"; }; … … 14774 14831 85ACEF750ACDCFCE001214FF /* DOMSVGAElement.mm */, 14775 14832 A8E544150CA9D1C10097D09B /* DOMSVGAElementInternal.h */, 14833 24D9129B13CA975A00D21915 /* DOMSVGAltGlyphDefElement.h */, 14834 24D9129C13CA975A00D21915 /* DOMSVGAltGlyphDefElement.mm */, 14835 24D9129D13CA975A00D21915 /* DOMSVGAltGlyphDefElementInternal.h */, 14776 14836 65AA6BAC0D974A00000541AE /* DOMSVGAltGlyphElement.h */, 14777 14837 65AA6BAD0D974A00000541AE /* DOMSVGAltGlyphElement.mm */, 14778 14838 65AA6BAE0D974A00000541AE /* DOMSVGAltGlyphElementInternal.h */, 14839 24D912A113CA977D00D21915 /* DOMSVGAltGlyphItemElement.h */, 14840 24D912A213CA977D00D21915 /* DOMSVGAltGlyphItemElement.mm */, 14841 24D912A313CA977D00D21915 /* DOMSVGAltGlyphItemElementInternal.h */, 14779 14842 854163690AC7180B0001E01B /* DOMSVGAngle.h */, 14780 14843 854163680AC7180B0001E01B /* DOMSVGAngle.mm */, … … 14980 15043 B27B28310CEF0C3500D39D54 /* DOMSVGGlyphElement.mm */, 14981 15044 B27B28320CEF0C3500D39D54 /* DOMSVGGlyphElementInternal.h */, 15045 24D912A713CA97CF00D21915 /* DOMSVGGlyphRefElement.h */, 15046 24D912A813CA97CF00D21915 /* DOMSVGGlyphRefElement.mm */, 15047 24D912A913CA97CF00D21915 /* DOMSVGGlyphRefElementInternal.h */, 14982 15048 85C9A2EC0AD7E90300FBFF1E /* DOMSVGGradientElement.h */, 14983 15049 85C9A2ED0AD7E90300FBFF1E /* DOMSVGGradientElement.mm */, … … 16770 16836 B20111050AB7740500DB0E68 /* JSSVGAElement.cpp */, 16771 16837 B20111060AB7740500DB0E68 /* JSSVGAElement.h */, 16838 24D9128F13CA951E00D21915 /* JSSVGAltGlyphDefElement.cpp */, 16839 24D9129013CA951E00D21915 /* JSSVGAltGlyphDefElement.h */, 16772 16840 6515EC8F0D9723FF0063D49A /* JSSVGAltGlyphElement.cpp */, 16773 16841 6515EC900D9723FF0063D49A /* JSSVGAltGlyphElement.h */, 16842 24D9129313CA956100D21915 /* JSSVGAltGlyphItemElement.cpp */, 16843 24D9129413CA956100D21915 /* JSSVGAltGlyphItemElement.h */, 16774 16844 B222F6960AB771950022EFAD /* JSSVGAngle.cpp */, 16775 16845 B222F6970AB771950022EFAD /* JSSVGAngle.h */, … … 16904 16974 B27B28210CEF0C0700D39D54 /* JSSVGGlyphElement.cpp */, 16905 16975 B27B28220CEF0C0700D39D54 /* JSSVGGlyphElement.h */, 16976 24D9129713CA96DE00D21915 /* JSSVGGlyphRefElement.cpp */, 16977 24D9129913CA971400D21915 /* JSSVGGlyphRefElement.h */, 16906 16978 B2FA3CB40AB75A6E000E5AC4 /* JSSVGGradientElement.cpp */, 16907 16979 B2FA3CB50AB75A6E000E5AC4 /* JSSVGGradientElement.h */, … … 17428 17500 B22277DE0D00BF1F0071B782 /* SVGAElement.h */, 17429 17501 B22277DF0D00BF1F0071B782 /* SVGAElement.idl */, 17502 24D912AD13CA9A1F00D21915 /* SVGAltGlyphDefElement.cpp */, 17503 24D912AE13CA9A1F00D21915 /* SVGAltGlyphDefElement.h */, 17504 24D912AF13CA9A1F00D21915 /* SVGAltGlyphDefElement.idl */, 17430 17505 65653F2A0D9727D200CA9723 /* SVGAltGlyphElement.cpp */, 17431 17506 65653F2B0D9727D200CA9723 /* SVGAltGlyphElement.h */, 17432 17507 65653F2C0D9727D200CA9723 /* SVGAltGlyphElement.idl */, 17508 24D912B413CA9A6900D21915 /* SVGAltGlyphItemElement.cpp */, 17509 24D912B513CA9A6900D21915 /* SVGAltGlyphItemElement.h */, 17510 24D912B613CA9A6900D21915 /* SVGAltGlyphItemElement.idl */, 17433 17511 B22277E00D00BF1F0071B782 /* SVGAngle.cpp */, 17434 17512 B22277E10D00BF1F0071B782 /* SVGAngle.h */, … … 17655 17733 B2A1F2A50CEF0ABF00442F6A /* SVGGlyphElement.h */, 17656 17734 B2A1F2A60CEF0ABF00442F6A /* SVGGlyphElement.idl */, 17735 24D912BA13CA9A9700D21915 /* SVGGlyphRefElement.cpp */, 17736 24D912BB13CA9A9700D21915 /* SVGGlyphRefElement.h */, 17737 24D912BC13CA9A9700D21915 /* SVGGlyphRefElement.idl */, 17657 17738 3744570E0DB05FA500AE0992 /* SVGGlyphMap.h */, 17658 17739 B22278930D00BF200071B782 /* SVGGradientElement.cpp */, … … 20808 20889 85ACEF7C0ACDCFCE001214FF /* DOMSVGAElement.h in Headers */, 20809 20890 85ACEF890ACDD04A001214FF /* DOMSVGAElementInternal.h in Headers */, 20891 24D9129E13CA975A00D21915 /* DOMSVGAltGlyphDefElement.h in Headers */, 20892 24D912A013CA975A00D21915 /* DOMSVGAltGlyphDefElementInternal.h in Headers */, 20810 20893 65AA6BAF0D974A00000541AE /* DOMSVGAltGlyphElement.h in Headers */, 20811 20894 65AA6BB10D974A00000541AE /* DOMSVGAltGlyphElementInternal.h in Headers */, 20895 24D912A413CA977D00D21915 /* DOMSVGAltGlyphItemElement.h in Headers */, 20896 24D912A613CA977D00D21915 /* DOMSVGAltGlyphItemElementInternal.h in Headers */, 20812 20897 854163790AC7180B0001E01B /* DOMSVGAngle.h in Headers */, 20813 20898 8541639E0AC718680001E01B /* DOMSVGAngleInternal.h in Headers */, … … 20942 21027 B27B283B0CEF0C3600D39D54 /* DOMSVGGlyphElement.h in Headers */, 20943 21028 B27B283D0CEF0C3600D39D54 /* DOMSVGGlyphElementInternal.h in Headers */, 21029 24D912AA13CA97CF00D21915 /* DOMSVGGlyphRefElement.h in Headers */, 21030 24D912AC13CA97CF00D21915 /* DOMSVGGlyphRefElementInternal.h in Headers */, 20944 21031 85C9A2F70AD7E90300FBFF1E /* DOMSVGGradientElement.h in Headers */, 20945 21032 85C9A31C0AD7E9A400FBFF1E /* DOMSVGGradientElementInternal.h in Headers */, … … 21896 21983 A84EBD830CB8C97700079609 /* JSStyleSheetList.h in Headers */, 21897 21984 B20111080AB7740500DB0E68 /* JSSVGAElement.h in Headers */, 21985 24D9129213CA951E00D21915 /* JSSVGAltGlyphDefElement.h in Headers */, 21898 21986 6515EC920D9723FF0063D49A /* JSSVGAltGlyphElement.h in Headers */, 21987 24D9129613CA956100D21915 /* JSSVGAltGlyphItemElement.h in Headers */, 21899 21988 B222F6990AB771950022EFAD /* JSSVGAngle.h in Headers */, 21900 21989 B2FA3D370AB75A6F000E5AC4 /* JSSVGAnimateColorElement.h in Headers */, … … 21964 22053 B2FA3D9B0AB75A6F000E5AC4 /* JSSVGGElement.h in Headers */, 21965 22054 B27B28280CEF0C0700D39D54 /* JSSVGGlyphElement.h in Headers */, 22055 24D9129A13CA971400D21915 /* JSSVGGlyphRefElement.h in Headers */, 21966 22056 B2FA3D9D0AB75A6F000E5AC4 /* JSSVGGradientElement.h in Headers */, 21967 22057 8485227C1190162C006EDC7F /* JSSVGHKernElement.h in Headers */, … … 22687 22777 62C1217D11AB9E77003C462C /* SuspendableTimer.h in Headers */, 22688 22778 B22279740D00BF220071B782 /* SVGAElement.h in Headers */, 22779 24D912B113CA9A1F00D21915 /* SVGAltGlyphDefElement.h in Headers */, 22689 22780 65653F2E0D9727D200CA9723 /* SVGAltGlyphElement.h in Headers */, 22781 24D912B813CA9A6900D21915 /* SVGAltGlyphItemElement.h in Headers */, 22690 22782 B22279770D00BF220071B782 /* SVGAngle.h in Headers */, 22691 22783 B222797A0D00BF220071B782 /* SVGAnimateColorElement.h in Headers */, … … 22784 22876 087E0AF713606D0B00FA4BA8 /* SVGGlyph.h in Headers */, 22785 22877 B2A1F2AE0CEF0ABF00442F6A /* SVGGlyphElement.h in Headers */, 22878 24D912BE13CA9A9700D21915 /* SVGGlyphRefElement.h in Headers */, 22786 22879 3744570F0DB05FA500AE0992 /* SVGGlyphMap.h in Headers */, 22787 22880 B2227A2A0D00BF220071B782 /* SVGGradientElement.h in Headers */, … … 25922 26015 FD8E9BDF13D4CD2B0050DC72 /* JSWaveShaperNodeCustom.cpp in Sources */, 25923 26016 5913A24113D49EBA00F5B05C /* IdentifiersFactory.cpp in Sources */, 26017 24D9129113CA951E00D21915 /* JSSVGAltGlyphDefElement.cpp in Sources */, 26018 24D9129513CA956100D21915 /* JSSVGAltGlyphItemElement.cpp in Sources */, 26019 24D9129813CA96DE00D21915 /* JSSVGGlyphRefElement.cpp in Sources */, 26020 24D9129F13CA975A00D21915 /* DOMSVGAltGlyphDefElement.mm in Sources */, 26021 24D912A513CA977D00D21915 /* DOMSVGAltGlyphItemElement.mm in Sources */, 26022 24D912AB13CA97CF00D21915 /* DOMSVGGlyphRefElement.mm in Sources */, 26023 24D912B013CA9A1F00D21915 /* SVGAltGlyphDefElement.cpp in Sources */, 26024 24D912B713CA9A6900D21915 /* SVGAltGlyphItemElement.cpp in Sources */, 26025 24D912BD13CA9A9700D21915 /* SVGGlyphRefElement.cpp in Sources */, 25924 26026 ); 25925 26027 runOnlyForDeploymentPostprocessing = 0; -
trunk/Source/WebCore/bindings/objc/DOM.mm
r86147 r91331 148 148 #if ENABLE(SVG_DOM_OBJC_BINDINGS) 149 149 addElementClass(SVGNames::aTag, [DOMSVGAElement class]); 150 addElementClass(SVGNames::altGlyphDefTag, [DOMSVGAltGlyphDefElement class]); 150 151 addElementClass(SVGNames::altGlyphTag, [DOMSVGAltGlyphElement class]); 152 addElementClass(SVGNames::altGlyphItemTag, [DOMSVGAltGlyphItemElement class]); 151 153 #if ENABLE(SVG_ANIMATION) 152 154 addElementClass(SVGNames::animateTag, [DOMSVGAnimateElement class]); … … 197 199 addElementClass(SVGNames::font_face_uriTag, [DOMSVGFontFaceUriElement class]); 198 200 addElementClass(SVGNames::glyphTag, [DOMSVGGlyphElement class]); 201 addElementClass(SVGNames::glyphRefTag, [DOMSVGGlyphRefElement class]); 199 202 #endif 200 203 addElementClass(SVGNames::gTag, [DOMSVGGElement class]); -
trunk/Source/WebCore/bindings/objc/DOMSVG.h
r84522 r91331 26 26 27 27 #import <WebCore/DOMSVGAElement.h> 28 #import <WebCore/DOMSVGAltGlyphDefElement.h> 28 29 #import <WebCore/DOMSVGAltGlyphElement.h> 30 #import <WebCore/DOMSVGAltGlyphItemElement.h> 29 31 #import <WebCore/DOMSVGAngle.h> 30 32 #import <WebCore/DOMSVGAnimateColorElement.h> … … 95 97 #import <WebCore/DOMSVGGElement.h> 96 98 #import <WebCore/DOMSVGGlyphElement.h> 99 #import <WebCore/DOMSVGGlyphRefElement.h> 97 100 #import <WebCore/DOMSVGGradientElement.h> 98 101 #import <WebCore/DOMSVGImageElement.h> -
trunk/Source/WebCore/page/DOMWindow.idl
r89781 r91331 725 725 726 726 #if defined(ENABLE_SVG_FONTS) && ENABLE_SVG_FONTS 727 //attribute SVGAltGlyphDefElementConstructor SVGAltGlyphDefElement;727 attribute SVGAltGlyphDefElementConstructor SVGAltGlyphDefElement; 728 728 attribute SVGAltGlyphElementConstructor SVGAltGlyphElement; 729 //attribute SVGAltGlyphItemElementConstructor SVGAltGlyphItemElement;729 attribute SVGAltGlyphItemElementConstructor SVGAltGlyphItemElement; 730 730 // attribute SVGDefinitionSrcElementConstructor SVGDefinitionSrcElement; 731 731 attribute SVGFontElementConstructor SVGFontElement; … … 736 736 attribute SVGFontFaceUriElementConstructor SVGFontFaceUriElement; 737 737 attribute SVGGlyphElementConstructor SVGGlyphElement; 738 //attribute SVGGlyphRefElementConstructor SVGGlyphRefElement;738 attribute SVGGlyphRefElementConstructor SVGGlyphRefElement; 739 739 attribute SVGHKernElementConstructor SVGHKernElement; 740 740 attribute SVGMissingGlyphElementConstructor SVGMissingGlyphElement; -
trunk/Source/WebCore/svg/SVGAllInOne.cpp
r90218 r91331 28 28 #include "ColorDistance.cpp" 29 29 #include "SVGAElement.cpp" 30 #include "SVGAltGlyphDefElement.cpp" 30 31 #include "SVGAltGlyphElement.cpp" 32 #include "SVGAltGlyphItemElement.cpp" 31 33 #include "SVGAngle.cpp" 32 34 #include "SVGAnimateColorElement.cpp" … … 103 105 #include "SVGGElement.cpp" 104 106 #include "SVGGlyphElement.cpp" 107 #include "SVGGlyphRefElement.cpp" 105 108 #include "SVGGradientElement.cpp" 106 109 #include "SVGHKernElement.cpp" -
trunk/Source/WebCore/svg/SVGAltGlyphElement.cpp
r90680 r91331 3 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> 4 4 * Copyright (C) 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved. 5 6 * 6 7 * This library is free software; you can redistribute it and/or … … 28 29 #include "RenderInline.h" 29 30 #include "RenderSVGTSpan.h" 31 #include "SVGAltGlyphDefElement.h" 30 32 #include "SVGGlyphElement.h" 31 33 #include "SVGNames.h" … … 86 88 } 87 89 88 bool SVGAltGlyphElement::hasValidGlyphElement (String& glyphName) const90 bool SVGAltGlyphElement::hasValidGlyphElements(Vector<String>& glyphNames) const 89 91 { 90 // FIXME: No support for altGlyphDef/glyphRef. 91 // This is tracked by https://bugs.webkit.org/show_bug.cgi?id=60850. 92 glyphName = getTarget(fastGetAttribute(XLinkNames::hrefAttr)); 93 Element* element = treeScope()->getElementById(glyphName); 94 if (!element || !element->hasTagName(SVGNames::glyphTag)) 92 String target = getTarget(fastGetAttribute(XLinkNames::hrefAttr)); 93 Element* element = treeScope()->getElementById(target); 94 if (!element) 95 95 return false; 96 return true; 96 97 if (element->hasTagName(SVGNames::glyphTag)) { 98 glyphNames.append(target); 99 return true; 100 } 101 102 if (element->hasTagName(SVGNames::altGlyphDefTag) 103 && static_cast<SVGAltGlyphDefElement*>(element)->hasValidGlyphElements(glyphNames)) 104 return true; 105 106 return false; 97 107 } 98 108 -
trunk/Source/WebCore/svg/SVGAltGlyphElement.h
r90680 r91331 26 26 #include "SVGTextPositioningElement.h" 27 27 #include "SVGURIReference.h" 28 #include <wtf/Vector.h> 28 29 29 30 namespace WebCore { … … 41 42 void setFormat(const AtomicString&, ExceptionCode&); 42 43 43 bool hasValidGlyphElement (String& glyphName) const;44 bool hasValidGlyphElements(Vector<String>& glyphNames) const; 44 45 45 46 private: -
trunk/Source/WebCore/svg/SVGFontData.cpp
r89732 r91331 143 143 String language; 144 144 bool isVerticalText = false; 145 String altGlyphName;145 Vector<String> altGlyphNames; 146 146 147 147 if (renderObject) { … … 155 155 if (parentRenderObjectElement->hasTagName(SVGNames::altGlyphTag)) { 156 156 SVGAltGlyphElement* altGlyph = static_cast<SVGAltGlyphElement*>(parentRenderObjectElement); 157 if (!altGlyph->hasValidGlyphElement (altGlyphName))158 altGlyphName = emptyString();157 if (!altGlyph->hasValidGlyphElements(altGlyphNames)) 158 altGlyphNames.clear(); 159 159 } 160 160 } … … 162 162 163 163 Vector<SVGGlyph> glyphs; 164 if (!altGlyphName.isEmpty()) { 165 associatedFontElement->collectGlyphsForGlyphName(altGlyphName, glyphs); 164 size_t altGlyphNamesSize = altGlyphNames.size(); 165 if (altGlyphNamesSize) { 166 for (size_t index = 0; index < altGlyphNamesSize; ++index) 167 associatedFontElement->collectGlyphsForGlyphName(altGlyphNames[index], glyphs); 166 168 167 169 // Assign the unicodeStringLength now that its known. -
trunk/Source/WebCore/svg/svgtags.in
r89732 r91331 6 6 #if ENABLE_SVG_FONTS 7 7 altGlyph 8 #endif9 #if 010 8 altGlyphDef 11 9 altGlyphItem … … 69 67 #if ENABLE_SVG_FONTS 70 68 glyph 71 #endif72 #if 073 69 glyphRef 74 #endif75 #if ENABLE_SVG_FONTS76 70 hkern interfaceName=SVGHKernElement, JSInterfaceName=SVGElement 77 71 #endif -
trunk/Source/WebKit/mac/ChangeLog
r91239 r91331 1 2011-07-19 Leo Yang <leoyang.webkit@gmail.com> 2 3 SVG: Missing implementation of <altGlyphDef>, <altGlyphItem> and <glyphRef> 4 https://bugs.webkit.org/show_bug.cgi?id=60850 5 6 Reviewed by Nikolas Zimmermann. 7 8 SVG spec: http://www.w3.org/TR/SVG/text.html#AlternateGlyphDefinitions. 9 This patch is to implement SVG <altGlyphDef>, <altGlyphItem> and <glyphRef> 10 elements for alternative glyph features. 11 12 * MigrateHeaders.make: 13 1 14 2011-07-18 Andy Estes <aestes@apple.com> 2 15 -
trunk/Source/WebKit/mac/MigrateHeaders.make
r85036 r91331 198 198 $(PRIVATE_HEADERS_DIR)/DOMSVGAElement.h \ 199 199 $(INTERNAL_HEADERS_DIR)/DOMSVGAElementInternal.h \ 200 $(PRIVATE_HEADERS_DIR)/DOMSVGAltGlyphDefElement.h \ 201 $(INTERNAL_HEADERS_DIR)/DOMSVGAltGlyphDefElementInternal.h \ 200 202 $(PRIVATE_HEADERS_DIR)/DOMSVGAltGlyphElement.h \ 201 203 $(INTERNAL_HEADERS_DIR)/DOMSVGAltGlyphElementInternal.h \ 204 $(PRIVATE_HEADERS_DIR)/DOMSVGAltGlyphItemElement.h \ 205 $(INTERNAL_HEADERS_DIR)/DOMSVGAltGlyphItemElementInternal.h \ 202 206 $(PRIVATE_HEADERS_DIR)/DOMSVGAngle.h \ 203 207 $(INTERNAL_HEADERS_DIR)/DOMSVGAngleInternal.h \ … … 325 329 $(INTERNAL_HEADERS_DIR)/DOMSVGGElementInternal.h \ 326 330 $(PRIVATE_HEADERS_DIR)/DOMSVGGlyphElement.h \ 331 $(PRIVATE_HEADERS_DIR)/DOMSVGGlyphRefElement.h \ 332 $(INTERNAL_HEADERS_DIR)/DOMSVGGlyphRefElementInternal.h \ 327 333 $(PRIVATE_HEADERS_DIR)/DOMSVGGradientElement.h \ 328 334 $(INTERNAL_HEADERS_DIR)/DOMSVGGradientElementInternal.h \
Note: See TracChangeset
for help on using the changeset viewer.
