Changeset 149569 in webkit


Ignore:
Timestamp:
May 4, 2013 2:44:41 PM (11 years ago)
Author:
Antoine Quint
Message:

Update code generators to handle a new JavaScript file for snapshotted plug-ins
https://bugs.webkit.org/show_bug.cgi?id=115596

Reviewed by Dean Jackson.

In preparation for https://webkit.org/b/115548, adding a new JS file at
Resources/plugIns.js that we will use to provide presentation for the
snapshotted plug-ins overlay.

  • CMakeLists.txt:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • DerivedSources.pri:
  • GNUmakefile.am:
  • GNUmakefile.list.am:
  • Resources/plugIns.js: Added.
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebCore
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r149525 r149569  
    25772577)
    25782578
     2579set(WebCore_PLUG_INS_RESOURCES
     2580    ${WEBCORE_DIR}/Resources/plugIns.js
     2581)
     2582
    25792583set(WebCore_LIBRARIES
    25802584    ${WTF_LIBRARY_NAME}
     
    30813085ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h)
    30823086
     3087# Generate plug-in resources
     3088add_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)
     3094list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp)
     3095ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp PlugInsResourcesData.cpp PlugInsResources.h)
    30833096
    30843097GENERATE_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  
     12013-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
    1242013-05-04  Andreas Kling  <akling@apple.com>
    225
  • trunk/Source/WebCore/DerivedSources.cpp

    r149525 r149569  
    529529#include "JSXPathResult.cpp"
    530530#include "JSXSLTProcessor.cpp"
     531#include "PlugInsResourcesData.cpp"
    531532#include "UserAgentStyleSheetsData.cpp"
    532533
  • trunk/Source/WebCore/DerivedSources.make

    r149525 r149569  
    679679    HTMLNames.cpp \
    680680    JSSVGElementWrapperFactory.cpp \
     681    PlugInsResources.h \
    681682    SVGElementFactory.cpp \
    682683    SVGNames.cpp \
     
    827828UserAgentStyleSheets.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS)
    828829        perl -I$(WebCore)/bindings/scripts $< --defines "$(FEATURE_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
     830
     831# --------
     832
     833# plugIns resources
     834
     835PLUG_INS_RESOURCES = $(WebCore)/Resources/plugIns.js
     836
     837PlugInsResources.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)
    829839
    830840# --------
  • trunk/Source/WebCore/DerivedSources.pri

    r149525 r149569  
    8686    $$PWD/css/themeQtNoListboxes.css \
    8787    $$PWD/css/mobileThemeQt.css
     88
     89PLUGINS_EMBED = \
     90    $$PWD/Resources/plugIns.js
    8891
    8992IDL_BINDINGS += \
     
    956959GENERATORS += stylesheets
    957960
    958 # GENERATOR 10: XPATH grammar
     961# GENERATOR 10:
     962pluginsresources.script = $$PWD/css/make-css-file-arrays.pl
     963pluginsresources.output = PlugInsResourcesData.cpp
     964pluginsresources.input = pluginsresources.script
     965pluginsresources.commands = perl $$pluginsresources.script ${QMAKE_FUNC_FILE_OUT_PATH}/PlugInsResources.h ${QMAKE_FILE_OUT} $$PLUGINS_EMBED
     966pluginsresources.depends = $$PLUGINS_EMBED
     967pluginsresources.clean = ${QMAKE_FILE_OUT} ${QMAKE_FUNC_FILE_OUT_PATH}/PlugInsResources.h
     968GENERATORS += pluginsresources
     969
     970# GENERATOR 11: XPATH grammar
    959971xpathbison.output = ${QMAKE_FILE_BASE}.cpp
    960972xpathbison.input = XPATHBISON
     
    963975GENERATORS += xpathbison
    964976
    965 # GENERATOR 11: WebKit Version
     977# GENERATOR 12: WebKit Version
    966978# The appropriate Apple-maintained Version.xcconfig file for WebKit version information is in Source/WebKit/mac/Configurations/.
    967979webkitversion.script = $$PWD/../WebKit/scripts/generate-webkitversion.pl
  • trunk/Source/WebCore/GNUmakefile.am

    r149519 r149569  
    280280        $(WebCore)/css/plugIns.css
    281281
     282# plug-in resources
     283PLUG_INS_RESOURCES = \
     284        $(WebCore)/Resources/plugIns.js
     285
    282286# new-style JavaScript bindings
    283287SCRIPTS_FOR_GENERATE_BINDINGS = \
     
    295299DerivedSources/WebCore/UserAgentStyleSheets.h: $(WebCore)/css/make-css-file-arrays.pl $(WebCore)/bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS)
    296300        $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $<  --defines "$(feature_defines)" $@ DerivedSources/WebCore/UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
     301
     302DerivedSources/WebCore/PlugInsResourcesData.cpp: DerivedSources/WebCore/PlugInsResources.h
     303DerivedSources/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)
    297305
    298306DerivedSources/WebCore/WebKitFontFamilyNames.cpp: DerivedSources/WebCore/WebKitFontFamilyNames.h
     
    692700        Source/WebCore/platform/ColorData.gperf \
    693701        Source/WebCore/platform/text/mac/make-charset-table.pl \
     702        Source/WebCore/Resources/plugIns.js \
    694703        Source/WebCore/svg/svgattrs.in \
    695704        Source/WebCore/svg/svgtags.in \
  • trunk/Source/WebCore/GNUmakefile.list.am

    r149525 r149569  
    892892        DerivedSources/WebCore/MathMLNames.cpp \
    893893        DerivedSources/WebCore/MathMLNames.h \
     894        DerivedSources/WebCore/PlugInsResourcesData.cpp \
     895        DerivedSources/WebCore/PlugInsResources.h \
    894896        DerivedSources/WebCore/SettingsMacros.h \
    895897        DerivedSources/WebCore/UserAgentStyleSheetsData.cpp \
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r149525 r149569  
    3860838608                        </File>
    3860938609                        <File
     38610                                RelativePath="..\Resources\plugIns.js"
     38611                                >
     38612                        </File>
     38613                        <File
    3861038614                                RelativePath="..\css\PropertySetCSSStyleDeclaration.cpp"
    3861138615                                >
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r149541 r149569  
    1359013590    <None Include="..\inspector\front-end\Workspace.js" />
    1359113591    <None Include="..\inspector\front-end\cm\xml.js" />
     13592    <None Include="..\Resources\plugIns.js" />
    1359213593    <None Include="WebCorePostBuild.cmd" />
    1359313594    <None Include="WebCorePreBuild.cmd" />
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r149525 r149569  
    1519715197      <Filter>inspector\front-end</Filter>
    1519815198    </None>
     15199    <None Include="..\Resources\plugIns.js">
     15200      <Filter>Resources</Filter>
     15201    </None>
    1519915202    <None Include="WebCorePostBuild.cmd" />
    1520015203    <None Include="WebCorePreBuild.cmd" />
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r149525 r149569  
    18891889                71DCB7011568197600862271 /* JSSVGZoomAndPan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71DCB6FF1568197600862271 /* JSSVGZoomAndPan.cpp */; };
    18901890                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 */; };
    18911893                71E623D1151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */; };
    18921894                71FB967B1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h in Headers */ = {isa = PBXBuildFile; fileRef = 71FB967A1383D64600AC8A4C /* SVGAnimatedEnumerationPropertyTearOff.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    83048306                7134496B146941B300720312 /* SVGLengthContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGLengthContext.cpp; sourceTree = "<group>"; };
    83058307                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>"; };
    83068309                715379FE146BD9D6008BD615 /* SVGPathData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathData.cpp; sourceTree = "<group>"; };
    83078310                715379FF146BD9D6008BD615 /* SVGPathData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathData.h; sourceTree = "<group>"; };
     
    83148317                71DCB6FF1568197600862271 /* JSSVGZoomAndPan.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGZoomAndPan.cpp; sourceTree = "<group>"; };
    83158318                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>"; };
    83168321                71E623CE151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedIntegerOptionalInteger.cpp; sourceTree = "<group>"; };
    83178322                71E623CF151F72A60036E2F4 /* SVGAnimatedIntegerOptionalInteger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGAnimatedIntegerOptionalInteger.h; sourceTree = "<group>"; };
     
    1325713262                                85136C920AED665900F90A3D /* northWestResizeCursor.png */,
    1325813263                                85136C930AED665900F90A3D /* northWestSouthEastResizeCursor.png */,
     13264                                713E70AF1733E8B300A22D00 /* plugIns.js */,
    1325913265                                46F9D5DC0B0D60170028EE36 /* progressCursor.png */,
    1326013266                                85136C940AED665900F90A3D /* southEastResizeCursor.png */,
     
    1447414480                                FABE72FC1059C21100D999DD /* MathMLNames.cpp */,
    1447514481                                44A28AAE12DFB8BF00AE923B /* MathMLNames.h */,
     14482                                71E2183817359FB8006E6E4D /* PlugInsResources.h */,
     14483                                71E2183917359FB8006E6E4D /* PlugInsResourcesData.cpp */,
    1447614484                                53EF766A16530A61004CBE49 /* SettingsMacros.h */,
    1447714485                                656581E609D1508D000E61D7 /* SVGElementFactory.cpp */,
     
    2103721045                                FD31602012B0267600C1A359 /* AudioProcessingEvent.h in Headers */,
    2103821046                                FD31608412B026F700C1A359 /* AudioProcessor.h in Headers */,
     21047                                71E2183A17359FB8006E6E4D /* PlugInsResources.h in Headers */,
    2103921048                                FD31608612B026F700C1A359 /* AudioResampler.h in Headers */,
    2104021049                                FD31608812B026F700C1A359 /* AudioResamplerKernel.h in Headers */,
     
    2674426753                                84C5B2FA1216DC810088B53A /* SVGPathTraversalStateBuilder.cpp in Sources */,
    2674526754                                71A57DF1154BE25C0009D120 /* SVGPathUtilities.cpp in Sources */,
     26755                                71E2183B17359FB8006E6E4D /* PlugInsResourcesData.cpp in Sources */,
    2674626756                                B2227A870D00BF220071B782 /* SVGPatternElement.cpp in Sources */,
    2674726757                                B2227A8B0D00BF220071B782 /* SVGPointList.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.