Changeset 149569 in webkit
- Timestamp:
- May 4, 2013 2:44:41 PM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 1 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r149525 r149569 2577 2577 ) 2578 2578 2579 set(WebCore_PLUG_INS_RESOURCES 2580 ${WEBCORE_DIR}/Resources/plugIns.js 2581 ) 2582 2579 2583 set(WebCore_LIBRARIES 2580 2584 ${WTF_LIBRARY_NAME} … … 3081 3085 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h) 3082 3086 3087 # Generate plug-in resources 3088 add_custom_command( 3089 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResources.h 3090 MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl 3091 DEPENDS ${WebCore_PLUG_INS_RESOURCES} ${WEBCORE_DIR}/bindings/scripts/preprocessor.pm 3092 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/make-css-file-arrays.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResources.h ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp ${WebCore_PLUG_INS_RESOURCES} 3093 VERBATIM) 3094 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp) 3095 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp PlugInsResourcesData.cpp PlugInsResources.h) 3083 3096 3084 3097 GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}") -
trunk/Source/WebCore/ChangeLog
r149567 r149569 1 2013-05-04 Antoine Quint <graouts@apple.com> 2 3 Update code generators to handle a new JavaScript file for snapshotted plug-ins 4 https://bugs.webkit.org/show_bug.cgi?id=115596 5 6 Reviewed by Dean Jackson. 7 8 In preparation for https://webkit.org/b/115548, adding a new JS file at 9 Resources/plugIns.js that we will use to provide presentation for the 10 snapshotted plug-ins overlay. 11 12 * CMakeLists.txt: 13 * DerivedSources.cpp: 14 * DerivedSources.make: 15 * DerivedSources.pri: 16 * GNUmakefile.am: 17 * GNUmakefile.list.am: 18 * Resources/plugIns.js: Added. 19 * WebCore.vcproj/WebCore.vcproj: 20 * WebCore.vcxproj/WebCore.vcxproj: 21 * WebCore.vcxproj/WebCore.vcxproj.filters: 22 * WebCore.xcodeproj/project.pbxproj: 23 1 24 2013-05-04 Andreas Kling <akling@apple.com> 2 25 -
trunk/Source/WebCore/DerivedSources.cpp
r149525 r149569 529 529 #include "JSXPathResult.cpp" 530 530 #include "JSXSLTProcessor.cpp" 531 #include "PlugInsResourcesData.cpp" 531 532 #include "UserAgentStyleSheetsData.cpp" 532 533 -
trunk/Source/WebCore/DerivedSources.make
r149525 r149569 679 679 HTMLNames.cpp \ 680 680 JSSVGElementWrapperFactory.cpp \ 681 PlugInsResources.h \ 681 682 SVGElementFactory.cpp \ 682 683 SVGNames.cpp \ … … 827 828 UserAgentStyleSheets.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) 828 829 perl -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS) 830 831 # -------- 832 833 # plugIns resources 834 835 PLUG_INS_RESOURCES = $(WebCore)/Resources/plugIns.js 836 837 PlugInsResources.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(PLUG_INS_RESOURCES) 838 perl -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ PlugInsResourcesData.cpp $(PLUG_INS_RESOURCES) 829 839 830 840 # -------- -
trunk/Source/WebCore/DerivedSources.pri
r149525 r149569 86 86 $$PWD/css/themeQtNoListboxes.css \ 87 87 $$PWD/css/mobileThemeQt.css 88 89 PLUGINS_EMBED = \ 90 $$PWD/Resources/plugIns.js 88 91 89 92 IDL_BINDINGS += \ … … 956 959 GENERATORS += stylesheets 957 960 958 # GENERATOR 10: XPATH grammar 961 # GENERATOR 10: 962 pluginsresources.script = $$PWD/css/make-css-file-arrays.pl 963 pluginsresources.output = PlugInsResourcesData.cpp 964 pluginsresources.input = pluginsresources.script 965 pluginsresources.commands = perl $$pluginsresources.script ${QMAKE_FUNC_FILE_OUT_PATH}/PlugInsResources.h ${QMAKE_FILE_OUT} $$PLUGINS_EMBED 966 pluginsresources.depends = $$PLUGINS_EMBED 967 pluginsresources.clean = ${QMAKE_FILE_OUT} ${QMAKE_FUNC_FILE_OUT_PATH}/PlugInsResources.h 968 GENERATORS += pluginsresources 969 970 # GENERATOR 11: XPATH grammar 959 971 xpathbison.output = ${QMAKE_FILE_BASE}.cpp 960 972 xpathbison.input = XPATHBISON … … 963 975 GENERATORS += xpathbison 964 976 965 # GENERATOR 1 1: WebKit Version977 # GENERATOR 12: WebKit Version 966 978 # The appropriate Apple-maintained Version.xcconfig file for WebKit version information is in Source/WebKit/mac/Configurations/. 967 979 webkitversion.script = $$PWD/../WebKit/scripts/generate-webkitversion.pl -
trunk/Source/WebCore/GNUmakefile.am
r149519 r149569 280 280 $(WebCore)/css/plugIns.css 281 281 282 # plug-in resources 283 PLUG_INS_RESOURCES = \ 284 $(WebCore)/Resources/plugIns.js 285 282 286 # new-style JavaScript bindings 283 287 SCRIPTS_FOR_GENERATE_BINDINGS = \ … … 295 299 DerivedSources/WebCore/UserAgentStyleSheets.h: $(WebCore)/css/make-css-file-arrays.pl $(WebCore)/bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) 296 300 $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --defines "$(feature_defines)" $@ DerivedSources/WebCore/UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS) 301 302 DerivedSources/WebCore/PlugInsResourcesData.cpp: DerivedSources/WebCore/PlugInsResources.h 303 DerivedSources/WebCore/PlugInsResources.h: $(WebCore)/css/make-css-file-arrays.pl $(WebCore)/bindings/scripts/preprocessor.pm $(PLUG_INS_RESOURCES) 304 $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --defines "$(feature_defines)" $@ DerivedSources/WebCore/PlugInsResourcesData.cpp $(PLUG_INS_RESOURCES) 297 305 298 306 DerivedSources/WebCore/WebKitFontFamilyNames.cpp: DerivedSources/WebCore/WebKitFontFamilyNames.h … … 692 700 Source/WebCore/platform/ColorData.gperf \ 693 701 Source/WebCore/platform/text/mac/make-charset-table.pl \ 702 Source/WebCore/Resources/plugIns.js \ 694 703 Source/WebCore/svg/svgattrs.in \ 695 704 Source/WebCore/svg/svgtags.in \ -
trunk/Source/WebCore/GNUmakefile.list.am
r149525 r149569 892 892 DerivedSources/WebCore/MathMLNames.cpp \ 893 893 DerivedSources/WebCore/MathMLNames.h \ 894 DerivedSources/WebCore/PlugInsResourcesData.cpp \ 895 DerivedSources/WebCore/PlugInsResources.h \ 894 896 DerivedSources/WebCore/SettingsMacros.h \ 895 897 DerivedSources/WebCore/UserAgentStyleSheetsData.cpp \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r149525 r149569 38608 38608 </File> 38609 38609 <File 38610 RelativePath="..\Resources\plugIns.js" 38611 > 38612 </File> 38613 <File 38610 38614 RelativePath="..\css\PropertySetCSSStyleDeclaration.cpp" 38611 38615 > -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r149541 r149569 13590 13590 <None Include="..\inspector\front-end\Workspace.js" /> 13591 13591 <None Include="..\inspector\front-end\cm\xml.js" /> 13592 <None Include="..\Resources\plugIns.js" /> 13592 13593 <None Include="WebCorePostBuild.cmd" /> 13593 13594 <None Include="WebCorePreBuild.cmd" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r149525 r149569 15197 15197 <Filter>inspector\front-end</Filter> 15198 15198 </None> 15199 <None Include="..\Resources\plugIns.js"> 15200 <Filter>Resources</Filter> 15201 </None> 15199 15202 <None Include="WebCorePostBuild.cmd" /> 15200 15203 <None Include="WebCorePreBuild.cmd" /> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r149525 r149569 1889 1889 71DCB7011568197600862271 /* JSSVGZoomAndPan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71DCB6FF1568197600862271 /* JSSVGZoomAndPan.cpp */; }; 1890 1890 71DCB7021568197600862271 /* JSSVGZoomAndPan.h in Headers */ = {isa = PBXBuildFile; fileRef = 71DCB7001568197600862271 /* JSSVGZoomAndPan.h */; }; 1891 71E2183A17359FB8006E6E4D /* PlugInsResources.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E2183817359FB8006E6E4D /* PlugInsResources.h */; }; 1892 71E2183B17359FB8006E6E4D /* PlugInsResourcesData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71E2183917359FB8006E6E4D /* PlugInsResourcesData.cpp */; }; 1891 1893 71E623D1151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */; }; 1892 1894 71FB967B1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 71FB967A1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 8304 8306 7134496B146941B300720312 /* SVGLengthContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGLengthContext.cpp; sourceTree = "<group>"; }; 8305 8307 7134496C146941B300720312 /* SVGLengthContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGLengthContext.h; sourceTree = "<group>"; }; 8308 713E70AF1733E8B300A22D00 /* plugIns.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = plugIns.js; sourceTree = "<group>"; }; 8306 8309 715379FE146BD9D6008BD615 /* SVGPathData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathData.cpp; sourceTree = "<group>"; }; 8307 8310 715379FF146BD9D6008BD615 /* SVGPathData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathData.h; sourceTree = "<group>"; }; … … 8314 8317 71DCB6FF1568197600862271 /* JSSVGZoomAndPan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGZoomAndPan.cpp; sourceTree = "<group>"; }; 8315 8318 71DCB7001568197600862271 /* JSSVGZoomAndPan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGZoomAndPan.h; sourceTree = "<group>"; }; 8319 71E2183817359FB8006E6E4D /* PlugInsResources.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = PlugInsResources.h; sourceTree = "<group>"; }; 8320 71E2183917359FB8006E6E4D /* PlugInsResourcesData.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; path = PlugInsResourcesData.cpp; sourceTree = "<group>"; }; 8316 8321 71E623CE151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedIntegerOptionalInteger.cpp; sourceTree = "<group>"; }; 8317 8322 71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedIntegerOptionalInteger.h; sourceTree = "<group>"; }; … … 13257 13262 85136C920AED665900F90A3D /* northWestResizeCursor.png */, 13258 13263 85136C930AED665900F90A3D /* northWestSouthEastResizeCursor.png */, 13264 713E70AF1733E8B300A22D00 /* plugIns.js */, 13259 13265 46F9D5DC0B0D60170028EE36 /* progressCursor.png */, 13260 13266 85136C940AED665900F90A3D /* southEastResizeCursor.png */, … … 14474 14480 FABE72FC1059C21100D999DD /* MathMLNames.cpp */, 14475 14481 44A28AAE12DFB8BF00AE923B /* MathMLNames.h */, 14482 71E2183817359FB8006E6E4D /* PlugInsResources.h */, 14483 71E2183917359FB8006E6E4D /* PlugInsResourcesData.cpp */, 14476 14484 53EF766A16530A61004CBE49 /* SettingsMacros.h */, 14477 14485 656581E609D1508D000E61D7 /* SVGElementFactory.cpp */, … … 21037 21045 FD31602012B0267600C1A359 /* AudioProcessingEvent.h in Headers */, 21038 21046 FD31608412B026F700C1A359 /* AudioProcessor.h in Headers */, 21047 71E2183A17359FB8006E6E4D /* PlugInsResources.h in Headers */, 21039 21048 FD31608612B026F700C1A359 /* AudioResampler.h in Headers */, 21040 21049 FD31608812B026F700C1A359 /* AudioResamplerKernel.h in Headers */, … … 26744 26753 84C5B2FA1216DC810088B53A /* SVGPathTraversalStateBuilder.cpp in Sources */, 26745 26754 71A57DF1154BE25C0009D120 /* SVGPathUtilities.cpp in Sources */, 26755 71E2183B17359FB8006E6E4D /* PlugInsResourcesData.cpp in Sources */, 26746 26756 B2227A870D00BF220071B782 /* SVGPatternElement.cpp in Sources */, 26747 26757 B2227A8B0D00BF220071B782 /* SVGPointList.cpp in Sources */,
Note: See TracChangeset
for help on using the changeset viewer.