Changeset 68521 in webkit
- Timestamp:
- Sep 28, 2010 9:01:47 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r68405 r68521 1 2010-09-28 Andras Becsi <abecsi@webkit.org> 2 3 Reviewed by Csaba Osztrogonác. 4 5 Undefined reference errors when linking due to gperf and inlining. 6 webkit.org/b/29244 7 8 EFL CMake changes by Leandro Pereira <leandro@profusion.mobi> 9 10 Refactor gperf code generation and usage to fix the debug build with gcc>4.4. 11 Hitherto gperf generated C code, these files were included in multiple C++ files across WebCore 12 to access the functionality provided. This resulted in debug build failure with newer gcc versions 13 because of a behaviour change of gcc, which disables C style inlining in debug mode. 14 The make-hash-tools.pl script lets gperf generate C++ code for all gperf files now, which are compiled 15 in their own compilation unit. 16 The functionality provided by the generated code is wrapped behind HashTools.h, so there is no need 17 for multiple inclusions of generated C files to access these functions. 18 19 * cmake/WebKitMacros.cmake: 20 1 21 2010-09-27 Philippe Normand <pnormand@igalia.com> 2 22 -
trunk/WebCore/CMakeLists.txt
r68440 r68521 537 537 538 538 SET(WebCore_SOURCES 539 ${DERIVED_SOURCES_DIR}/DocTypeStrings.cpp 540 ${DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp 541 ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp 542 ${DERIVED_SOURCES_DIR}/ColorData.cpp 539 543 ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp 540 544 ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp … … 1910 1914 GENERATE_ENTITIES(${WEBCORE_DIR}/html/parser/HTMLEntityNames.in ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/html/parser/create-html-entity-table) 1911 1915 1912 1913 GENERATE_GPERF(${WEBCORE_DIR}/platform/ColorData.gperf ${DERIVED_SOURCES_DIR}/ColorData.cpp findColor "") 1916 MAKE_HASH_TOOLS(${WEBCORE_DIR}/platform/ColorData) 1914 1917 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/platform/graphics/Color.cpp ColorData.cpp) 1915 1918 1916 1917 GENERATE_GPERF(${WEBCORE_DIR}/html/DocTypeStrings.gperf ${DERIVED_SOURCES_DIR}/DocTypeStrings.cpp findDoctypeEntry "-F,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards") 1919 MAKE_HASH_TOOLS(${WEBCORE_DIR}/html/DocTypeStrings) 1918 1920 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLDocument.cpp DocTypeStrings.cpp) 1919 1921 … … 1935 1937 1936 1938 1939 ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/HashTools.h DocTypeStrings.cpp CSSValueKeywords.cpp CSSPropertyNames.cpp ColorData.cpp) 1937 1940 ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSValueKeywords.h) 1938 1941 ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSPropertyNames.h) -
trunk/WebCore/ChangeLog
r68513 r68521 1 2010-09-28 Andras Becsi <abecsi@webkit.org> 2 3 Reviewed by Csaba Osztrogonác. 4 5 Undefined reference errors when linking due to gperf and inlining. 6 webkit.org/b/29244 7 8 EFL CMake changes by Leandro Pereira <leandro@profusion.mobi> 9 10 Refactor gperf code generation and usage to fix the debug build with gcc>4.4. 11 Hitherto gperf generated C code, these files were included in multiple C++ files across WebCore 12 to access the functionality provided. This resulted in debug build failure with newer gcc versions 13 because of a behaviour change of gcc, which disables C style inlining in debug mode. 14 The make-hash-tools.pl script lets gperf generate C++ code for all gperf files now, which are compiled 15 in their own compilation unit. 16 The functionality provided by the generated code is wrapped behind HashTools.h, so there is no need 17 for multiple inclusions of generated C files to access these functions. 18 19 No new tests needed. 20 21 * CMakeLists.txt: 22 * WebCore.gyp/WebCore.gyp: 23 * WebCore.pri: 24 * WebCore.vcproj/WebCore.vcproj: 25 * WebCore.xcodeproj/project.pbxproj: 26 * css/CSSParser.cpp: 27 * css/makeprop.pl: 28 * css/makevalues.pl: 29 * html/DocTypeStrings.gperf: 30 * html/HTMLDocument.cpp: 31 * make-hash-tools.pl: 32 * platform/ColorData.gperf: 33 * platform/graphics/Color.cpp: 34 1 35 2010-09-28 Andreas Kling <andreas.kling@nokia.com> 2 36 -
trunk/WebCore/WebCore.gyp/WebCore.gyp
r67922 r68521 647 647 '<(RULE_INPUT_PATH)', 648 648 ], 649 'process_outputs_as_sources': 0,650 649 }, 651 650 # Rule to build generated JavaScript (V8) bindings from .idl source. … … 743 742 # in webcore_files. 744 743 '<@(derived_sources_aggregate_files)', 744 745 # Additional .cpp files for HashTools.h 746 '<(SHARED_INTERMEDIATE_DIR)/webkit/DocTypeStrings.cpp', 747 '<(SHARED_INTERMEDIATE_DIR)/webkit/ColorData.cpp', 748 '<(SHARED_INTERMEDIATE_DIR)/webkit/CSSPropertyNames.cpp', 749 '<(SHARED_INTERMEDIATE_DIR)/webkit/CSSValueKeywords.cpp', 745 750 746 751 # Additional .cpp files from webcore_bindings_sources actions. -
trunk/WebCore/WebCore.pri
r68440 r68521 548 548 cssprops.input = WALDOCSSPROPS 549 549 cssprops.commands = perl -ne \"print lc\" ${QMAKE_FILE_NAME} $${DASHBOARDSUPPORTCSSPROPERTIES} $${EXTRACSSPROPERTIES} > $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}.in && cd $$WC_GENERATED_SOURCES_DIR && perl $$cssprops.wkScript && $(DEL_FILE) ${QMAKE_FILE_BASE}.in ${QMAKE_FILE_BASE}.gperf 550 cssprops.depends = ${QMAKE_FILE_NAME} $${DASHBOARDSUPPORTCSSPROPERTIES} $${EXTRACSSPROPERTIES} 550 cssprops.depends = ${QMAKE_FILE_NAME} $${DASHBOARDSUPPORTCSSPROPERTIES} $${EXTRACSSPROPERTIES} $$cssprops.wkScript 551 551 addExtraCompiler(cssprops) 552 552 … … 556 556 cssvalues.input = WALDOCSSVALUES 557 557 cssvalues.commands = perl -ne \"print lc\" ${QMAKE_FILE_NAME} $$EXTRACSSVALUES > $${WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}.in && cd $$WC_GENERATED_SOURCES_DIR && perl $$cssvalues.wkScript && $(DEL_FILE) ${QMAKE_FILE_BASE}.in ${QMAKE_FILE_BASE}.gperf 558 cssvalues.depends = ${QMAKE_FILE_NAME} $${EXTRACSSVALUES} 558 cssvalues.depends = ${QMAKE_FILE_NAME} $${EXTRACSSVALUES} $$cssvalues.wkScript 559 559 cssvalues.clean = ${QMAKE_FILE_OUT} ${QMAKE_VAR_WC_GENERATED_SOURCES_DIR}/${QMAKE_FILE_BASE}.h 560 560 addExtraCompiler(cssvalues) -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r68440 r68521 546 546 </File> 547 547 <File 548 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\HashTools.h" 549 > 550 </File> 551 <File 552 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\DocTypeStrings.cpp" 553 > 554 </File> 555 <File 556 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSValueKeywords.cpp" 557 > 558 </File> 559 <File 560 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\CSSPropertyNames.cpp" 561 > 562 </File> 563 <File 564 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\ColorData.cpp" 565 > 566 </File> 567 <File 548 568 RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\InspectorBackendDispatcher.cpp" 549 569 > -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r68500 r68521 496 496 1AB7FC870A8B92EC00D9D37B /* XPathVariableReference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7FC660A8B92EC00D9D37B /* XPathVariableReference.cpp */; }; 497 497 1AB7FC880A8B92EC00D9D37B /* XPathVariableReference.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7FC670A8B92EC00D9D37B /* XPathVariableReference.h */; }; 498 1ABA76C911D20E47004C201C /* ColorData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E406F3FB1198307D009D59D6 /* ColorData.cpp */; }; 499 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */; }; 500 1ABA76CB11D20E57004C201C /* CSSValueKeywords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E41EA0391198374900710BC5 /* CSSValueKeywords.cpp */; }; 501 1ABA76CC11D20E5B004C201C /* DocTypeStrings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E406F3FA1198304D009D59D6 /* DocTypeStrings.cpp */; }; 498 502 1ABFE7530CD968D000FE4834 /* SQLTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ABFE7520CD968D000FE4834 /* SQLTransaction.cpp */; }; 499 503 1AC2260C0DB69F190089B669 /* JSDOMApplicationCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC2260A0DB69F190089B669 /* JSDOMApplicationCache.cpp */; }; … … 20903 20907 buildActionMask = 2147483647; 20904 20908 files = ( 20909 1ABA76C911D20E47004C201C /* ColorData.cpp in Sources */, 20910 1ABA76CA11D20E50004C201C /* CSSPropertyNames.cpp in Sources */, 20911 1ABA76CB11D20E57004C201C /* CSSValueKeywords.cpp in Sources */, 20912 1ABA76CC11D20E5B004C201C /* DocTypeStrings.cpp in Sources */, 20905 20913 B5B5DC69119BB3D5002A8790 /* AbstractDatabase.cpp in Sources */, 20906 20914 41E1B1D00FF5986900576B3B /* AbstractWorker.cpp in Sources */, -
trunk/WebCore/css/CSSParser.cpp
r67882 r68521 63 63 #include "FontFamilyValue.h" 64 64 #include "FontValue.h" 65 #include "HashTools.h" 65 66 #include "MediaList.h" 66 67 #include "MediaQueryExp.h" … … 89 90 using namespace std; 90 91 using namespace WTF; 91 92 #include "CSSPropertyNames.cpp"93 #include "CSSValueKeywords.cpp"94 92 95 93 namespace WebCore { -
trunk/WebCore/css/makeprop.pl
r65942 r68521 42 42 %} 43 43 %struct-type 44 struct Property { 45 const char* name; 46 int id; 47 }; 48 %language=ANSI-C 44 struct Property; 45 %omit-struct-type 46 %language=C++ 49 47 %readonly-tables 50 48 %global-table 51 49 %compare-strncmp 52 %define lookup-function-name findProperty 50 %define class-name CSSPropertyNamesHash 51 %define lookup-function-name findPropertyImpl 53 52 %define hash-function-name propery_hash_function 54 53 %define word-array-name property_wordlist … … 72 71 #ifndef CSSPropertyNames_h 73 72 #define CSSPropertyNames_h 73 74 #include <string.h> 75 76 namespace WebCore { 74 77 75 78 enum CSSPropertyID { … … 106 109 const char* getPropertyName(CSSPropertyID); 107 110 111 } // namespace WebCore 112 108 113 #endif // CSSPropertyNames_h 109 114 … … 112 117 close HEADER; 113 118 114 system("gperf --key-positions=\"*\" -D -n -s 2 CSSPropertyNames.gperf > CSSPropertyNames .cpp") == 0 || die "calling gperf failed: $?";119 system("gperf --key-positions=\"*\" -D -n -s 2 CSSPropertyNames.gperf > CSSPropertyNamesHash.h") == 0 || die "calling gperf failed: $?"; 115 120 116 open C, ">>CSSPropertyNames .cpp" || die "Could not open CSSPropertyNames.cppfor writing";121 open C, ">>CSSPropertyNamesHash.h" || die "Could not open CSSPropertyNamesHash.h for writing"; 117 122 print C << "EOF"; 123 124 EOF 125 126 close C; 127 128 my $propertyNamesImpl = "CSSPropertyNames.cpp"; 129 130 open PROPERTYNAMES, ">$propertyNamesImpl" || die "Could not open $propertyNamesImpl for writing"; 131 print PROPERTYNAMES << "EOF"; 132 /* This file is automatically generated by make-hash-tools.pl, do not edit */ 133 134 135 #include "CSSPropertyNames.h" 136 #include "HashTools.h" 137 138 namespace WebCore { 139 #include "CSSPropertyNamesHash.h" 140 141 const Property* findProperty (register const char* str, register unsigned int len) 142 { 143 return CSSPropertyNamesHash::findPropertyImpl(str, len); 144 } 118 145 119 146 const char* getPropertyName(CSSPropertyID id) … … 126 153 return propertyNameStrings[index]; 127 154 } 155 156 } // namespace WebCore 157 128 158 EOF 129 159 130 close C;160 close PROPERTYNAMES; 131 161 -
trunk/WebCore/css/makevalues.pl
r61091 r68521 43 43 %} 44 44 %struct-type 45 struct Value { 46 const char* name; 47 int id; 48 }; 49 %language=ANSI-C 45 struct Value; 46 %omit-struct-type 47 %language=C++ 50 48 %readonly-tables 51 49 %compare-strncmp 52 %define lookup-function-name findValue 50 %define class-name CSSValueKeywordsHash 51 %define lookup-function-name findValueImpl 53 52 %define hash-function-name value_hash_function 54 53 %define word-array-name value_word_list … … 73 72 #define CSSValueKeywords_h 74 73 74 #include <string.h> 75 76 namespace WebCore { 77 75 78 const int CSSValueInvalid = 0; 76 79 EOF … … 93 96 const char* getValueName(unsigned short id); 94 97 98 } // namespace WebCore 99 95 100 #endif // CSSValueKeywords_h 101 96 102 EOF 97 103 close HEADER; 98 104 99 system("gperf --key-positions=\"*\" -D -n -s 2 CSSValueKeywords.gperf > CSSValueKeywords .cpp") == 0 || die "calling gperf failed: $?";105 system("gperf --key-positions=\"*\" -D -n -s 2 CSSValueKeywords.gperf > CSSValueKeywordsHash.h") == 0 || die "calling gperf failed: $?"; 100 106 101 open C, ">>CSSValueKeywords .cpp" || die "Could not open CSSValueKeywords.cppfor writing";107 open C, ">>CSSValueKeywordsHash.h" || die "Could not open CSSValueKeywordsHash.h for writing"; 102 108 print C "static const char * const valueList[] = {\n"; 103 109 print C "\"\",\n"; … … 108 114 0 109 115 }; 116 117 EOF 118 119 close C; 120 121 my $valueKeywordsImpl = "CSSValueKeywords.cpp"; 122 123 open VALUEKEYWORDS, ">$valueKeywordsImpl" || die "Could not open $valueKeywordsImpl for writing"; 124 print VALUEKEYWORDS << "EOF"; 125 /* This file is automatically generated by make-hash-tools.pl, do not edit */ 126 127 #include "CSSValueKeywords.h" 128 #include "HashTools.h" 129 130 namespace WebCore { 131 #include "CSSValueKeywordsHash.h" 132 133 const Value* findValue (register const char* str, register unsigned int len) 134 { 135 return CSSValueKeywordsHash::findValueImpl(str, len); 136 } 137 110 138 const char* getValueName(unsigned short id) 111 139 { … … 114 142 return valueList[id]; 115 143 } 144 145 } // namespace WebCore 146 116 147 EOF 117 148 118 close C; 149 close VALUEKEYWORDS; 150 -
trunk/WebCore/html/DocTypeStrings.gperf
r61091 r68521 1 1 %struct-type 2 struct PubIDInfo { 3 enum eMode { 4 eQuirks, 5 eQuirks3, 6 eAlmostStandards 7 }; 8 9 const char* name; 10 eMode mode_if_no_sysid; 11 eMode mode_if_sysid; 12 } 13 %language=ANSI-C 2 struct PubIDInfo; 3 %omit-struct-type 4 %language=C++ 14 5 %readonly-tables 15 6 %global-table 16 7 %compare-strncmp 8 %define class-name DocTypeStringsHash 17 9 %define initializer-suffix ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards 18 %define lookup-function-name findDoctypeEntry 10 %define lookup-function-name findDoctypeEntryImpl 19 11 %define hash-function-name doctype_hash_function 20 12 %includes -
trunk/WebCore/html/HTMLDocument.cpp
r67512 r68521 65 65 #include "FrameTree.h" 66 66 #include "FrameView.h" 67 #include "HashTools.h" 67 68 #include "HTMLDocumentParser.h" 68 69 #include "HTMLBodyElement.h" … … 74 75 #include "Settings.h" 75 76 #include <wtf/text/CString.h> 76 77 #include "DocTypeStrings.cpp"78 77 79 78 namespace WebCore { -
trunk/WebCore/make-hash-tools.pl
r65351 r68521 28 28 my $option = basename($ARGV[0],".gperf"); 29 29 30 my $hashToolsHeader = "$outdir/HashTools.h"; 31 32 sub createHashToolsHeader() { 33 34 open HEADER, ">$hashToolsHeader" || die "Could not open $hashToolsHeader for writing"; 35 print HEADER << "EOF"; 36 /* This file is automatically generated by make-hash-tools.pl, do not edit */ 37 38 #ifndef HashTools_h 39 #define HashTools_h 40 41 #include "wtf/Platform.h" 42 43 namespace WebCore { 44 45 struct PubIDInfo { 46 enum eMode { 47 eQuirks, 48 eQuirks3, 49 eAlmostStandards 50 }; 51 52 const char* name; 53 eMode mode_if_no_sysid; 54 eMode mode_if_sysid; 55 }; 56 57 struct NamedColor { 58 const char* name; 59 int RGBValue; 60 }; 61 62 struct Property { 63 const char* name; 64 int id; 65 }; 66 67 struct Value { 68 const char* name; 69 int id; 70 }; 71 72 const PubIDInfo* findDoctypeEntry(register const char* str, register unsigned int len); 73 const NamedColor* findColor(register const char* str, register unsigned int len); 74 const Property* findProperty(register const char* str, register unsigned int len); 75 const Value* findValue(register const char* str, register unsigned int len); 76 } 77 78 #endif // HashTools_h 79 80 EOF 81 close HEADER; 82 83 } 84 30 85 switch ($option) { 31 86 32 87 case "DocTypeStrings" { 33 88 34 my $docTypeStringsGenerated = "$outdir/DocTypeStrings.cpp"; 89 createHashToolsHeader(); 90 91 my $docTypeStringsImpl = "$outdir/DocTypeStrings.cpp"; 92 my $docTypeStringsGenerated = "$outdir/DocTypeStringsHash.h"; 35 93 my $docTypeStringsGperf = $ARGV[0]; 36 94 shift; 95 96 open DOCTYPESTRINGS, ">$docTypeStringsImpl" || die "Could not open $docTypeStringsImpl for writing"; 97 print DOCTYPESTRINGS << "EOF"; 98 /* This file is automatically generated by make-hash-tools.pl, do not edit */ 99 100 #include "HashTools.h" 101 102 namespace WebCore { 103 #include "DocTypeStringsHash.h" 104 105 const PubIDInfo* findDoctypeEntry (register const char* str, register unsigned int len) 106 { 107 return DocTypeStringsHash::findDoctypeEntryImpl(str, len); 108 } 109 110 } 111 112 EOF 113 close DOCTYPESTRINGS; 37 114 38 115 system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?"; … … 42 119 case "ColorData" { 43 120 44 my $colorDataGenerated = "$outdir/ColorData.cpp"; 45 my $colorDataGperf = $ARGV[0]; 121 my $colorDataImpl = "$outdir/ColorData.cpp"; 122 my $colorDataGenerated = "$outdir/ColorDataHash.h"; 123 my $colorDataGperf = $ARGV[0]; 46 124 shift; 125 126 open COLORDATA, ">$colorDataImpl" || die "Could not open $colorDataImpl for writing"; 127 print COLORDATA << "EOF"; 128 /* This file is automatically generated by make-hash-tools.pl, do not edit */ 129 130 #include "HashTools.h" 131 132 namespace WebCore { 133 #include "ColorDataHash.h" 134 135 const struct NamedColor* findColor (register const char* str, register unsigned int len) 136 { 137 return ColorDataHash::findColorImpl(str, len); 138 } 139 140 } 141 142 EOF 143 close COLORDATA; 47 144 48 145 system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?"; -
trunk/WebCore/platform/ColorData.gperf
r61091 r68521 1 1 %struct-type 2 struct NamedColor { 3 const char *name; 4 int RGBValue; 5 }; 6 %language=ANSI-C 2 struct NamedColor; 3 %omit-struct-type 4 %language=C++ 7 5 %readonly-tables 8 6 %global-table 9 7 %compare-strncmp 10 %define lookup-function-name findColor 8 %define class-name ColorDataHash 9 %define lookup-function-name findColorImpl 11 10 %define hash-function-name colordata_hash_function 12 11 %includes -
trunk/WebCore/platform/graphics/Color.cpp
r63126 r68521 27 27 #include "Color.h" 28 28 29 #include "HashTools.h" 29 30 #include "PlatformString.h" 30 31 #include <math.h> 31 32 #include <wtf/Assertions.h> 32 33 #include <wtf/MathExtras.h> 33 34 #include "ColorData.cpp"35 34 36 35 using namespace std; -
trunk/WebKit/qt/ChangeLog
r68517 r68521 1 2010-09-28 Andras Becsi <abecsi@webkit.org> 2 3 Reviewed by Csaba Osztrogonác. 4 5 Undefined reference errors when linking due to gperf and inlining. 6 webkit.org/b/29244 7 8 EFL CMake changes by Leandro Pereira <leandro@profusion.mobi> 9 10 Refactor gperf code generation and usage to fix the debug build with gcc>4.4. 11 Hitherto gperf generated C code, these files were included in multiple C++ files across WebCore 12 to access the functionality provided. This resulted in debug build failure with newer gcc versions 13 because of a behaviour change of gcc, which disables C style inlining in debug mode. 14 The make-hash-tools.pl script lets gperf generate C++ code for all gperf files now, which are compiled 15 in their own compilation unit. 16 The functionality provided by the generated code is wrapped behind HashTools.h, so there is no need 17 for multiple inclusions of generated C files to access these functions. 18 19 * WebCoreSupport/FrameLoaderClientQt.cpp: 20 (WebCore::FrameLoaderClientQt::createPlugin): 21 1 22 2010-09-28 Benjamin Poulain <benjamin.poulain@nokia.com> 2 23 -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r68517 r68521 1452 1452 CSSPropertyID property = qstyleSheetProperties[i]; 1453 1453 1454 styleSheet += QString::fromLatin1( ::getPropertyName(property));1454 styleSheet += QString::fromLatin1(getPropertyName(property)); 1455 1455 styleSheet += QLatin1Char(':'); 1456 1456 styleSheet += computedStyle(element)->getPropertyValue(property); -
trunk/cmake/WebKitMacros.cmake
r66319 r68521 85 85 ENDMACRO () 86 86 87 MACRO(MAKE_HASH_TOOLS _source) 88 GET_FILENAME_COMPONENT(_name ${_source} NAME_WE) 87 89 88 MACRO (GENERATE_GPERF _input _output _func _opts) 90 IF (${_source} STREQUAL "DocTypeStrings") 91 SET(_hash_tools_h "${DERIVED_SOURCES_DIR}/HashTools.h") 92 ELSE () 93 SET(_hash_tools_h "") 94 ENDIF () 95 89 96 ADD_CUSTOM_COMMAND( 90 OUTPUT ${ _output}91 MAIN_DEPENDENCY ${_ input}92 COMMAND ${ GPERF_EXECUTABLE} -CDEGIot -L ANSI-C --key-positions=* -s 2 -N ${_func} ${_opts} < ${_input} > ${_output}97 OUTPUT ${DERIVED_SOURCES_DIR}/${_name}.cpp ${_hash_tools_h} 98 MAIN_DEPENDENCY ${_source}.gperf 99 COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/make-hash-tools.pl ${DERIVED_SOURCES_DIR} ${_source}.gperf 93 100 VERBATIM) 94 ENDMACRO ()95 101 102 UNSET(_name) 103 UNSET(_hash_tools_h) 104 ENDMACRO() 96 105 97 106 MACRO (WEBKIT_WRAP_SOURCELIST _input)
Note: See TracChangeset
for help on using the changeset viewer.