Changeset 95128 in webkit


Ignore:
Timestamp:
Sep 14, 2011 3:14:33 PM (13 years ago)
Author:
andersca@apple.com
Message:

Remove DocTypeStrings.gperf
​https://bugs.webkit.org/show_bug.cgi?id=68119

Reviewed by Sam Weinig.

  • CMakeLists.txt:
  • CodeGenerators.pri:
  • DerivedSources.make:
  • GNUmakefile.am:
  • WebCore.gyp/WebCore.gyp:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • html/DocTypeStrings.gperf: Removed.
  • make-hash-tools.pl:
  • platform/HashTools.h:
Location:
trunk/Source/WebCore
Files:
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r95001 r95128  
    22292229
    22302230
    2231 MAKE_HASH_TOOLS(${WEBCORE_DIR}/html/DocTypeStrings)
    2232 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/DocTypeStrings.cpp)
    2233 
    2234 
    22352231# Generate XMLViewerCSS.h
    22362232ADD_CUSTOM_COMMAND(

  • trunk/Source/WebCore/ChangeLog

    r95124 r95128  
     12011-09-14  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove DocTypeStrings.gperf
     4        https://bugs.webkit.org/show_bug.cgi?id=68119
     5
     6        Reviewed by Sam Weinig.
     7
     8        * CMakeLists.txt:
     9        * CodeGenerators.pri:
     10        * DerivedSources.make:
     11        * GNUmakefile.am:
     12        * WebCore.gyp/WebCore.gyp:
     13        * WebCore.vcproj/WebCore.vcproj:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * html/DocTypeStrings.gperf: Removed.
     16        * make-hash-tools.pl:
     17        * platform/HashTools.h:
     18
    1192011-09-14  Chris Rogers  <crogers@google.com>
    220

  • trunk/Source/WebCore/CodeGenerators.pri

    r94866 r95128  
    1717
    1818TOKENIZER = $$PWD/css/tokenizer.flex
    19 
    20 DOCTYPESTRINGS_GPERF = $$PWD/html/DocTypeStrings.gperf
    2119
    2220CSSBISON = $$PWD/css/CSSGrammar.y
    … …  
    783781
    784782# GENERATOR 8-B:
    785 doctypestrings.output = $${WC_GENERATED_SOURCES_DIR}/DocTypeStrings.cpp
    786 doctypestrings.input = DOCTYPESTRINGS_GPERF
    787 doctypestrings.wkScript = $$PWD/make-hash-tools.pl
    788 doctypestrings.commands = perl $$doctypestrings.wkScript $${WC_GENERATED_SOURCES_DIR} $$DOCTYPESTRINGS_GPERF
    789 doctypestrings.clean = ${QMAKE_FILE_OUT}
    790 doctypestrings.depends = $$PWD/make-hash-tools.pl
    791 addExtraCompiler(doctypestrings)
    792 
    793 # GENERATOR 8-C:
    794783colordata.output = $${WC_GENERATED_SOURCES_DIR}/ColorData.cpp
    795784colordata.input = COLORDATA_GPERF
    … …  
    802791contains(DEFINES, ENABLE_XSLT=1) {
    803792contains(DEFINES, WTF_USE_LIBXML2=1) {
    804 # GENERATOR 8-D:
     793# GENERATOR 8-C:
    805794xmlviewercss.output = $${WC_GENERATED_SOURCES_DIR}/XMLViewerCSS.h
    806795xmlviewercss.input = XMLVIEWER_CSS
    … …  
    812801addExtraCompiler(xmlviewercss)
    813802
    814 # GENERATOR 8-E:
     803# GENERATOR 8-D:
    815804xmlviewerjs.output = $${WC_GENERATED_SOURCES_DIR}/XMLViewerJS.h
    816805xmlviewerjs.input = XMLVIEWER_JS

  • trunk/Source/WebCore/DerivedSources.make

    r95107 r95128  
    592592    CSSValueKeywords.h \
    593593    ColorData.cpp \
    594     DocTypeStrings.cpp \
    595594    HTMLElementFactory.cpp \
    596595    HTMLEntityTable.cpp \
    … …  
    673672# --------
    674673
    675 # DOCTYPE strings
    676 
    677 DocTypeStrings.cpp : html/DocTypeStrings.gperf $(WebCore)/make-hash-tools.pl
    678         perl $(WebCore)/make-hash-tools.pl . $(WebCore)/html/DocTypeStrings.gperf
    679 
    680 # --------
    681 
    682674# XMLViewer CSS
    683675

  • trunk/Source/WebCore/GNUmakefile.am

    r95107 r95128  
    625625        mv CSSValueKeywords* $(GENSOURCES_WEBCORE)
    626626
    627 # DOCTYPE strings
    628 DerivedSources/WebCore/HashTools.h: DerivedSources/WebCore/DocTypeStrings.cpp
    629 DerivedSources/WebCore/DocTypeStrings.cpp: $(WebCore)/html/DocTypeStrings.gperf $(WebCore)/make-hash-tools.pl
    630         $(PERL) $(WebCore)/make-hash-tools.pl $(GENSOURCES_WEBCORE) $(WebCore)/html/DocTypeStrings.gperf
    631 
    632627# XML Viewer CSS
    633628DerivedSources/WebCore/XMLViewerCSS.h: $(WebCore)/xml/XMLViewer.css
    … …  
    908903        Source/WebCore/css/WebKitFontFamilyNames.in \
    909904        Source/WebCore/dom/make_names.pl \
    910         Source/WebCore/html/DocTypeStrings.gperf \
    911905        Source/WebCore/html/HTMLAttributeNames.in \
    912906        Source/WebCore/html/HTMLTagNames.in \

  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r95035 r95128  
    467467
    468468        # gperf rule
    469         '../html/DocTypeStrings.gperf',
    470469        '../platform/ColorData.gperf',
    471470
    … …  
    978977
    979978        # Additional .cpp files for HashTools.h
    980         '<(SHARED_INTERMEDIATE_DIR)/webkit/DocTypeStrings.cpp',
    981979        '<(SHARED_INTERMEDIATE_DIR)/webkit/ColorData.cpp',
    982980        '<(SHARED_INTERMEDIATE_DIR)/webkit/CSSPropertyNames.cpp',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r94855 r95128  
    487487                        </File>
    488488                        <File
    489                                 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\DocTypeStrings.cpp"
    490                                 >
    491                         </File>
    492                         <File
    493489                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\HashTools.h"
    494490                                >

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r94900 r95128  
    475475                1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */; };
    476476                1ABA76CB11D20E57004C201C /* CSSValueKeywords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E41EA0391198374900710BC5 /* CSSValueKeywords.cpp */; };
    477                 1ABA76CC11D20E5B004C201C /* DocTypeStrings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E406F3FA1198304D009D59D6 /* DocTypeStrings.cpp */; };
    478477                1ABFE7530CD968D000FE4834 /* SQLTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ABFE7520CD968D000FE4834 /* SQLTransaction.cpp */; };
    479478                1AC2260C0DB69F190089B669 /* JSDOMApplicationCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC2260A0DB69F190089B669 /* JSDOMApplicationCache.cpp */; };
    … …  
    1239512394                E1FF57A20F01255B00891EBB /* ThreadGlobalData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadGlobalData.h; sourceTree = "<group>"; };
    1239612395                E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadGlobalData.cpp; sourceTree = "<group>"; };
    12397                 E406F3FA1198304D009D59D6 /* DocTypeStrings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocTypeStrings.cpp; sourceTree = "<group>"; };
    1239812396                E406F3FB1198307D009D59D6 /* ColorData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorData.cpp; sourceTree = "<group>"; };
    1239912397                E415F10C0D9A05870033CE97 /* ElementTimeControl.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ElementTimeControl.idl; sourceTree = "<group>"; };
    … …  
    1440314401                                6565814709D13043000E61D7 /* CSSValueKeywords.gperf */,
    1440414402                                6565814809D13043000E61D7 /* CSSValueKeywords.h */,
    14405                                 E406F3FA1198304D009D59D6 /* DocTypeStrings.cpp */,
    1440614403                                A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */,
    1440714404                                A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */,
    … …  
    2410324100                                A1E1154413015C3D0054AC8C /* DistantLightSource.cpp in Sources */,
    2410424101                                B2F34FE90E82F82700F627CD /* DNSCFNet.cpp in Sources */,
    24105                                 1ABA76CC11D20E5B004C201C /* DocTypeStrings.cpp in Sources */,
    2410624102                                A8185F3C09765766005826D9 /* Document.cpp in Sources */,
    2410724103                                A8185F3F09765766005826D9 /* DocumentFragment.cpp in Sources */,

  • trunk/Source/WebCore/make-hash-tools.pl

    r89265 r95128  
    2828
    2929
    30 if ($option eq "DocTypeStrings") {
    31 
    32     my $docTypeStringsGenerated    = "$outdir/DocTypeStrings.cpp";
    33     my $docTypeStringsGperf        = $ARGV[0];
    34     shift;
    35 
    36     system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
    37 
    38 } elsif ($option eq "ColorData") {
     30if ($option eq "ColorData") {
    3931
    4032    my $colorDataGenerated         = "$outdir/ColorData.cpp";

  • trunk/Source/WebCore/platform/HashTools.h

    r72664 r95128  
    2323namespace WebCore {
    2424
    25 struct PubIDInfo {
    26     enum eMode {
    27         eQuirks,
    28         eQuirks3,
    29         eAlmostStandards
    30     };
    31 
    32     const char* name;
    33     eMode mode_if_no_sysid;
    34     eMode mode_if_sysid;
    35 };
    36 
    3725struct NamedColor {
    3826    const char* name;
    … …  
    5038};
    5139
    52 const PubIDInfo* findDoctypeEntry(register const char* str, register unsigned int len);
    5340const NamedColor* findColor(register const char* str, register unsigned int len);
    5441const Property* findProperty(register const char* str, register unsigned int len);
Note: See TracChangeset for help on using the changeset viewer.