Changeset 268693 in webkit


Ignore:
Timestamp:
Oct 19, 2020 3:08:01 PM (3 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, reverting r268495, r268571, and r268682.

Caused failures for some internal build configurations

Reverted changesets:

"[Testing] Generate test header key map for DumpRenderTree"
​https://bugs.webkit.org/show_bug.cgi?id=217723
​https://trac.webkit.org/changeset/268495

"Attempt to fix the build."
​https://trac.webkit.org/changeset/268571

"Switch to a static pattern for DumpRenderTree preferences
generation to avoid ambiguous rules"
​https://bugs.webkit.org/show_bug.cgi?id=217907
​https://trac.webkit.org/changeset/268682

Location:
trunk/Tools
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r268689 r268693  
     12020-10-19  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, reverting r268495, r268571, and r268682.
     4
     5        Caused failures for some internal build configurations
     6
     7        Reverted changesets:
     8
     9        "[Testing] Generate test header key map for DumpRenderTree"
     10        https://bugs.webkit.org/show_bug.cgi?id=217723
     11        https://trac.webkit.org/changeset/268495
     12
     13        "Attempt to fix the build."
     14        https://trac.webkit.org/changeset/268571
     15
     16        "Switch to a static pattern for DumpRenderTree preferences
     17        generation to avoid ambiguous rules"
     18        https://bugs.webkit.org/show_bug.cgi?id=217907
     19        https://trac.webkit.org/changeset/268682
     20
    1212020-10-19  Aakash Jain  <aakash_jain@apple.com>
    222

  • trunk/Tools/DumpRenderTree/CMakeLists.txt

    r268495 r268693  
    4040)
    4141
    42 set(DumpRenderTree_WEB_PREFERENCES_TEMPLATES
    43     ${DumpRenderTree_DIR}/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb
    44 )
    45 
    46 set(DumpRenderTree_WEB_PREFERENCES
    47     ${WTF_SCRIPTS_DIR}/Preferences/WebPreferences.yaml
    48     ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml
    49     ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml
    50     ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml
    51 )
    52 
    53 set_source_files_properties(${DumpRenderTree_WEB_PREFERENCES} PROPERTIES GENERATED TRUE)
    54 
    55 add_custom_command(
    56     OUTPUT ${DumpRenderTree_DERIVED_SOURCES_DIR}/TestOptionsGeneratedKeys.h
    57     DEPENDS ${DumpRenderTree_WEB_PREFERENCES_TEMPLATES} ${DumpRenderTree_WEB_PREFERENCES} WTF_CopyPreferences
    58     COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/GeneratePreferences.rb --frontend WebKitLegacy --base ${WTF_SCRIPTS_DIR}/Preferences/WebPreferences.yaml --debug ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml --experimental ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml --internal ${WTF_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml --outputDir "${DumpRenderTree_DERIVED_SOURCES_DIR}" --template ${DumpRenderTree_DIR}/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb
    59     VERBATIM)
    60 
    61 list(APPEND DumpRenderTree_SOURCES
    62     ${DumpRenderTree_DERIVED_SOURCES_DIR}/TestOptionsGeneratedKeys.h
    63 )
    64 
    6542WEBKIT_EXECUTABLE_DECLARE(DumpRenderTree)
    6643WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()

  • trunk/Tools/DumpRenderTree/DerivedSources-input.xcfilelist

    r268682 r268693  
    11# This file is generated by the generate-xcfilelists script.
    2 $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/GeneratePreferences.rb
    3 $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferences.yaml
    4 $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferencesDebug.yaml
    5 $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferencesExperimental.yaml
    6 $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferencesInternal.yaml
    72$(PROJECT_DIR)/../TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl
    83$(PROJECT_DIR)/Bindings/CodeGeneratorDumpRenderTree.pm
    9 $(PROJECT_DIR)/DerivedSources.make
    10 $(PROJECT_DIR)/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb
    11 $(PROJECT_DIR)/Scripts/generate-derived-sources.sh
    124$(WEBCORE_PRIVATE_HEADERS_DIR)/CodeGenerator.pm
    135$(WEBCORE_PRIVATE_HEADERS_DIR)/IDLAttributes.json

  • trunk/Tools/DumpRenderTree/DerivedSources-output.xcfilelist

    r268495 r268693  
    22$(BUILT_PRODUCTS_DIR)/DerivedSources/DumpRenderTree/JSUIScriptController.cpp
    33$(BUILT_PRODUCTS_DIR)/DerivedSources/DumpRenderTree/JSUIScriptController.h
    4 $(BUILT_PRODUCTS_DIR)/DerivedSources/DumpRenderTree/TestOptionsGeneratedKeys.h

  • trunk/Tools/DumpRenderTree/DerivedSources.make

    r268682 r268693  
    1 # Copyright (C) 2016-2020 Apple Inc. All rights reserved.
     1# Copyright (C) 2016 Apple Inc. All rights reserved.
    22#
    33# Redistribution and use in source and binary forms, with or without
    … …  
    2222# THE POSSIBILITY OF SUCH DAMAGE.
    2323
    24 RUBY = ruby
    25 
    2624UISCRIPTCONTEXT_DIR = $(DumpRenderTree)/../TestRunnerShared/UIScriptContext/Bindings
    27 DUMPRENDERTREE_PREFERENCES_TEMPLATES_DIR = $(DumpRenderTree)/Scripts/PreferencesTemplates
    2825
    2926VPATH = \
    3027    $(UISCRIPTCONTEXT_DIR) \
    31     $(DUMPRENDERTREE_PREFERENCES_TEMPLATES_DIR) \
    3228#
    3329
    … …  
    5551    $(UICONTEXT_INTERFACES:%=JS%.cpp) \
    5652#
    57 
    58 
    59 WEB_PREFERENCES = \
    60     ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferences.yaml \
    61     ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml \
    62     ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml \
    63     ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml \
    64 #
    65 
    66 WEB_PREFERENCES_GENERATED_FILES = \
    67     TestOptionsGeneratedKeys.h \
    68 #
    69 
    70 all : $(WEB_PREFERENCES_GENERATED_FILES)
    71 
    72 $(WEB_PREFERENCES_GENERATED_FILES) : % : %.erb $(WEB_PREFERENCES) $(WTF_BUILD_SCRIPTS_DIR)/GeneratePreferences.rb
    73         $(RUBY) $(WTF_BUILD_SCRIPTS_DIR)/GeneratePreferences.rb --frontend WebKitLegacy --base ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferences.yaml --debug ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml --experimental ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml --internal ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml --template $<

  • trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj

    r268495 r268693  
    331331                53CBB831134E42F3001CE6A4 /* CyclicRedundancyCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CyclicRedundancyCheck.h; sourceTree = "<group>"; };
    332332                5DE8AE4313A2C15800D6A37D /* libWebCoreTestSupport.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libWebCoreTestSupport.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
    333                 7C44697F25377A020024290A /* TestOptionsGeneratedKeys.h.erb */ = {isa = PBXFileReference; lastKnownFileType = text; path = TestOptionsGeneratedKeys.h.erb; sourceTree = "<group>"; };
    334                 7C44698025377A020024290A /* check-xcfilelists.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "check-xcfilelists.sh"; sourceTree = "<group>"; };
    335                 7C44698125377A020024290A /* generate-derived-sources.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "generate-derived-sources.sh"; sourceTree = "<group>"; };
    336                 7C44698525377E520024290A /* TestOptionsGeneratedKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TestOptionsGeneratedKeys.h; path = TestOptionsGeneratedKeys.h; sourceTree = "<group>"; };
    337333                7CBBC3221DDFCF9A00786B9D /* TestOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestOptions.h; sourceTree = "<group>"; };
    338334                7CFF9BBD2533BB240008009F /* TestFeatures.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestFeatures.h; sourceTree = "<group>"; };
    … …  
    502498                        children = (
    503499                                0F18E6F11D6B9C640027E547 /* DerivedSources.make */,
    504                                 7C44698225377C340024290A /* Derived Sources */,
    505500                                3148A0651E6F90F400D3B316 /* TestRunnerShared */,
    506501                                0F18E6E71D6B9BF50027E547 /* UIScriptContext */,
    … …  
    535530                                417DA9181373674D007C57FB /* WebCoreTestSupport */,
    536531                                A803FF6409CAACC1009B2A37 /* Frameworks */,
    537                                 7C44697D25377A020024290A /* Scripts */,
     532                                9340995508540CAF007F3BC8 /* Products */,
    538533                                BCB281ED0CFA711D007E533E /* Configurations */,
    539                                 9340995508540CAF007F3BC8 /* Products */,
    540534                        );
    541535                        name = DumpRenderTree;
    … …  
    756750                        name = WebCoreTestSupport;
    757751                        sourceTree = "<group>";
    758                 };
    759                 7C44697D25377A020024290A /* Scripts */ = {
    760                         isa = PBXGroup;
    761                         children = (
    762                                 7C44697E25377A020024290A /* PreferencesTemplates */,
    763                                 7C44698025377A020024290A /* check-xcfilelists.sh */,
    764                                 7C44698125377A020024290A /* generate-derived-sources.sh */,
    765                         );
    766                         path = Scripts;
    767                         sourceTree = "<group>";
    768                 };
    769                 7C44697E25377A020024290A /* PreferencesTemplates */ = {
    770                         isa = PBXGroup;
    771                         children = (
    772                                 7C44697F25377A020024290A /* TestOptionsGeneratedKeys.h.erb */,
    773                         );
    774                         path = PreferencesTemplates;
    775                         sourceTree = "<group>";
    776                 };
    777                 7C44698225377C340024290A /* Derived Sources */ = {
    778                         isa = PBXGroup;
    779                         children = (
    780                                 7C44698525377E520024290A /* TestOptionsGeneratedKeys.h */,
    781                         );
    782                         name = "Derived Sources";
    783                         path = DerivedSources/DumpRenderTree;
    784                         sourceTree = BUILT_PRODUCTS_DIR;
    785752                };
    786753                9340995508540CAF007F3BC8 /* Products */ = {

  • trunk/Tools/DumpRenderTree/TestOptions.cpp

    r268495 r268693  
    2727#include "TestOptions.h"
    2828
    29 #include "TestOptionsGeneratedKeys.h"
     29#include "TestFeatures.h"
     30#include <string>
    3031
    3132namespace WTR {
    … …  
    3435{
    3536    static const std::unordered_map<std::string, TestHeaderKeyType> map {
    36         GENERATED_WEB_PREFERENCE_KEY_TYPE_MAPPINGS
     37        { "AcceleratedDrawingEnabled", TestHeaderKeyType::BoolWebPreference },
     38        { "AllowCrossOriginSubresourcesToAskForCredentials", TestHeaderKeyType::BoolWebPreference },
     39        { "AllowTopNavigationToDataURLs", TestHeaderKeyType::BoolWebPreference },
     40        { "AttachmentElementEnabled", TestHeaderKeyType::BoolWebPreference },
     41        { "ColorFilterEnabled", TestHeaderKeyType::BoolWebPreference },
     42        { "InspectorAdditionsEnabled", TestHeaderKeyType::BoolWebPreference },
     43        { "IntersectionObserverEnabled", TestHeaderKeyType::BoolWebPreference },
     44        { "KeygenElementEnabled", TestHeaderKeyType::BoolWebPreference },
     45        { "MenuItemElementEnabled", TestHeaderKeyType::BoolWebPreference },
     46        { "ModernMediaControlsEnabled", TestHeaderKeyType::BoolWebPreference },
     47        { "UsesBackForwardCache", TestHeaderKeyType::BoolWebPreference },
    3748
    3849        { "dumpJSConsoleLogInStdErr", TestHeaderKeyType::BoolTestRunner },

  • trunk/Tools/DumpRenderTree/TestOptions.h

    r268495 r268693  
    3333
    3434struct TestOptions {
    35     // FIXME: Remove these and replace with access to TestFeatures set.
    36     // Web Preferences
     35    bool enableAttachmentElement { false };
     36    bool enableAcceleratedDrawing { false };
     37    bool enableIntersectionObserver { false };
     38    bool useEphemeralSession { false };
     39    bool enableBackForwardCache { false };
     40    bool enableMenuItemElement { false };
     41    bool enableKeygenElement { false };
     42    bool enableModernMediaControls { true };
     43    bool enableDragDestinationActionLoad { false };
     44    bool layerBackedWebView { false };
     45    bool enableInspectorAdditions { false };
     46    bool dumpJSConsoleLogInStdErr { false };
    3747    bool allowCrossOriginSubresourcesToAskForCredentials { false };
    38     bool allowTopNavigationToDataURLs { true };
    39     bool enableAcceleratedDrawing { false };
    40     bool enableAttachmentElement { false };
    41     bool enableBackForwardCache { false };
    4248    bool enableColorFilter { false };
    43     bool enableInspectorAdditions { false };
    44     bool enableIntersectionObserver { false };
    45     bool enableKeygenElement { false };
    46     bool enableMenuItemElement { false };
    47     bool enableModernMediaControls { true };
    48 
    49     // FIXME: Remove these and replace with access to TestFeatures set.
    50     // Internal Features
     49    bool enableSelectionAcrossShadowBoundaries { true };
     50    bool enableWebGPU { false };
    5151    bool enableCSSLogical { false };
    5252    bool enableLineHeightUnits { false };
    53     bool enableSelectionAcrossShadowBoundaries { true };
    54     bool layoutFormattingContextIntegrationEnabled { true };
    55 
    56     // FIXME: Remove these and replace with access to TestFeatures set.
    57     // Experimental Features
    5853    bool adClickAttributionEnabled { false };
    59     bool enableAspectRatioOfImgFromWidthAndHeight { false };
    60     bool enableAsyncClipboardAPI { false };
     54    bool enableResizeObserver { false };
    6155    bool enableCSSOMViewSmoothScrolling { false };
    62     bool enableContactPickerAPI { false };
    6356    bool enableCoreMathML { false };
    6457    bool enableRequestIdleCallback { false };
    65     bool enableResizeObserver { false };
    66     bool enableWebGPU { false };
    67 
    68     // Test Runner Specific Features
    69     bool dumpJSConsoleLogInStdErr { false };
    70     bool enableDragDestinationActionLoad { false };
     58    bool enableAsyncClipboardAPI { false };
     59    bool enableContactPickerAPI { false };
     60    bool layoutFormattingContextIntegrationEnabled { true };
     61    bool enableAspectRatioOfImgFromWidthAndHeight { false };
    7162    bool enableWebSQL { true };
    72     bool layerBackedWebView { false };
    73     bool useEphemeralSession { false };
     63    bool allowTopNavigationToDataURLs { true };
     64    std::string jscOptions;
    7465    std::string additionalSupportedImageTypes;
    75     std::string jscOptions;
    7666
    7767    explicit TestOptions(TestFeatures);

  • trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

    r268495 r268693  
    104104PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(SDKROOT)$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
    105105
    106 WTF_BUILD_SCRIPTS_DIR = $(WTF_BUILD_SCRIPTS_DIR_$(CONFIGURATION));
    107 WTF_BUILD_SCRIPTS_DIR_Release = $(WTF_BUILD_SCRIPTS_DIR_engineering);
    108 WTF_BUILD_SCRIPTS_DIR_Debug = $(WTF_BUILD_SCRIPTS_DIR_engineering);
    109 WTF_BUILD_SCRIPTS_DIR_Production = $(WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
    110 WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include/wtf/Scripts;
    111 WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)/usr/local/include/wtf/Scripts;
    112 WTF_BUILD_SCRIPTS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts;
    113 
    114106WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
    115107WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
    … …  
    138130WK_COCOA_TOUCH_appletvos = cocoatouch;
    139131WK_COCOA_TOUCH_appletvsimulator = cocoatouch;
    140 WK_IS_COCOA_TOUCH = $(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH)));
    141132
    142133HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ForwardingHeaders $(HEADER_SEARCH_PATHS_$(WK_COCOA_TOUCH));
Note: See TracChangeset for help on using the changeset viewer.