Changeset 225027 in webkit
- Timestamp:
- Nov 18, 2017 7:42:49 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 9 deleted
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r225024 r225027 1 2017-11-18 Maciej Stachowiak <mjs@apple.com> 2 3 Remove TEC support and all TEC-only encodings except EUC-TW (which now uses ICU) 4 https://bugs.webkit.org/show_bug.cgi?id=179582 5 6 Reviewed by Darin Adler. 7 8 * fast/encoding/legacy-tec-encodings.html: Added. Verify that we 9 no longer support these encodings. 10 * fast/encoding/legacy-tec-encodings-expected.txt: Added. 11 * platform/mac/fast/encoding/xnextstep-decoding.html: Removed. We no longer support this encoding. 12 * platform/mac/fast/encoding/xnextstep-decoding-expected.txt: Removed. 13 1 14 2017-11-18 Simon Fraser <simon.fraser@apple.com> 2 15 -
trunk/Source/WebCore/ChangeLog
r225026 r225027 1 2017-11-18 Maciej Stachowiak <mjs@apple.com> 2 3 Remove TEC support and all TEC-only encodings except EUC-TW (which now uses ICU) 4 https://bugs.webkit.org/show_bug.cgi?id=179582 5 6 Reviewed by Darin Adler. 7 8 Already covered by fast/encoding/legacy-tec-encodings.html 9 10 * platform/text/TextCodecICU.cpp: Add support for EUC-TW. 11 12 Remove all vestiges of TEC text codec and its related autogeneration scripts. 13 14 * DerivedSources.make: 15 * PlatformMac.cmake: 16 * SourcesMac.txt: 17 * WebCore.order: 18 * WebCore.xcodeproj/project.pbxproj: 19 * platform/ThreadGlobalData.cpp: 20 (WebCore::ThreadGlobalData::ThreadGlobalData): No more cached TEC decoder. 21 (WebCore::ThreadGlobalData::destroy): ditto 22 * platform/ThreadGlobalData.h: 23 (WebCore::ThreadGlobalData::ThreadGlobalData::cachedConverterTEC): Deleted. 24 * platform/text/TextEncodingRegistry.cpp: 25 (WebCore::extendTextCodecMaps): Don't add TEC decoders on MAc. 26 * platform/text/mac/CharsetData.h: Removed. 27 * platform/text/mac/TextCodecMac.cpp: Removed. 28 * platform/text/mac/TextCodecMac.h: Removed. 29 * platform/text/mac/character-sets.txt: Removed. 30 * platform/text/mac/ios-encodings.txt: Removed. 31 * platform/text/mac/mac-encodings.txt: Removed. 32 * platform/text/mac/make-charset-table.pl: Removed. 33 1 34 2017-11-18 Simon Fraser <simon.fraser@apple.com> 2 35 -
trunk/Source/WebCore/DerivedSources.make
r224871 r225027 1532 1532 # ------------------------ 1533 1533 1534 # Mac-specific rules1535 1536 ifeq ($(OS),MACOS)1537 1538 all : CharsetData.cpp1539 1540 # --------1541 1542 # character set name table1543 1544 ifeq ($(WTF_PLATFORM_IOS),1)1545 ENCODINGS_FILENAME := ios-encodings.txt1546 else1547 ENCODINGS_FILENAME := mac-encodings.txt1548 endif # WTF_PLATFORM_IOS1549 1550 CharsetData.cpp : platform/text/mac/make-charset-table.pl platform/text/mac/character-sets.txt platform/text/mac/$(ENCODINGS_FILENAME)1551 $(PERL) $^ kTextEncoding > $@1552 1553 # --------1554 1555 endif # MACOS1556 -
trunk/Source/WebCore/PlatformMac.cmake
r224846 r225027 139 139 ) 140 140 141 #FIXME: Use ios-encodings.txt once we get CMake working for iOS.142 add_custom_command(143 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp144 MAIN_DEPENDENCY ${WEBCORE_DIR}/platform/text/mac/make-charset-table.pl145 DEPENDS platform/text/mac/character-sets.txt146 DEPENDS platform/text/mac/mac-encodings.txt147 COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/platform/text/mac/make-charset-table.pl ${WEBCORE_DIR}/platform/text/mac/character-sets.txt ${WEBCORE_DIR}/platform/text/mac/mac-encodings.txt kTextEncoding > ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp148 VERBATIM)149 150 list(APPEND WebCore_DERIVED_SOURCES151 ${DERIVED_SOURCES_WEBCORE_DIR}/CharsetData.cpp152 )153 154 141 list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES 155 142 "${CMAKE_OSX_SYSROOT}/usr/include/libxslt" … … 480 467 platform/text/mac/LocaleMac.mm 481 468 platform/text/mac/TextBoundaries.mm 482 platform/text/mac/TextCodecMac.cpp483 469 platform/text/mac/TextEncodingRegistryMac.mm 484 470 -
trunk/Source/WebCore/SourcesMac.txt
r224123 r225027 113 113 platform/network/mac/NetworkStateNotifierMac.cpp 114 114 115 platform/text/mac/TextCodecMac.cpp116 115 platform/text/mac/TextEncodingRegistryMac.mm 117 116 -
trunk/Source/WebCore/WebCore.order
r224387 r225027 16130 16130 __ZN7WebCore12TextCodecICU21registerEncodingNamesEPFvPKcS2_E 16131 16131 __ZN7WebCore12TextCodecICU14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E 16132 __ZN7WebCore12TextCodecMac21registerEncodingNamesEPFvPKcS2_E16133 __ZN7WebCore12TextCodecMac14registerCodecsEPFvPKcPFN3WTF10PassOwnPtrINS_9TextCodecEEERKNS_12TextEncodingEPKvESB_E16134 16132 __ZN3WTF6VectorIPKcLm0ENS_15CrashOnOverflowEE14expandCapacityEmPKS2_ 16135 16133 __ZN3WTF6VectorIPKcLm0ENS_15CrashOnOverflowEE15reserveCapacityEm … … 23708 23706 __ZTVN7WebCore12TextCodecICUE 23709 23707 __ZTVN7WebCore15TextCodecLatin1E 23710 __ZTVN7WebCore12TextCodecMacE23711 23708 __ZTVN7WebCore20TextCodecUserDefinedE 23712 23709 __ZTVN7WebCore14TextCodecUTF16E -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r225009 r225027 1597 1597 538EC9331F99B9F7004D22A8 /* JSMockCDMFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF4B72E1E03CA4A00E235A2 /* JSMockCDMFactory.h */; }; 1598 1598 538EC9341F99B9F7004D22A8 /* JSMockPageOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D6F3E931C1F85550061DBD4 /* JSMockPageOverlay.h */; }; 1599 538EC93B1F99BE50004D22A8 /* CharsetData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 656581AC09D14EE6000E61D7 /* CharsetData.cpp */; };1600 1599 538EC93E1F99BF5A004D22A8 /* JSQuickTimePluginReplacement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 077664FA183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp */; }; 1601 1600 538F10A81F9022A4005102CE /* SoftLinkLibxslt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 538F10A31F900BDC005102CE /* SoftLinkLibxslt.cpp */; }; … … 3296 3295 B2A1F2B10CEF0ABF00442F6A /* SVGMissingGlyphElement.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A1F2A80CEF0ABF00442F6A /* SVGMissingGlyphElement.h */; }; 3297 3296 B2AFFC7E0D00A5C10030074D /* FontCustomPlatformData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AFFC760D00A5C10030074D /* FontCustomPlatformData.h */; }; 3298 B2AFFC9A0D00A5DF0030074D /* TextCodecMac.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AFFC8F0D00A5DF0030074D /* TextCodecMac.h */; };3299 3297 B2B1F7170D00CAA8004AEA64 /* PointerEventsHitRules.h in Headers */ = {isa = PBXBuildFile; fileRef = B2B1F7150D00CAA8004AEA64 /* PointerEventsHitRules.h */; }; 3300 3298 B2C3DA240D006C1D00EF6F26 /* BidiContext.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9F30D006C1D00EF6F26 /* BidiContext.h */; settings = {ATTRIBUTES = (Private, ); }; }; 3301 3299 B2C3DA250D006C1D00EF6F26 /* BidiResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9F40D006C1D00EF6F26 /* BidiResolver.h */; settings = {ATTRIBUTES = (Private, ); }; }; 3302 B2C3DA2A0D006C1D00EF6F26 /* CharsetData.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9FA0D006C1D00EF6F26 /* CharsetData.h */; settings = {ATTRIBUTES = (Private, ); }; };3303 3300 B2C3DA2F0D006C1D00EF6F26 /* SegmentedString.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3D9FF0D006C1D00EF6F26 /* SegmentedString.h */; settings = {ATTRIBUTES = (Private, ); }; }; 3304 3301 B2C3DA340D006C1D00EF6F26 /* TextBoundaries.h in Headers */ = {isa = PBXBuildFile; fileRef = B2C3DA040D006C1D00EF6F26 /* TextBoundaries.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 5410 5407 0F4966A91DB40C4300A274BB /* JSDOMPointReadOnly.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMPointReadOnly.h; sourceTree = "<group>"; }; 5411 5408 0F4E57161313276200CF85AF /* RenderSVGAllInOne.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGAllInOne.cpp; sourceTree = "<group>"; }; 5412 0F54DCCC1880C6AB003EEDBB /* ios-encodings.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "ios-encodings.txt"; sourceTree = "<group>"; };5413 5409 0F54DCE31881051D003EEDBB /* TextAutoSizing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextAutoSizing.cpp; sourceTree = "<group>"; }; 5414 5410 0F54DCE41881051D003EEDBB /* TextAutoSizing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextAutoSizing.h; sourceTree = "<group>"; }; … … 8396 8392 6565814709D13043000E61D7 /* CSSValueKeywords.gperf */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSValueKeywords.gperf; sourceTree = "<group>"; }; 8397 8393 6565814809D13043000E61D7 /* CSSValueKeywords.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSValueKeywords.h; sourceTree = "<group>"; }; 8398 656581AC09D14EE6000E61D7 /* CharsetData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CharsetData.cpp; sourceTree = "<group>"; };8399 8394 656581AE09D14EE6000E61D7 /* UserAgentStyleSheets.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = UserAgentStyleSheets.h; sourceTree = "<group>"; }; 8400 8395 656581AF09D14EE6000E61D7 /* UserAgentStyleSheetsData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = UserAgentStyleSheetsData.cpp; sourceTree = "<group>"; }; … … 11787 11782 B2AFFC780D00A5C10030074D /* FontCascadeCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontCascadeCocoa.mm; sourceTree = "<group>"; }; 11788 11783 B2AFFC7B0D00A5C10030074D /* GlyphPageMac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GlyphPageMac.cpp; sourceTree = "<group>"; }; 11789 B2AFFC850D00A5DF0030074D /* character-sets.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "character-sets.txt"; sourceTree = "<group>"; };11790 B2AFFC860D00A5DF0030074D /* mac-encodings.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "mac-encodings.txt"; sourceTree = "<group>"; };11791 B2AFFC870D00A5DF0030074D /* make-charset-table.pl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.perl; path = "make-charset-table.pl"; sourceTree = "<group>"; };11792 11784 B2AFFC8C0D00A5DF0030074D /* TextBoundaries.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = TextBoundaries.mm; sourceTree = "<group>"; }; 11793 B2AFFC8E0D00A5DF0030074D /* TextCodecMac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextCodecMac.cpp; sourceTree = "<group>"; };11794 B2AFFC8F0D00A5DF0030074D /* TextCodecMac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextCodecMac.h; sourceTree = "<group>"; };11795 11785 B2B1F7140D00CAA8004AEA64 /* PointerEventsHitRules.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PointerEventsHitRules.cpp; sourceTree = "<group>"; }; 11796 11786 B2B1F7150D00CAA8004AEA64 /* PointerEventsHitRules.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PointerEventsHitRules.h; sourceTree = "<group>"; }; … … 11798 11788 B2C3D9F30D006C1D00EF6F26 /* BidiContext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BidiContext.h; sourceTree = "<group>"; }; 11799 11789 B2C3D9F40D006C1D00EF6F26 /* BidiResolver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BidiResolver.h; sourceTree = "<group>"; }; 11800 B2C3D9FA0D006C1D00EF6F26 /* CharsetData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CharsetData.h; sourceTree = "<group>"; };11801 11790 B2C3D9FE0D006C1D00EF6F26 /* SegmentedString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentedString.cpp; sourceTree = "<group>"; }; 11802 11791 B2C3D9FF0D006C1D00EF6F26 /* SegmentedString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SegmentedString.h; sourceTree = "<group>"; }; … … 18053 18042 9908B0F31BCACFFE00ED0F65 /* ByteLengthQueuingStrategyBuiltins.cpp */, 18054 18043 9908B0F51BCAD07D00ED0F65 /* ByteLengthQueuingStrategyBuiltins.h */, 18055 656581AC09D14EE6000E61D7 /* CharsetData.cpp */,18056 18044 E406F3FB1198307D009D59D6 /* ColorData.cpp */, 18057 18045 9908B0F61BCAD07D00ED0F65 /* CountQueuingStrategyBuiltins.cpp */, … … 22855 22843 isa = PBXGroup; 22856 22844 children = ( 22857 B2AFFC850D00A5DF0030074D /* character-sets.txt */,22858 B2C3D9FA0D006C1D00EF6F26 /* CharsetData.h */,22859 0F54DCCC1880C6AB003EEDBB /* ios-encodings.txt */,22860 22845 F5973DDE15CFB2030027F804 /* LocaleMac.h */, 22861 22846 F5973DDF15CFB2030027F804 /* LocaleMac.mm */, 22862 B2AFFC860D00A5DF0030074D /* mac-encodings.txt */,22863 B2AFFC870D00A5DF0030074D /* make-charset-table.pl */,22864 22847 B2AFFC8C0D00A5DF0030074D /* TextBoundaries.mm */, 22865 B2AFFC8E0D00A5DF0030074D /* TextCodecMac.cpp */,22866 B2AFFC8F0D00A5DF0030074D /* TextCodecMac.h */,22867 22848 A1F55DC41F54D3F000EDB75F /* TextEncodingRegistryMac.mm */, 22868 22849 ); … … 26242 26223 C5592F781A92AA28001F8862 /* CharacterProperties.h in Headers */, 26243 26224 97B8FFD116AE7F960038388D /* CharacterReferenceParserInlines.h in Headers */, 26244 B2C3DA2A0D006C1D00EF6F26 /* CharsetData.h in Headers */,26245 26225 F55B3DB21251F12D003EF269 /* CheckboxInputType.h in Headers */, 26246 26226 D619A308144E00BE004BC302 /* ChildListMutationScope.h in Headers */, … … 29427 29407 B2C3DA3C0D006C1D00EF6F26 /* TextCodecICU.h in Headers */, 29428 29408 B2C3DA3E0D006C1D00EF6F26 /* TextCodecLatin1.h in Headers */, 29429 B2AFFC9A0D00A5DF0030074D /* TextCodecMac.h in Headers */,29430 29409 57EF5E601D20C83900171E60 /* TextCodecReplacement.h in Headers */, 29431 29410 B2C3DA400D006C1D00EF6F26 /* TextCodecUserDefined.h in Headers */, … … 30234 30213 CDDE02F018B5651300CF7FF1 /* CDMSessionAVStreamSession.mm in Sources */, 30235 30214 CDE5959D1BF2757100A1CBE8 /* CDMSessionMediaSourceAVFObjC.mm in Sources */, 30236 538EC93B1F99BE50004D22A8 /* CharsetData.cpp in Sources */,30237 30215 A14090FB1AA51E1D0091191A /* ContentFilterUnblockHandlerCocoa.mm in Sources */, 30238 30216 07AFF4231EFB144900B545B3 /* CoreAudioCaptureSourceIOS.mm in Sources */, -
trunk/Source/WebCore/platform/ThreadGlobalData.cpp
r223728 r225027 38 38 #include <wtf/text/StringImpl.h> 39 39 40 #if PLATFORM(MAC)41 #include "TextCodecMac.h"42 #endif43 44 40 namespace WebCore { 45 41 … … 53 49 #endif 54 50 , m_cachedConverterICU(std::make_unique<ICUConverterWrapper>()) 55 #if PLATFORM(MAC)56 , m_cachedConverterTEC(std::make_unique<TECConverterWrapper>())57 #endif58 51 { 59 52 // This constructor will have been called on the main thread before being called on … … 68 61 void ThreadGlobalData::destroy() 69 62 { 70 #if PLATFORM(MAC)71 m_cachedConverterTEC = nullptr;72 #endif73 74 63 m_cachedConverterICU = nullptr; 75 64 -
trunk/Source/WebCore/platform/ThreadGlobalData.h
r220569 r225027 39 39 struct EventNames; 40 40 struct ICUConverterWrapper; 41 struct TECConverterWrapper;42 41 43 42 #if USE(WEB_THREAD) … … 60 59 ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU; } 61 60 62 #if PLATFORM(MAC)63 TECConverterWrapper& cachedConverterTEC() { return *m_cachedConverterTEC; }64 #endif65 66 61 #if USE(WEB_THREAD) 67 62 void setWebCoreThreadData(); … … 80 75 std::unique_ptr<ICUConverterWrapper> m_cachedConverterICU; 81 76 82 #if PLATFORM(MAC)83 std::unique_ptr<TECConverterWrapper> m_cachedConverterTEC;84 #endif85 86 77 WEBCORE_EXPORT friend ThreadGlobalData& threadGlobalData(); 87 78 }; -
trunk/Source/WebCore/platform/text/TextCodecICU.cpp
r224747 r225027 155 155 DECLARE_ENCODING_NAME("x-mac-turkish", x_mac_turkish), 156 156 DECLARE_ENCODING_NAME("Big5-HKSCS", Big5_HKSCS), 157 DECLARE_ENCODING_NAME_NO_ALIASES("EUC-TW"), 157 158 }; 158 159 -
trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp
r224701 r225027 44 44 #include <wtf/StringExtras.h> 45 45 46 #if PLATFORM(MAC)47 #include "TextCodecMac.h"48 #endif49 50 46 #include <wtf/CurrentTime.h> 51 47 #include <wtf/text/CString.h> … … 268 264 TextCodecICU::registerCodecs(addToTextCodecMap); 269 265 270 #if PLATFORM(MAC)271 TextCodecMac::registerEncodingNames(addToTextEncodingNameMap);272 TextCodecMac::registerCodecs(addToTextCodecMap);273 #endif274 275 266 pruneBlacklistedCodecs(); 276 267 buildQuirksSets();
Note: See TracChangeset
for help on using the changeset viewer.