Remove DocTypeStrings.gperf
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Sep 2011 22:14:33 +0000 (22:14 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Sep 2011 22:14:33 +0000 (22:14 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@95128 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/CodeGenerators.pri
Source/WebCore/DerivedSources.make
Source/WebCore/GNUmakefile.am
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/html/DocTypeStrings.gperf [deleted file]
Source/WebCore/make-hash-tools.pl
Source/WebCore/platform/HashTools.h

index 39235fe..5585dc1 100644 (file)
@@ -2228,10 +2228,6 @@ MAKE_HASH_TOOLS(${WEBCORE_DIR}/platform/ColorData)
 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/ColorData.cpp)
 
 
-MAKE_HASH_TOOLS(${WEBCORE_DIR}/html/DocTypeStrings)
-LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/DocTypeStrings.cpp)
-
-
 # Generate XMLViewerCSS.h
 ADD_CUSTOM_COMMAND(
     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/XMLViewerCSS.h
index 7112032..53b34f7 100644 (file)
@@ -1,3 +1,21 @@
+2011-09-14  Anders Carlsson  <andersca@apple.com>
+
+        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:
+
 2011-09-14  Chris Rogers  <crogers@google.com>
 
         Address lifetime issues in OfflineAudioDestinationNode (take 2)
index e5a3544..8a1ba19 100644 (file)
@@ -17,8 +17,6 @@ XLINK_NAMES = $$PWD/svg/xlinkattrs.in
 
 TOKENIZER = $$PWD/css/tokenizer.flex
 
-DOCTYPESTRINGS_GPERF = $$PWD/html/DocTypeStrings.gperf
-
 CSSBISON = $$PWD/css/CSSGrammar.y
 
 contains(DEFINES, ENABLE_XSLT=1) {
@@ -782,15 +780,6 @@ entities.depends = $$PWD/html/parser/create-html-entity-table
 addExtraCompiler(entities)
 
 # GENERATOR 8-B:
-doctypestrings.output = $${WC_GENERATED_SOURCES_DIR}/DocTypeStrings.cpp
-doctypestrings.input = DOCTYPESTRINGS_GPERF
-doctypestrings.wkScript = $$PWD/make-hash-tools.pl
-doctypestrings.commands = perl $$doctypestrings.wkScript $${WC_GENERATED_SOURCES_DIR} $$DOCTYPESTRINGS_GPERF
-doctypestrings.clean = ${QMAKE_FILE_OUT}
-doctypestrings.depends = $$PWD/make-hash-tools.pl
-addExtraCompiler(doctypestrings)
-
-# GENERATOR 8-C:
 colordata.output = $${WC_GENERATED_SOURCES_DIR}/ColorData.cpp
 colordata.input = COLORDATA_GPERF
 colordata.wkScript = $$PWD/make-hash-tools.pl
@@ -801,7 +790,7 @@ addExtraCompiler(colordata)
 
 contains(DEFINES, ENABLE_XSLT=1) {
 contains(DEFINES, WTF_USE_LIBXML2=1) {
-# GENERATOR 8-D:
+# GENERATOR 8-C:
 xmlviewercss.output = $${WC_GENERATED_SOURCES_DIR}/XMLViewerCSS.h
 xmlviewercss.input = XMLVIEWER_CSS
 xmlviewercss.wkScript = $$PWD/inspector/xxd.pl
@@ -811,7 +800,7 @@ xmlviewercss.depends = $$PWD/inspector/xxd.pl
 xmlviewercss.wkAddOutputToSources = false
 addExtraCompiler(xmlviewercss)
 
-# GENERATOR 8-E:
+# GENERATOR 8-D:
 xmlviewerjs.output = $${WC_GENERATED_SOURCES_DIR}/XMLViewerJS.h
 xmlviewerjs.input = XMLVIEWER_JS
 xmlviewerjs.wkScript = $$PWD/inspector/xxd.pl
index 2443c46..474521b 100644 (file)
@@ -591,7 +591,6 @@ all : \
     CSSPropertyNames.h \
     CSSValueKeywords.h \
     ColorData.cpp \
-    DocTypeStrings.cpp \
     HTMLElementFactory.cpp \
     HTMLEntityTable.cpp \
     HTMLNames.cpp \
@@ -672,13 +671,6 @@ CSSValueKeywords.h : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl
 
 # --------
 
-# DOCTYPE strings
-
-DocTypeStrings.cpp : html/DocTypeStrings.gperf $(WebCore)/make-hash-tools.pl
-       perl $(WebCore)/make-hash-tools.pl . $(WebCore)/html/DocTypeStrings.gperf
-
-# --------
-
 # XMLViewer CSS
 
 all : XMLViewerCSS.h
index b61ad1b..d78557b 100644 (file)
@@ -624,11 +624,6 @@ DerivedSources/WebCore/CSSValueKeywords.h: $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCo
        $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_DEFINES)"
        mv CSSValueKeywords* $(GENSOURCES_WEBCORE)
 
-# DOCTYPE strings
-DerivedSources/WebCore/HashTools.h: DerivedSources/WebCore/DocTypeStrings.cpp
-DerivedSources/WebCore/DocTypeStrings.cpp: $(WebCore)/html/DocTypeStrings.gperf $(WebCore)/make-hash-tools.pl
-       $(PERL) $(WebCore)/make-hash-tools.pl $(GENSOURCES_WEBCORE) $(WebCore)/html/DocTypeStrings.gperf
-
 # XML Viewer CSS
 DerivedSources/WebCore/XMLViewerCSS.h: $(WebCore)/xml/XMLViewer.css
        $(PERL) $(WebCore)/inspector/xxd.pl XMLViewer_css $(WebCore)/xml/XMLViewer.css $(GENSOURCES_WEBCORE)/XMLViewerCSS.h
@@ -907,7 +902,6 @@ EXTRA_DIST += \
        Source/WebCore/css/view-source.css \
        Source/WebCore/css/WebKitFontFamilyNames.in \
        Source/WebCore/dom/make_names.pl \
-       Source/WebCore/html/DocTypeStrings.gperf \
        Source/WebCore/html/HTMLAttributeNames.in \
        Source/WebCore/html/HTMLTagNames.in \
        Source/WebCore/html/parser/create-html-entity-table \
index 40664f2..f66d30b 100644 (file)
         '../xml/XPathGrammar.y',
 
         # gperf rule
-        '../html/DocTypeStrings.gperf',
         '../platform/ColorData.gperf',
 
         # idl rules
         '<@(derived_sources_aggregate_files)',
 
         # Additional .cpp files for HashTools.h
-        '<(SHARED_INTERMEDIATE_DIR)/webkit/DocTypeStrings.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/ColorData.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/CSSPropertyNames.cpp',
         '<(SHARED_INTERMEDIATE_DIR)/webkit/CSSValueKeywords.cpp',
index 0a6e0ea..dfa3b9f 100755 (executable)
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\DocTypeStrings.cpp"
-                               >
-                       </File>
-                       <File
                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\HashTools.h"
                                >
                        </File>
index 8eeb590..7b7e804 100644 (file)
                1ABA76C911D20E47004C201C /* ColorData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E406F3FB1198307D009D59D6 /* ColorData.cpp */; };
                1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */; };
                1ABA76CB11D20E57004C201C /* CSSValueKeywords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E41EA0391198374900710BC5 /* CSSValueKeywords.cpp */; };
-               1ABA76CC11D20E5B004C201C /* DocTypeStrings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E406F3FA1198304D009D59D6 /* DocTypeStrings.cpp */; };
                1ABFE7530CD968D000FE4834 /* SQLTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ABFE7520CD968D000FE4834 /* SQLTransaction.cpp */; };
                1AC2260C0DB69F190089B669 /* JSDOMApplicationCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC2260A0DB69F190089B669 /* JSDOMApplicationCache.cpp */; };
                1AC2260D0DB69F190089B669 /* JSDOMApplicationCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC2260B0DB69F190089B669 /* JSDOMApplicationCache.h */; };
                E1F1E82E0C3C2BB9006DB391 /* XSLTExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XSLTExtensions.h; sourceTree = "<group>"; };
                E1FF57A20F01255B00891EBB /* ThreadGlobalData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadGlobalData.h; sourceTree = "<group>"; };
                E1FF57A50F01256B00891EBB /* ThreadGlobalData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadGlobalData.cpp; sourceTree = "<group>"; };
-               E406F3FA1198304D009D59D6 /* DocTypeStrings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocTypeStrings.cpp; sourceTree = "<group>"; };
                E406F3FB1198307D009D59D6 /* ColorData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ColorData.cpp; sourceTree = "<group>"; };
                E415F10C0D9A05870033CE97 /* ElementTimeControl.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ElementTimeControl.idl; sourceTree = "<group>"; };
                E415F1680D9A165D0033CE97 /* DOMElementTimeControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMElementTimeControl.h; sourceTree = "<group>"; };
                                E41EA0391198374900710BC5 /* CSSValueKeywords.cpp */,
                                6565814709D13043000E61D7 /* CSSValueKeywords.gperf */,
                                6565814809D13043000E61D7 /* CSSValueKeywords.h */,
-                               E406F3FA1198304D009D59D6 /* DocTypeStrings.cpp */,
                                A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */,
                                A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */,
                                A8BC04911214F69600B5F122 /* HTMLEntityTable.cpp */,
                                FD31609012B026F700C1A359 /* Distance.cpp in Sources */,
                                A1E1154413015C3D0054AC8C /* DistantLightSource.cpp in Sources */,
                                B2F34FE90E82F82700F627CD /* DNSCFNet.cpp in Sources */,
-                               1ABA76CC11D20E5B004C201C /* DocTypeStrings.cpp in Sources */,
                                A8185F3C09765766005826D9 /* Document.cpp in Sources */,
                                A8185F3F09765766005826D9 /* DocumentFragment.cpp in Sources */,
                                93E227E00AF589AD00D48324 /* DocumentLoader.cpp in Sources */,
diff --git a/Source/WebCore/html/DocTypeStrings.gperf b/Source/WebCore/html/DocTypeStrings.gperf
deleted file mode 100644 (file)
index 2e2a7e8..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-%{
-#include "HashTools.h"
-#include <string.h>
-
-namespace WebCore {
-%}
-%struct-type
-struct PubIDInfo;
-%omit-struct-type
-%language=C++
-%readonly-tables
-%global-table
-%compare-strncmp
-%define class-name DocTypeStringsHash
-%define initializer-suffix ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards
-%define lookup-function-name findDoctypeEntryImpl
-%define hash-function-name doctype_hash_function
-%enum
-%%
-"+//silmaril//dtd html pro v0r11 19970101//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//advasoft ltd//dtd html 3.0 aswedit + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//as//dtd html 3.0 aswedit + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 2.0 level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 2.0 level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 2.0 strict level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 2.0 strict level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 2.0 strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 2.1e//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 3.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 3.2 final//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 3.2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html level 0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html level 0//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html level 1//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html level 2//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html level 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html level 3//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html strict level 0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html strict level 0//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html strict level 1//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html strict level 1//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html strict level 2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html strict level 2//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html strict level 3//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html strict level 3//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html strict//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html strict//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html//en//2.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//ietf//dtd html//en//3.0", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//metrius//dtd metrius presentational//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks
-"-//microsoft//dtd internet explorer 2.0 html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//microsoft//dtd internet explorer 2.0 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//microsoft//dtd internet explorer 2.0 tables//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//microsoft//dtd internet explorer 3.0 html strict//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//microsoft//dtd internet explorer 3.0 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//microsoft//dtd internet explorer 3.0 tables//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//netscape comm. corp.//dtd html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//netscape comm. corp.//dtd strict html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//o'reilly and associates//dtd html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//o'reilly and associates//dtd html extended 1.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//o'reilly and associates//dtd html extended relaxed 1.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks
-"-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks
-"-//spyglass//dtd html 2.0 extended//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//sq//dtd html 2.0 hotmetal + extensions//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//sun microsystems corp.//dtd hotjava html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//sun microsystems corp.//dtd hotjava strict html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w30//dtd w3 html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w3c//dtd html 3 1995-03-24//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w3c//dtd html 3.2 draft//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w3c//dtd html 3.2 final//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w3c//dtd html 3.2//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w3c//dtd html 3.2s draft//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w3c//dtd html 4.0 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks
-"-//w3c//dtd html 4.0 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eQuirks
-"-//w3c//dtd html 4.01 frameset//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards
-"-//w3c//dtd html 4.01 transitional//en", PubIDInfo::eQuirks, PubIDInfo::eAlmostStandards
-"-//w3c//dtd html experimental 19960712//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w3c//dtd html experimental 970421//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w3c//dtd w3 html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w3c//dtd xhtml 1.0 frameset//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards
-"-//w3c//dtd xhtml 1.0 transitional//en", PubIDInfo::eAlmostStandards, PubIDInfo::eAlmostStandards
-"-//w3o//dtd w3 html 3.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w3o//dtd w3 html 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//w3o//dtd w3 html strict 3.0//en//", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//webtechs//dtd mozilla html 2.0//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-//webtechs//dtd mozilla html//en", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-"-/w3c/dtd html 4.0 transitional/en", PubIDInfo::eQuirks, PubIDInfo::eQuirks
-"html", PubIDInfo::eQuirks3, PubIDInfo::eQuirks3
-%%
-const PubIDInfo* findDoctypeEntry(register const char* str, register unsigned int len)
-{
-    return DocTypeStringsHash::findDoctypeEntryImpl(str, len);
-}
-
-} // namespace WebCore
index 2812ce7..bdd7471 100644 (file)
@@ -27,15 +27,7 @@ shift;
 my $option = basename($ARGV[0],".gperf");
 
 
-if ($option eq "DocTypeStrings") {
-
-    my $docTypeStringsGenerated    = "$outdir/DocTypeStrings.cpp";
-    my $docTypeStringsGperf        = $ARGV[0];
-    shift;
-
-    system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
-
-} elsif ($option eq "ColorData") {
+if ($option eq "ColorData") {
 
     my $colorDataGenerated         = "$outdir/ColorData.cpp";
     my $colorDataGperf             = $ARGV[0];
index 4fb0904..3badbde 100644 (file)
 
 namespace WebCore {
 
-struct PubIDInfo {
-    enum eMode {
-        eQuirks,
-        eQuirks3,
-        eAlmostStandards
-    };
-
-    const char* name;
-    eMode mode_if_no_sysid;
-    eMode mode_if_sysid;
-};
-
 struct NamedColor {
     const char* name;
     unsigned ARGBValue;
@@ -49,7 +37,6 @@ struct Value {
     int id;
 };
 
-const PubIDInfo* findDoctypeEntry(register const char* str, register unsigned int len);
 const NamedColor* findColor(register const char* str, register unsigned int len);
 const Property* findProperty(register const char* str, register unsigned int len);
 const Value* findValue(register const char* str, register unsigned int len);