Diff
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (291561 => 291562)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-03-21 17:20:35 UTC (rev 291562)
@@ -1,3 +1,13 @@
+2022-03-21 Alex Christensen <achristen...@webkit.org>
+
+ Dust off Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=238121
+
+ Reviewed by Yusuke Suzuki.
+
+ * GLESv2.cmake:
+ * Metal.cmake:
+
2022-03-17 Michael Saboff <msab...@apple.com>
libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path
Modified: trunk/Source/ThirdParty/ANGLE/GLESv2.cmake (291561 => 291562)
--- trunk/Source/ThirdParty/ANGLE/GLESv2.cmake 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/ThirdParty/ANGLE/GLESv2.cmake 2022-03-21 17:20:35 UTC (rev 291562)
@@ -102,7 +102,7 @@
endif()
-if(is_apple)
+if (APPLE)
list(APPEND libangle_common_sources
"src/common/apple/SoftLinking.h"
"src/common/apple/apple_platform.h"
@@ -449,6 +449,7 @@
"src/libANGLE/renderer/ProgramPipelineImpl.cpp"
"src/libANGLE/renderer/QueryImpl.cpp"
"src/libANGLE/renderer/ShaderImpl.cpp"
+ "src/libANGLE/renderer/ShaderInterfaceVariableInfoMap.cpp"
"src/libANGLE/renderer/SurfaceImpl.cpp"
"src/libANGLE/renderer/TextureImpl.cpp"
"src/libANGLE/renderer/driver_utils.cpp"
Modified: trunk/Source/ThirdParty/ANGLE/Metal.cmake (291561 => 291562)
--- trunk/Source/ThirdParty/ANGLE/Metal.cmake 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/ThirdParty/ANGLE/Metal.cmake 2022-03-21 17:20:35 UTC (rev 291562)
@@ -70,8 +70,6 @@
"src/libANGLE/renderer/metal/mtl_format_utils.mm"
"src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.h"
"src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.mm"
- "src/libANGLE/renderer/metal/mtl_glslang_utils.h"
- "src/libANGLE/renderer/metal/mtl_glslang_utils.mm"
"src/libANGLE/renderer/metal/mtl_occlusion_query_pool.h"
"src/libANGLE/renderer/metal/mtl_occlusion_query_pool.mm"
"src/libANGLE/renderer/metal/mtl_render_utils.h"
Modified: trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt (291561 => 291562)
--- trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/ThirdParty/libwebrtc/CMakeLists.txt 2022-03-21 17:20:35 UTC (rev 291562)
@@ -26,14 +26,123 @@
endif ()
set(webrtc_SOURCES
- Source/third_party/abseil-cpp/absl/base/internal/raw_logging.cc
- Source/third_party/abseil-cpp/absl/base/internal/throw_delegate.cc
- Source/third_party/abseil-cpp/absl/strings/ascii.cc
+ Source/third_party/abseil-cpp/absl/strings/match.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/cordz_info.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/cord_internal.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/cordz_sample_token.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/str_format/arg.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/str_format/output.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/str_format/bind.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/str_format/parser.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/str_format/extension.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/cord_rep_ring.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/cordz_handle.cc
Source/third_party/abseil-cpp/absl/strings/internal/memutil.cc
- Source/third_party/abseil-cpp/absl/strings/match.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/ostringstream.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/pow10_helper.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/utf8.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/cordz_functions.cc
+ Source/third_party/abseil-cpp/absl/strings/internal/escaping.cc
Source/third_party/abseil-cpp/absl/strings/string_view.cc
+ Source/third_party/abseil-cpp/absl/strings/str_cat.cc
+ Source/third_party/abseil-cpp/absl/strings/cord.cc
+ Source/third_party/abseil-cpp/absl/strings/ascii.cc
+ Source/third_party/abseil-cpp/absl/strings/numbers.cc
+ Source/third_party/abseil-cpp/absl/strings/charconv.cc
+ Source/third_party/abseil-cpp/absl/strings/str_split.cc
+ Source/third_party/abseil-cpp/absl/strings/substitute.cc
+ Source/third_party/abseil-cpp/absl/strings/escaping.cc
+ Source/third_party/abseil-cpp/absl/strings/str_replace.cc
+ Source/third_party/abseil-cpp/absl/types/bad_any_cast.cc
Source/third_party/abseil-cpp/absl/types/bad_optional_access.cc
Source/third_party/abseil-cpp/absl/types/bad_variant_access.cc
+ Source/third_party/abseil-cpp/absl/flags/parse.cc
+ Source/third_party/abseil-cpp/absl/flags/usage.cc
+ Source/third_party/abseil-cpp/absl/flags/internal/private_handle_accessor.cc
+ Source/third_party/abseil-cpp/absl/flags/internal/usage.cc
+ Source/third_party/abseil-cpp/absl/flags/internal/program_name.cc
+ Source/third_party/abseil-cpp/absl/flags/internal/flag.cc
+ Source/third_party/abseil-cpp/absl/flags/internal/commandlineflag.cc
+ Source/third_party/abseil-cpp/absl/flags/reflection.cc
+ Source/third_party/abseil-cpp/absl/flags/usage_config.cc
+ Source/third_party/abseil-cpp/absl/flags/flag.cc
+ Source/third_party/abseil-cpp/absl/flags/marshalling.cc
+ Source/third_party/abseil-cpp/absl/flags/commandlineflag.cc
+ Source/third_party/abseil-cpp/absl/synchronization/blocking_counter.cc
+ Source/third_party/abseil-cpp/absl/synchronization/mutex.cc
+ Source/third_party/abseil-cpp/absl/synchronization/internal/per_thread_sem.cc
+ Source/third_party/abseil-cpp/absl/synchronization/internal/create_thread_identity.cc
+ Source/third_party/abseil-cpp/absl/synchronization/internal/waiter.cc
+ Source/third_party/abseil-cpp/absl/synchronization/internal/graphcycles.cc
+ Source/third_party/abseil-cpp/absl/synchronization/barrier.cc
+ Source/third_party/abseil-cpp/absl/synchronization/notification.cc
+ Source/third_party/abseil-cpp/absl/hash/internal/wyhash.cc
+ Source/third_party/abseil-cpp/absl/hash/internal/hash.cc
+ Source/third_party/abseil-cpp/absl/hash/internal/print_hash_of.cc
+ Source/third_party/abseil-cpp/absl/hash/internal/city.cc
+ Source/third_party/abseil-cpp/absl/debugging/symbolize.cc
+ Source/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
+ Source/third_party/abseil-cpp/absl/debugging/leak_check_disable.cc
+ Source/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
+ Source/third_party/abseil-cpp/absl/debugging/internal/vdso_support.cc
+ Source/third_party/abseil-cpp/absl/debugging/internal/stack_consumption.cc
+ Source/third_party/abseil-cpp/absl/debugging/internal/address_is_readable.cc
+ Source/third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
+ Source/third_party/abseil-cpp/absl/debugging/internal/demangle.cc
+ Source/third_party/abseil-cpp/absl/debugging/leak_check.cc
+ Source/third_party/abseil-cpp/absl/debugging/stacktrace.cc
+ Source/third_party/abseil-cpp/absl/status/status_payload_printer.cc
+ Source/third_party/abseil-cpp/absl/status/status.cc
+ Source/third_party/abseil-cpp/absl/status/statusor.cc
+ Source/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc
+ Source/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.cc
+ Source/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc
+ Source/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.cc
+ Source/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.cc
+ Source/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc
+ Source/third_party/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc
+ Source/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc
+ Source/third_party/abseil-cpp/absl/time/internal/cctz/src/civil_time_detail.cc
+ Source/third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc
+ Source/third_party/abseil-cpp/absl/time/clock.cc
+ Source/third_party/abseil-cpp/absl/time/duration.cc
+ Source/third_party/abseil-cpp/absl/time/civil_time.cc
+ Source/third_party/abseil-cpp/absl/time/format.cc
+ Source/third_party/abseil-cpp/absl/time/time.cc
+ Source/third_party/abseil-cpp/absl/container/internal/raw_hash_set.cc
+ Source/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler_force_weak_definition.cc
+ Source/third_party/abseil-cpp/absl/container/internal/hashtablez_sampler.cc
+ Source/third_party/abseil-cpp/absl/numeric/int128.cc
+ Source/third_party/abseil-cpp/absl/random/gaussian_distribution.cc
+ Source/third_party/abseil-cpp/absl/random/discrete_distribution.cc
+ Source/third_party/abseil-cpp/absl/random/seed_gen_exception.cc
+ Source/third_party/abseil-cpp/absl/random/internal/gaussian_distribution_gentables.cc
+ Source/third_party/abseil-cpp/absl/random/internal/seed_material.cc
+ Source/third_party/abseil-cpp/absl/random/internal/randen_slow.cc
+ Source/third_party/abseil-cpp/absl/random/internal/chi_square.cc
+ Source/third_party/abseil-cpp/absl/random/internal/randen.cc
+ Source/third_party/abseil-cpp/absl/random/internal/randen_detect.cc
+ Source/third_party/abseil-cpp/absl/random/internal/randen_round_keys.cc
+ Source/third_party/abseil-cpp/absl/random/internal/randen_hwaes.cc
+ Source/third_party/abseil-cpp/absl/random/internal/pool_urbg.cc
+ Source/third_party/abseil-cpp/absl/random/seed_sequences.cc
+ Source/third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc
+ Source/third_party/abseil-cpp/absl/base/internal/periodic_sampler.cc
+ Source/third_party/abseil-cpp/absl/base/internal/cycleclock.cc
+ Source/third_party/abseil-cpp/absl/base/internal/spinlock.cc
+ Source/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
+ Source/third_party/abseil-cpp/absl/base/internal/scoped_set_env.cc
+ Source/third_party/abseil-cpp/absl/base/internal/sysinfo.cc
+ Source/third_party/abseil-cpp/absl/base/internal/raw_logging.cc
+ Source/third_party/abseil-cpp/absl/base/internal/throw_delegate.cc
+ Source/third_party/abseil-cpp/absl/base/internal/strerror.cc
+ Source/third_party/abseil-cpp/absl/base/internal/thread_identity.cc
+ Source/third_party/abseil-cpp/absl/base/internal/exponential_biased.cc
+ Source/third_party/abseil-cpp/absl/base/internal/low_level_alloc.cc
+ Source/third_party/abseil-cpp/absl/base/log_severity.cc
Source/third_party/boringssl/err_data.c
Source/third_party/boringssl/src/crypto/asn1/a_bitstr.c
Source/third_party/boringssl/src/crypto/asn1/a_bool.c
@@ -533,6 +642,7 @@
Source/webrtc/common_audio/window_generator.cc
Source/webrtc/common_video/bitrate_adjuster.cc
Source/webrtc/common_video/frame_rate_estimator.cc
+ Source/webrtc/common_video/framerate_controller.cc
Source/webrtc/common_video/generic_frame_descriptor/generic_frame_info.cc
Source/webrtc/common_video/h264/h264_bitstream_parser.cc
Source/webrtc/common_video/h264/h264_common.cc
@@ -2432,7 +2542,6 @@
Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_neon.h
Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/quantize_neon.c
Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_neon.c
- Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/highbd_vpx_convolve_neon.c
Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type2_neon.asm
Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/fdct32x32_neon.c
Source/third_party/libvpx/source/libvpx/vpx_dsp/arm/transpose_neon.h
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (291561 => 291562)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-03-21 17:20:35 UTC (rev 291562)
@@ -1,3 +1,13 @@
+2022-03-21 Alex Christensen <achristen...@webkit.org>
+
+ Dust off Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=238121
+
+ Reviewed by Yusuke Suzuki.
+
+ * CMakeLists.txt:
+ * Source/third_party/libwebm/common/vp9_level_stats.h:
+
2022-03-17 Michael Saboff <msab...@apple.com>
libANGLE-shared.dylib, libwebrtc.dylib & WebGPU install names are prefixed with the system content path
Modified: trunk/Source/ThirdParty/libwebrtc/Source/third_party/libwebm/common/vp9_level_stats.h (291561 => 291562)
--- trunk/Source/ThirdParty/libwebrtc/Source/third_party/libwebm/common/vp9_level_stats.h 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/ThirdParty/libwebrtc/Source/third_party/libwebm/common/vp9_level_stats.h 2022-03-21 17:20:35 UTC (rev 291562)
@@ -40,10 +40,6 @@
};
struct Vp9LevelRow {
- Vp9LevelRow() = default;
- ~Vp9LevelRow() = default;
- Vp9LevelRow(Vp9LevelRow&& other) = default;
- Vp9LevelRow(const Vp9LevelRow& other) = default;
Vp9LevelRow& operator=(Vp9LevelRow&& other) = delete;
Vp9LevelRow& operator=(const Vp9LevelRow& other) = delete;
Modified: trunk/Source/WebCore/CMakeLists.txt (291561 => 291562)
--- trunk/Source/WebCore/CMakeLists.txt 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/WebCore/CMakeLists.txt 2022-03-21 17:20:35 UTC (rev 291562)
@@ -535,17 +535,20 @@
Modules/remoteplayback/RemotePlayback.idl
Modules/remoteplayback/RemotePlaybackAvailabilityCallback.idl
+ Modules/speech/DOMWindow+SpeechSynthesis.idl
+ Modules/speech/SpeechRecognitionErrorEvent.idl
Modules/speech/SpeechRecognition.idl
Modules/speech/SpeechRecognitionAlternative.idl
Modules/speech/SpeechRecognitionErrorCode.idl
- Modules/speech/SpeechRecognitionErrorEvent.idl
Modules/speech/SpeechRecognitionEvent.idl
Modules/speech/SpeechRecognitionResult.idl
Modules/speech/SpeechRecognitionResultList.idl
-
- Modules/speech/DOMWindow+SpeechSynthesis.idl
+ Modules/speech/SpeechSynthesisErrorEventInit.idl
Modules/speech/SpeechSynthesis.idl
+ Modules/speech/SpeechSynthesisErrorCode.idl
+ Modules/speech/SpeechSynthesisErrorEvent.idl
Modules/speech/SpeechSynthesisEvent.idl
+ Modules/speech/SpeechSynthesisEventInit.idl
Modules/speech/SpeechSynthesisUtterance.idl
Modules/speech/SpeechSynthesisVoice.idl
Modified: trunk/Source/WebCore/ChangeLog (291561 => 291562)
--- trunk/Source/WebCore/ChangeLog 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/WebCore/ChangeLog 2022-03-21 17:20:35 UTC (rev 291562)
@@ -1,3 +1,14 @@
+2022-03-21 Alex Christensen <achristen...@webkit.org>
+
+ Dust off Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=238121
+
+ Reviewed by Yusuke Suzuki.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * SourcesCocoa.txt:
+
2022-03-21 Rob Buis <rb...@igalia.com>
Null check style in Editor::applyParagraphStyle
Modified: trunk/Source/WebCore/PAL/ChangeLog (291561 => 291562)
--- trunk/Source/WebCore/PAL/ChangeLog 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/WebCore/PAL/ChangeLog 2022-03-21 17:20:35 UTC (rev 291562)
@@ -1,3 +1,12 @@
+2022-03-21 Alex Christensen <achristen...@webkit.org>
+
+ Dust off Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=238121
+
+ Reviewed by Yusuke Suzuki.
+
+ * pal/PlatformMac.cmake:
+
2022-03-17 Nikolas Zimmermann <nzimmerm...@igalia.com>
Build broken on macOS Monterey 12.3 - PassKitSPI related error
Modified: trunk/Source/WebCore/PAL/pal/PlatformMac.cmake (291561 => 291562)
--- trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/WebCore/PAL/pal/PlatformMac.cmake 2022-03-21 17:20:35 UTC (rev 291562)
@@ -88,6 +88,7 @@
spi/cocoa/PassKitSPI.h
spi/cocoa/QuartzCoreSPI.h
spi/cocoa/RevealSPI.h
+ spi/cocoa/SceneKitSPI.h
spi/cocoa/SecKeyProxySPI.h
spi/cocoa/ServersSPI.h
spi/cocoa/SpeechSPI.h
@@ -97,6 +98,9 @@
spi/cocoa/WebFilterEvaluatorSPI.h
spi/cocoa/pthreadSPI.h
+ spi/ios/DataDetectorsUISPI.h
+ spi/ios/GraphicsServicesSPI.h
+
spi/mac/CoreUISPI.h
spi/mac/DataDetectorsSPI.h
spi/mac/HIServicesSPI.h
@@ -122,6 +126,7 @@
spi/mac/NSScrollerImpSPI.h
spi/mac/NSScrollingInputFilterSPI.h
spi/mac/NSScrollingMomentumCalculatorSPI.h
+ spi/mac/NSServicesRolloverButtonCellSPI.h
spi/mac/NSSharingServicePickerSPI.h
spi/mac/NSSharingServiceSPI.h
spi/mac/NSSpellCheckerSPI.h
@@ -132,7 +137,6 @@
spi/mac/NSWindowSPI.h
spi/mac/PIPSPI.h
spi/mac/QuickLookMacSPI.h
- spi/mac/SpeechSynthesisSPI.h
spi/mac/SystemPreviewSPI.h
spi/mac/TelephonyUtilitiesSPI.h
Modified: trunk/Source/WebCore/PlatformMac.cmake (291561 => 291562)
--- trunk/Source/WebCore/PlatformMac.cmake 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/WebCore/PlatformMac.cmake 2022-03-21 17:20:35 UTC (rev 291562)
@@ -18,6 +18,7 @@
find_library(OPENGL_LIBRARY OpenGL)
find_library(QUARTZ_LIBRARY Quartz)
find_library(QUARTZCORE_LIBRARY QuartzCore)
+find_library(SCENEKIT_LIBRARY SceneKit)
find_library(SECURITY_LIBRARY Security)
find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration)
find_library(VIDEOTOOLBOX_LIBRARY VideoToolbox)
@@ -50,6 +51,7 @@
${OPENGL_LIBRARY}
${QUARTZ_LIBRARY}
${QUARTZCORE_LIBRARY}
+ ${SCENEKIT_LIBRARY}
${SECURITY_LIBRARY}
${SQLITE3_LIBRARIES}
${SYSTEMCONFIGURATION_LIBRARY}
@@ -91,6 +93,7 @@
"${WEBCORE_DIR}/accessibility/mac"
"${WEBCORE_DIR}/bridge/objc"
"${WEBCORE_DIR}/crypto/mac"
+ "${WEBCORE_DIR}/dom/mac"
"${WEBCORE_DIR}/editing/cocoa"
"${WEBCORE_DIR}/editing/mac"
"${WEBCORE_DIR}/html/shadow/cocoa"
@@ -144,16 +147,6 @@
"${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
)
-list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
- ${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.css
- ${WebCore_DERIVED_SOURCES_DIR}/ModernMediaControls.css
-)
-
-set(WebCore_USER_AGENT_SCRIPTS
- ${WEBCORE_DIR}/Modules/plugins/QuickTimePluginReplacement.js
- ${WebCore_DERIVED_SOURCES_DIR}/ModernMediaControls.js
-)
-
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
"${CMAKE_OSX_SYSROOT}/usr/include/libxslt"
"${CMAKE_OSX_SYSROOT}/usr/include/libxml2"
@@ -160,6 +153,8 @@
)
list(APPEND WebCore_SOURCES
+ Modules/geolocation/cocoa/GeolocationPositionDataCocoa.mm
+
Modules/paymentrequest/MerchantValidationEvent.cpp
Modules/webaudio/MediaStreamAudioSourceCocoa.cpp
@@ -265,6 +260,7 @@
platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm
platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm
+ platform/graphics/avfoundation/objc/QueuedVideoOutput.mm
platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm
platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp
platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm
@@ -371,7 +367,6 @@
platform/mac/PlatformEventFactoryMac.mm
platform/mac/PlatformPasteboardMac.mm
platform/mac/PlatformScreenMac.mm
- platform/mac/PlatformSpeechSynthesizerMac.mm
platform/mac/PowerObserverMac.cpp
platform/mac/PublicSuffixMac.mm
platform/mac/SSLKeyGeneratorMac.mm
@@ -436,7 +431,6 @@
platform/text/mac/TextBoundaries.mm
platform/text/mac/TextCheckingMac.mm
- platform/text/mac/TextEncodingRegistryMac.mm
rendering/RenderThemeCocoa.mm
rendering/RenderThemeMac.mm
@@ -445,6 +439,12 @@
xml/SoftLinkLibxslt.cpp
)
+list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
+ ${WebCore_DERIVED_SOURCES_DIR}/ModernMediaControls.css
+
+ ${WEBCORE_DIR}/html/shadow/mac/imageControlsMac.css
+)
+
list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
Modules/airplay/WebMediaSessionManager.h
Modules/airplay/WebMediaSessionManagerClient.h
@@ -574,6 +574,7 @@
platform/audio/cocoa/AudioDestinationCocoa.h
platform/audio/cocoa/AudioOutputUnitAdaptor.h
platform/audio/cocoa/AudioSampleBufferList.h
+ platform/audio/cocoa/AudioSampleDataConverter.h
platform/audio/cocoa/AudioSampleDataSource.h
platform/audio/cocoa/CAAudioStreamDescription.h
platform/audio/cocoa/CARingBuffer.h
@@ -595,9 +596,9 @@
platform/cocoa/PlaybackSessionModelMediaElement.h
platform/cocoa/PowerSourceNotifier.h
platform/cocoa/SearchPopupMenuCocoa.h
+ platform/cocoa/SharedVideoFrameInfo.h
platform/cocoa/SystemBattery.h
platform/cocoa/SystemVersion.h
- platform/cocoa/VersionChecks.h
platform/cocoa/VideoFullscreenChangeObserver.h
platform/cocoa/VideoFullscreenModel.h
platform/cocoa/VideoFullscreenModelVideoElement.h
@@ -642,6 +643,7 @@
platform/graphics/cg/CGContextStateSaver.h
platform/graphics/cg/ColorSpaceCG.h
+ platform/graphics/cg/GradientRendererCG.h
platform/graphics/cg/GraphicsContextCG.h
platform/graphics/cg/IOSurfacePool.h
platform/graphics/cg/ImageBufferCGBackend.h
@@ -654,6 +656,7 @@
platform/graphics/cocoa/CMUtilities.h
platform/graphics/cocoa/ColorCocoa.h
platform/graphics/cocoa/FontCacheCoreText.h
+ platform/graphics/cocoa/FontCocoa.h
platform/graphics/cocoa/FontFamilySpecificationCoreText.h
platform/graphics/cocoa/GraphicsContextGLCocoa.h
platform/graphics/cocoa/GraphicsContextGLOpenGL.h
@@ -665,7 +668,6 @@
platform/graphics/cocoa/VP9UtilitiesCocoa.h
platform/graphics/cocoa/WebActionDisablingCALayerDelegate.h
platform/graphics/cocoa/WebCoreCALayerExtras.h
- platform/graphics/cocoa/WebGLLayer.h
platform/graphics/cocoa/WebMAudioUtilitiesCocoa.h
platform/graphics/cv/CVUtilities.h
@@ -672,6 +674,7 @@
platform/graphics/cv/GraphicsContextGLCV.h
platform/graphics/cv/ImageRotationSessionVT.h
platform/graphics/cv/PixelBufferConformerCV.h
+ platform/graphics/cv/VideoFrameCV.h
platform/graphics/mac/ColorMac.h
platform/graphics/mac/DisplayConfigurationMonitor.h
@@ -681,7 +684,12 @@
platform/graphics/mac/SwitchingGPUClient.h
platform/graphics/mac/WebLayer.h
- platform/mac/DynamicLinkerInterposing.h
+ platform/ios/PlaybackSessionInterfaceAVKit.h
+ platform/ios/WebAVPlayerController.h
+
+ platform/ios/wak/FloatingPointEnvironment.h
+ platform/ios/wak/WebCoreThreadRun.h
+
platform/mac/HIDDevice.h
platform/mac/HIDElement.h
platform/mac/LegacyNSPasteboardTypes.h
@@ -722,6 +730,7 @@
platform/mediastream/mac/WebAudioSourceProviderCocoa.h
platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.h
+ platform/mediastream/libwebrtc/VideoFrameLibWebRTC.h
platform/network/cf/AuthenticationCF.h
platform/network/cf/AuthenticationChallenge.h
@@ -803,8 +812,6 @@
Modules/applepay/paymentrequest/ApplePayRequest.idl
Modules/applepay-ams-ui/ApplePayAMSUIRequest.idl
-
- Modules/plugins/QuickTimePluginReplacement.idl
)
set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
@@ -813,7 +820,7 @@
${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
)
-set(CSS_VALUE_PLATFORM_DEFINES "WTF_PLATFORM_MAC=1 HAVE_OS_DARK_MODE_SUPPORT=1 WTF_PLATFORM_COCOA=1")
+set(CSS_VALUE_PLATFORM_DEFINES "WTF_PLATFORM_MAC=1 HAVE_OS_DARK_MODE_SUPPORT=1 WTF_PLATFORM_COCOA=1 ENABLE_APPLE_PAY_NEW_BUTTON_TYPES=1")
set(MODERN_MEDIA_CONTROLS_STYLE_SHEETS
"${WEBCORE_DIR}/Modules/modern-media-controls/controls/activity-indicator.css"
@@ -920,6 +927,8 @@
COMMAND cat ${MODERN_MEDIA_CONTROLS_SCRIPTS} > ${WebCore_DERIVED_SOURCES_DIR}/ModernMediaControls.js
VERBATIM)
+set(WebCore_USER_AGENT_SCRIPTS ${WebCore_DERIVED_SOURCES_DIR}/ModernMediaControls.js)
+
list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE WebCore)
list(APPEND WebCoreTestSupport_PRIVATE_HEADERS testing/cocoa/WebArchiveDumpSupport.h)
list(APPEND WebCoreTestSupport_SOURCES
Modified: trunk/Source/WebCore/SourcesCocoa.txt (291561 => 291562)
--- trunk/Source/WebCore/SourcesCocoa.txt 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2022-03-21 17:20:35 UTC (rev 291562)
@@ -280,7 +280,6 @@
platform/cocoa/PowerSourceNotifier.mm
platform/cocoa/RemoteCommandListenerCocoa.mm
platform/cocoa/RuntimeApplicationChecksCocoa.mm
-platform/cocoa/SharedVideoFrameUtilities.mm @no-unify
platform/cocoa/SearchPopupMenuCocoa.mm
platform/cocoa/SharedBufferCocoa.mm
platform/cocoa/SystemVersion.mm
Modified: trunk/Source/WebKit/ChangeLog (291561 => 291562)
--- trunk/Source/WebKit/ChangeLog 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/WebKit/ChangeLog 2022-03-21 17:20:35 UTC (rev 291562)
@@ -1,3 +1,12 @@
+2022-03-21 Alex Christensen <achristen...@webkit.org>
+
+ Dust off Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=238121
+
+ Reviewed by Yusuke Suzuki.
+
+ * PlatformMac.cmake:
+
2022-03-21 Jonathan Bedard <jbed...@apple.com>
Unreviewed, reverting r291558.
Modified: trunk/Source/WebKit/PlatformMac.cmake (291561 => 291562)
--- trunk/Source/WebKit/PlatformMac.cmake 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/WebKit/PlatformMac.cmake 2022-03-21 17:20:35 UTC (rev 291562)
@@ -154,6 +154,7 @@
"${WEBKIT_DIR}/WebProcess/InjectedBundle/API/Cocoa"
"${WEBKIT_DIR}/WebProcess/InjectedBundle/API/mac"
"${WEBKIT_DIR}/WebProcess/MediaSession"
+ "${WEBKIT_DIR}/WebProcess/Model/mac"
"${WEBKIT_DIR}/WebProcess/Plugins/PDF"
"${WEBKIT_DIR}/WebProcess/Plugins/Netscape/mac"
"${WEBKIT_DIR}/WebProcess/WebPage/Cocoa"
@@ -160,6 +161,7 @@
"${WEBKIT_DIR}/WebProcess/WebPage/RemoteLayerTree"
"${WEBKIT_DIR}/WebProcess/WebPage/mac"
"${WEBKIT_DIR}/WebProcess/WebCoreSupport/mac"
+ "${WEBKIT_DIR}/webpushd"
"${WEBKITLEGACY_DIR}"
"${WebKitLegacy_FRAMEWORK_HEADERS_DIR}"
)
@@ -215,6 +217,8 @@
list(APPEND WebKit_MESSAGES_IN_FILES
GPUProcess/media/RemoteImageDecoderAVFProxy
+ GPUProcess/media/ios/RemoteMediaSessionHelperProxy
+
NetworkProcess/CustomProtocols/LegacyCustomProtocolManager
Shared/API/Cocoa/RemoteObjectRegistry
@@ -236,7 +240,6 @@
UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy
UIProcess/WebAuthentication/WebAuthenticatorCoordinatorProxy
- UIProcess/WebAuthentication/WebAuthnProcessProxy
UIProcess/mac/SecItemShimProxy
@@ -247,6 +250,8 @@
WebProcess/GPU/media/RemoteImageDecoderAVFManager
+ WebProcess/GPU/media/ios/RemoteMediaSessionHelper
+
WebProcess/Inspector/WebInspectorUIExtensionController
WebProcess/WebAuthentication/WebAuthnProcessConnection
Modified: trunk/Source/WebKitLegacy/ChangeLog (291561 => 291562)
--- trunk/Source/WebKitLegacy/ChangeLog 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/WebKitLegacy/ChangeLog 2022-03-21 17:20:35 UTC (rev 291562)
@@ -1,3 +1,12 @@
+2022-03-21 Alex Christensen <achristen...@webkit.org>
+
+ Dust off Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=238121
+
+ Reviewed by Yusuke Suzuki.
+
+ * PlatformMac.cmake:
+
2022-03-08 Chris Dumez <cdu...@apple.com>
Optimize further the passing of data across threads
Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake (291561 => 291562)
--- trunk/Source/WebKitLegacy/PlatformMac.cmake 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake 2022-03-21 17:20:35 UTC (rev 291562)
@@ -4,6 +4,7 @@
add_definitions(-iframework ${QUARTZ_LIBRARY}/Frameworks)
add_definitions(-iframework ${APPLICATIONSERVICES_LIBRARY}/Versions/Current/Frameworks)
add_definitions(-DJSC_CLASS_AVAILABLE\\\(...\\\)=)
+add_definitions(-fobjc-weak)
list(APPEND WebKitLegacy_PRIVATE_LIBRARIES
${SECURITYINTERFACE_LIBRARY}
Modified: trunk/Source/bmalloc/ChangeLog (291561 => 291562)
--- trunk/Source/bmalloc/ChangeLog 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/bmalloc/ChangeLog 2022-03-21 17:20:35 UTC (rev 291562)
@@ -1,3 +1,12 @@
+2022-03-21 Alex Christensen <achristen...@webkit.org>
+
+ Dust off Mac CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=238121
+
+ Reviewed by Yusuke Suzuki.
+
+ * PlatformMac.cmake:
+
2022-03-15 Mark Lam <mark....@apple.com>
Remove unused directory local variable in pas_enumerate_segregated_heaps.
Modified: trunk/Source/bmalloc/PlatformMac.cmake (291561 => 291562)
--- trunk/Source/bmalloc/PlatformMac.cmake 2022-03-21 17:15:30 UTC (rev 291561)
+++ trunk/Source/bmalloc/PlatformMac.cmake 2022-03-21 17:20:35 UTC (rev 291562)
@@ -1,6 +1,7 @@
add_definitions(-DBPLATFORM_MAC=1)
list(APPEND bmalloc_SOURCES
+ bmalloc/IsoHeap.cpp
bmalloc/ProcessCheck.mm
)
