Diff
Modified: trunk/ChangeLog (263934 => 263935)
--- trunk/ChangeLog 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/ChangeLog 2020-07-04 16:41:45 UTC (rev 263935)
@@ -1,3 +1,17 @@
+2020-07-03 Darin Adler <[email protected]>
+
+ Make generate-unified-sources.sh not depend on features being listed in FEATURE_DEFINES environment variable
+ https://bugs.webkit.org/show_bug.cgi?id=212420
+
+ Reviewed by Don Olmstead.
+
+ * Source/cmake/WebKitCommon.cmake: Removed call to SET_CONFIGURATION_FOR_UNIFIED_SOURCE_LISTS.
+ * Source/cmake/WebKitFeatures.cmake: Removed SET_CONFIGURATION_FOR_UNIFIED_SOURCE_LISTS.
+ * Source/cmake/WebKitMacros.cmake: Removed use of "--feature-flags" when invoking the
+ generate-unified-source-bundles.rb, which also means no longer depending on the
+ UNIFIED_SOURCE_LIST_ENABLED_FEATURES variable, which was set by the
+ SET_CONFIGURATION_FOR_UNIFIED_SOURCE_LISTS function.
+
2020-07-03 Sam Weinig <[email protected]>
Remove support for ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE
Modified: trunk/Source/_javascript_Core/ChangeLog (263934 => 263935)
--- trunk/Source/_javascript_Core/ChangeLog 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-07-04 16:41:45 UTC (rev 263935)
@@ -1,3 +1,13 @@
+2020-07-03 Darin Adler <[email protected]>
+
+ Make generate-unified-sources.sh not depend on features being listed in FEATURE_DEFINES environment variable
+ https://bugs.webkit.org/show_bug.cgi?id=212420
+
+ Reviewed by Don Olmstead.
+
+ * Scripts/generate-unified-sources.sh: Removed many unneeded quote marks from the
+ invocation of generate-unified-source-bundles.rb.
+
2020-07-04 Darin Adler <[email protected]>
Update comment in FeatureDefines.xcconfig since PlatformEnableCocoa.h should be used instead
Modified: trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh (263934 => 263935)
--- trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh 2020-07-04 16:41:45 UTC (rev 263935)
@@ -21,4 +21,4 @@
echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
fi
-/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" "--source-tree-path" "${SRCROOT}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
+/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" --derived-sources-path "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" --source-tree-path "${SRCROOT}" --max-cpp-bundle-count ${UnifiedSourceCppFileCount} --max-obj-c-bundle-count ${UnifiedSourceMmFileCount} Sources.txt SourcesCocoa.txt "${ARGS[@]}" > /dev/null
Modified: trunk/Source/WTF/ChangeLog (263934 => 263935)
--- trunk/Source/WTF/ChangeLog 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/WTF/ChangeLog 2020-07-04 16:41:45 UTC (rev 263935)
@@ -1,3 +1,13 @@
+2020-07-03 Darin Adler <[email protected]>
+
+ Make generate-unified-sources.sh not depend on features being listed in FEATURE_DEFINES environment variable
+ https://bugs.webkit.org/show_bug.cgi?id=212420
+
+ Reviewed by Don Olmstead.
+
+ * Scripts/generate-unified-source-bundles.rb: Removed the --feature-flags
+ command line option along with the code that implements it.
+
2020-07-03 Sam Weinig <[email protected]>
Remove support for ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE
Modified: trunk/Source/WTF/Scripts/generate-unified-source-bundles.rb (263934 => 263935)
--- trunk/Source/WTF/Scripts/generate-unified-source-bundles.rb 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/WTF/Scripts/generate-unified-source-bundles.rb 2020-07-04 16:41:45 UTC (rev 263935)
@@ -50,7 +50,6 @@
puts "--generate-xcfilelists Generate .xcfilelist files"
puts "--input-xcfilelist-path Path of the generated input .xcfilelist file"
puts "--output-xcfilelist-path Path of the generated output .xcfilelist file"
- puts "--feature-flags (-f) Space or semicolon separated list of enabled feature flags"
puts
puts "Generation options:"
puts "--max-cpp-bundle-count Use global sequential numbers for cpp bundle filenames and set the limit on the number"
@@ -64,7 +63,6 @@
$derivedSourcesPath = nil
$unifiedSourceOutputPath = nil
$sourceTreePath = nil
-$featureFlags = {}
$verbose = false
$mode = :GenerateBundles
$inputXCFilelistPath = nil
@@ -81,7 +79,6 @@
['--verbose', '-v', GetoptLong::NO_ARGUMENT],
['--derived-sources-path', '-d', GetoptLong::REQUIRED_ARGUMENT],
['--source-tree-path', '-s', GetoptLong::REQUIRED_ARGUMENT],
- ['--feature-flags', '-f', GetoptLong::REQUIRED_ARGUMENT],
['--print-bundled-sources', GetoptLong::NO_ARGUMENT],
['--print-all-sources', GetoptLong::NO_ARGUMENT],
['--generate-xcfilelists', GetoptLong::NO_ARGUMENT],
@@ -101,8 +98,6 @@
when '--source-tree-path'
$sourceTreePath = Pathname.new(arg)
usage("Source tree #{arg} does not exist.") if !$sourceTreePath.exist?
- when '--feature-flags'
- arg.gsub(/\s+/, ";").split(";").map { |x| $featureFlags[x] = true }
when '--print-bundled-sources'
$mode = :PrintBundledSources
when '--print-all-sources'
@@ -128,7 +123,6 @@
usage("--derived-sources-path must be specified.") if !$unifiedSourceOutputPath
usage("--source-tree-path must be specified.") if !$sourceTreePath
log("Putting unified sources in #{$unifiedSourceOutputPath}")
-log("Active Feature flags: #{$featureFlags.keys.inspect}")
usage("At least one source list file must be specified.") if ARGV.length == 0
# Even though CMake will only pass us a single semicolon separated arguemnts, we separate all the arguments for simplicity.
@@ -313,7 +307,6 @@
| path, sourceFileIndex |
log("Reading #{path}")
result = []
- inDisabledLines = false
File.read(path).lines.each {
| line |
commentStart = line =~ COMMENT_REGEXP
@@ -323,26 +316,16 @@
log("After: #{line}")
end
line.strip!
- if line == "#endif"
- inDisabledLines = false
- next
- end
- next if line.empty? || inDisabledLines
+ next if line.empty?
- if line =~ /\A#if/
- raise "malformed #if" unless line =~ /\A#if\s+(\S+)/
- inDisabledLines = !$featureFlags[$1]
- else
- if seen[line]
- next if $mode == :GenerateXCFilelists
- raise "duplicate line: #{line} in #{path}"
- end
- seen[line] = true
- result << SourceFile.new(line, sourceFileIndex)
+ if seen[line]
+ next if $mode == :GenerateXCFilelists
+ raise "duplicate line: #{line} in #{path}"
end
+ seen[line] = true
+ result << SourceFile.new(line, sourceFileIndex)
}
- raise "Couldn't find closing \"#endif\"" if inDisabledLines
log("Found #{result.length} source files in #{path}")
sourceFiles += result
Modified: trunk/Source/WebCore/ChangeLog (263934 => 263935)
--- trunk/Source/WebCore/ChangeLog 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/WebCore/ChangeLog 2020-07-04 16:41:45 UTC (rev 263935)
@@ -1,3 +1,21 @@
+2020-07-04 Darin Adler <[email protected]>
+
+ Make generate-unified-sources.sh not depend on features being listed in FEATURE_DEFINES environment variable
+ https://bugs.webkit.org/show_bug.cgi?id=212420
+
+ Reviewed by Don Olmstead.
+
+ * Scripts/generate-unified-sources.sh: Added code to include sources from
+ SourcesCocoaInternalSDK.txt, only if USE_INTERNAL_SDK is YES. Removed --feature-flags
+ argument from invocation of generate-unified-source-bundles.rb. Removed many
+ unnecessary quotes.
+
+ * SourcesCocoa.txt: Removed the names of the files from the internal SDK.
+ * SourcesCocoaInternalSDK.txt: Added. Moved those names here.
+
+ * html/MediaElementSession.cpp: Added some includes, apparently needed because of different
+ groupings of unified sources.
+
2020-07-04 Zalan Bujtas <[email protected]>
[LFC] Used dedicated paint margin structures
Modified: trunk/Source/WebCore/Scripts/generate-unified-sources.sh (263934 => 263935)
--- trunk/Source/WebCore/Scripts/generate-unified-sources.sh 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/WebCore/Scripts/generate-unified-sources.sh 2020-07-04 16:41:45 UTC (rev 263935)
@@ -21,4 +21,9 @@
echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
fi
-/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" "--source-tree-path" "${SRCROOT}" "--feature-flags" "${FEATURE_DEFINES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "--dense-bundle-filter" "JS*" "--dense-bundle-filter" "bindings/js/*" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
+SOURCES="Sources.txt SourcesCocoa.txt"
+if [ "${USE_INTERNAL_SDK}" == "YES" ]; then
+ SOURCES="${SOURCES} SourcesCocoaInternalSDK.txt"
+fi
+
+/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" --derived-sources-path "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" --source-tree-path "${SRCROOT}" --max-cpp-bundle-count ${UnifiedSourceCppFileCount} --max-obj-c-bundle-count ${UnifiedSourceMmFileCount} --dense-bundle-filter "JS*" --dense-bundle-filter "bindings/js/*" $SOURCES "${ARGS[@]}" > /dev/null
Modified: trunk/Source/WebCore/SourcesCocoa.txt (263934 => 263935)
--- trunk/Source/WebCore/SourcesCocoa.txt 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2020-07-04 16:41:45 UTC (rev 263935)
@@ -584,22 +584,3 @@
// Derived Sources
WHLSLStandardLibraryFunctionMap.cpp
-
-// FIXME: These files need to be conditional because of USE_INTERNAL_SDK,
-// not the specific features they implement, and should be merged into a
-// single list with a single #if.
-
-#if ENABLE_MAC_GESTURE_EVENTS
- dom/mac/GestureEvents.cpp
- JSGestureEvent.cpp
-#endif
-
-#if ENABLE_IOS_TOUCH_EVENTS
- JSTouch.cpp
- JSTouchEvent.cpp
- JSTouchList.cpp
-#endif
-
-#if ENABLE_IOS_GESTURE_EVENTS
- JSGestureEvent.cpp
-#endif
Added: trunk/Source/WebCore/SourcesCocoaInternalSDK.txt (0 => 263935)
--- trunk/Source/WebCore/SourcesCocoaInternalSDK.txt (rev 0)
+++ trunk/Source/WebCore/SourcesCocoaInternalSDK.txt 2020-07-04 16:41:45 UTC (rev 263935)
@@ -0,0 +1,31 @@
+// Copyright (C) 2017-2020 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
+
+// FIXME: Consider moving this file into the internal SDK, changing the
+// generate-unified-sources.sh script to look for it there.
+
+JSGestureEvent.cpp
+JSTouch.cpp
+JSTouchEvent.cpp
+JSTouchList.cpp
+dom/mac/GestureEvents.cpp
Modified: trunk/Source/WebCore/html/MediaElementSession.cpp (263934 => 263935)
--- trunk/Source/WebCore/html/MediaElementSession.cpp 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/WebCore/html/MediaElementSession.cpp 2020-07-04 16:41:45 UTC (rev 263935)
@@ -29,6 +29,8 @@
#include "MediaElementSession.h"
+#include "Chrome.h"
+#include "ChromeClient.h"
#include "Document.h"
#include "DocumentLoader.h"
#include "Frame.h"
Modified: trunk/Source/WebKit/ChangeLog (263934 => 263935)
--- trunk/Source/WebKit/ChangeLog 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/WebKit/ChangeLog 2020-07-04 16:41:45 UTC (rev 263935)
@@ -1,3 +1,14 @@
+2020-07-03 Darin Adler <[email protected]>
+
+ Make generate-unified-sources.sh not depend on features being listed in FEATURE_DEFINES environment variable
+ https://bugs.webkit.org/show_bug.cgi?id=212420
+
+ Reviewed by Don Olmstead.
+
+ * Scripts/generate-unified-sources.sh: Removed --feature-flags from the
+ arguments passed to generate-unified-source-bundles.rb. Also removed many
+ unneeded quotes.
+
2020-07-04 Darin Adler <[email protected]>
Update comment in FeatureDefines.xcconfig since PlatformEnableCocoa.h should be used instead
Modified: trunk/Source/WebKit/Scripts/generate-unified-sources.sh (263934 => 263935)
--- trunk/Source/WebKit/Scripts/generate-unified-sources.sh 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/WebKit/Scripts/generate-unified-sources.sh 2020-07-04 16:41:45 UTC (rev 263935)
@@ -21,4 +21,4 @@
echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
fi
-/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2" "--source-tree-path" "${SRCROOT}" "--feature-flags" "${FEATURE_DEFINES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
+/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" --derived-sources-path "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2" --source-tree-path "${SRCROOT}" --max-cpp-bundle-count ${UnifiedSourceCppFileCount} --max-obj-c-bundle-count ${UnifiedSourceMmFileCount} Sources.txt SourcesCocoa.txt "${ARGS[@]}" > /dev/null
Modified: trunk/Source/WebKitLegacy/ChangeLog (263934 => 263935)
--- trunk/Source/WebKitLegacy/ChangeLog 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/WebKitLegacy/ChangeLog 2020-07-04 16:41:45 UTC (rev 263935)
@@ -1,3 +1,14 @@
+2020-07-03 Darin Adler <[email protected]>
+
+ Make generate-unified-sources.sh not depend on features being listed in FEATURE_DEFINES environment variable
+ https://bugs.webkit.org/show_bug.cgi?id=212420
+
+ Reviewed by Don Olmstead.
+
+ * scripts/generate-unified-sources.sh: Removed --feature-flags from the
+ arguments passed to generate-unified-source-bundles.rb. Also removed many
+ unneeded quotes.
+
2020-07-02 Alex Christensen <[email protected]>
Update Mac CMake build
Modified: trunk/Source/WebKitLegacy/scripts/generate-unified-sources.sh (263934 => 263935)
--- trunk/Source/WebKitLegacy/scripts/generate-unified-sources.sh 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/WebKitLegacy/scripts/generate-unified-sources.sh 2020-07-04 16:41:45 UTC (rev 263935)
@@ -21,4 +21,4 @@
echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
fi
-/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" "--derived-sources-path" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy" "--source-tree-path" "${SRCROOT}" "--feature-flags" "${FEATURE_DEFINES}" "--max-cpp-bundle-count" "${UnifiedSourceCppFileCount}" "--max-obj-c-bundle-count" "${UnifiedSourceMmFileCount}" "Sources.txt" "SourcesCocoa.txt" "${ARGS[@]}" > /dev/null
+/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" --derived-sources-path "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy" --source-tree-path "${SRCROOT}" --max-cpp-bundle-count ${UnifiedSourceCppFileCount} --max-obj-c-bundle-count ${UnifiedSourceMmFileCount} Sources.txt SourcesCocoa.txt "${ARGS[@]}" > /dev/null
Modified: trunk/Source/cmake/WebKitCommon.cmake (263934 => 263935)
--- trunk/Source/cmake/WebKitCommon.cmake 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/cmake/WebKitCommon.cmake 2020-07-04 16:41:45 UTC (rev 263935)
@@ -98,6 +98,4 @@
# config.h
# -----------------------------------------------------------------------------
CREATE_CONFIGURATION_HEADER()
-
- SET_CONFIGURATION_FOR_UNIFIED_SOURCE_LISTS()
endif ()
Modified: trunk/Source/cmake/WebKitFeatures.cmake (263934 => 263935)
--- trunk/Source/cmake/WebKitFeatures.cmake 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2020-07-04 16:41:45 UTC (rev 263935)
@@ -401,14 +401,6 @@
file(REMOVE "${CMAKE_BINARY_DIR}/cmakeconfig.h.tmp")
endmacro()
-macro(SET_CONFIGURATION_FOR_UNIFIED_SOURCE_LISTS)
- foreach (_variable_name ${_WEBKIT_CONFIG_FILE_VARIABLES})
- if (${${_variable_name}})
- list(APPEND UNIFIED_SOURCE_LIST_ENABLED_FEATURES ${_variable_name})
- endif ()
- endforeach ()
-endmacro()
-
macro(WEBKIT_CHECK_HAVE_INCLUDE _variable _header)
check_include_file(${_header} ${_variable}_value)
SET_AND_EXPOSE_TO_BUILD(${_variable} ${${_variable}_value})
Modified: trunk/Source/cmake/WebKitMacros.cmake (263934 => 263935)
--- trunk/Source/cmake/WebKitMacros.cmake 2020-07-04 16:33:36 UTC (rev 263934)
+++ trunk/Source/cmake/WebKitMacros.cmake 2020-07-04 16:41:45 UTC (rev 263935)
@@ -17,7 +17,6 @@
"--derived-sources-path" "${_derivedSourcesPath}"
"--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR}
"--print-bundled-sources"
- "--feature-flags" "${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}"
${_sourceListFileTruePaths}
RESULT_VARIABLE _resultTmp
OUTPUT_VARIABLE _outputTmp)
@@ -35,7 +34,6 @@
execute_process(COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb
"--derived-sources-path" "${_derivedSourcesPath}"
"--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR}
- "--feature-flags" "${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}"
${_sourceListFileTruePaths}
RESULT_VARIABLE _resultTmp
OUTPUT_VARIABLE _outputTmp)
@@ -52,7 +50,6 @@
"--derived-sources-path" "${_derivedSourcesPath}"
"--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR}
"--print-all-sources"
- "--feature-flags" "${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}"
${_sourceListFileTruePaths}
RESULT_VARIABLE _resultTmp
OUTPUT_VARIABLE _outputTmp)
