Attachment 357847 Details for Bug 192658 – Patch

[patch] Patch

bug-192658-20181220121049.patch (text/plain), 43.59 KB, created by Alex Christensen on 2018-12-20 12:10:50 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-12-20 12:10:50 PST

Size: 43.59 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>--- ChangeLog	(revision 239408)
>+++ ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2018-12-19  Alex Christensen  <achristensen@webkit.org>
>+
>+        Resurrect Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=192658
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Source/cmake/OptionsMac.cmake:
>+
> 2018-12-19  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [GTK] Cannot build with CMake <3.7
>Index: Source/JavaScriptCore/ChangeLog
>===================================================================
>--- Source/JavaScriptCore/ChangeLog	(revision 239408)
>+++ Source/JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2018-12-19  Alex Christensen  <achristensen@webkit.org>
>+
>+        Resurrect Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=192658
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PlatformMac.cmake:
>+
> 2018-12-18  Simon Fraser  <simon.fraser@apple.com>
> 
>         Web Inspector: Timelines: correctly label Intersection Observer callbacks
>Index: Source/JavaScriptCore/PlatformMac.cmake
>===================================================================
>--- Source/JavaScriptCore/PlatformMac.cmake	(revision 239408)
>+++ Source/JavaScriptCore/PlatformMac.cmake	(working copy)
>@@ -10,6 +10,7 @@ list(APPEND JavaScriptCore_UNIFIED_SOURC
> )
> 
> list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES
>+    ${DERIVED_SOURCES_WTF_DIR}
>     ${JAVASCRIPTCORE_DIR}/disassembler/udis86
>     ${JAVASCRIPTCORE_DIR}/inspector/cocoa
>     ${JAVASCRIPTCORE_DIR}/inspector/remote/cocoa
>Index: Source/WTF/ChangeLog
>===================================================================
>--- Source/WTF/ChangeLog	(revision 239408)
>+++ Source/WTF/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2018-12-19  Alex Christensen  <achristensen@webkit.org>
>+
>+        Resurrect Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=192658
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/PlatformMac.cmake:
>+        * wtf/cf/CFURLExtras.cpp:
>+        * wtf/cf/CFURLExtras.h:
>+        * wtf/cf/URLCF.cpp:
>+        * wtf/cocoa/NSURLExtras.h:
>+        * wtf/cocoa/NSURLExtras.mm:
>+        * wtf/cocoa/URLCocoa.mm:
>+
> 2018-12-19  Eric Carlson  <eric.carlson@apple.com>
> 
>         [MediaStream] Force system camera/microphone TCC prompt if necessary
>Index: Source/WTF/wtf/PlatformMac.cmake
>===================================================================
>--- Source/WTF/wtf/PlatformMac.cmake	(revision 239408)
>+++ Source/WTF/wtf/PlatformMac.cmake	(working copy)
>@@ -8,11 +8,12 @@ list(APPEND WTF_LIBRARIES
> )
> 
> list(APPEND WTF_PUBLIC_HEADERS
>+    WeakObjCPtr.h
>+
>     cf/CFURLExtras.h
>     cf/TypeCastsCF.h
> 
>     cocoa/Entitlements.h
>-    cocoa/MachSendRight.h
>     cocoa/NSURLExtras.h
>     cocoa/SoftLinking.h
> 
>@@ -23,6 +24,7 @@ list(APPEND WTF_PUBLIC_HEADERS
>     spi/cf/CFBundleSPI.h
>     spi/cf/CFStringSPI.h
> 
>+    spi/cocoa/CFXPCBridgeSPI.h
>     spi/cocoa/SecuritySPI.h
>     spi/cocoa/objcSPI.h
> 
>@@ -46,7 +48,7 @@ list(APPEND WTF_SOURCES
> 
>     cocoa/AutodrainedPool.cpp
>     cocoa/CPUTimeCocoa.cpp
>-    cocoa/Entitlements.cpp
>+    cocoa/Entitlements.mm
>     cocoa/MachSendRight.cpp
>     cocoa/MainThreadCocoa.mm
>     cocoa/MemoryFootprintCocoa.cpp
>@@ -69,11 +71,11 @@ list(APPEND WTF_SOURCES
> )
> 
> list(APPEND WTF_PRIVATE_INCLUDE_DIRECTORIES
>-    "${WTF_DIR}/icu"
>     ${DERIVED_SOURCES_WTF_DIR}
> )
> 
> file(COPY mac/MachExceptions.defs DESTINATION ${DERIVED_SOURCES_WTF_DIR})
>+file(COPY "${WTF_DIR}/icu/unicode" DESTINATION ${DERIVED_SOURCES_WTF_DIR})
> 
> add_custom_command(
>     OUTPUT
>Index: Source/WTF/wtf/cf/CFURLExtras.cpp
>===================================================================
>--- Source/WTF/wtf/cf/CFURLExtras.cpp	(revision 239408)
>+++ Source/WTF/wtf/cf/CFURLExtras.cpp	(working copy)
>@@ -24,7 +24,7 @@
>  */
> 
> #include "config.h"
>-#include "CFURLExtras.h"
>+#include <wtf/cf/CFURLExtras.h>
> 
> #include <wtf/URL.h>
> #include <wtf/text/CString.h>
>Index: Source/WTF/wtf/cf/CFURLExtras.h
>===================================================================
>--- Source/WTF/wtf/cf/CFURLExtras.h	(revision 239408)
>+++ Source/WTF/wtf/cf/CFURLExtras.h	(working copy)
>@@ -23,8 +23,7 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#ifndef CFURLExtras_h
>-#define CFURLExtras_h
>+#pragma once
> 
> #include <wtf/Forward.h>
> #include <wtf/RetainPtr.h>
>@@ -42,5 +41,3 @@ WTF_EXPORT_PRIVATE void getURLBytes(CFUR
> bool isCFURLSameOrigin(CFURLRef, const URL&);
> 
> }
>-
>-#endif // CFURLExtras_h
>Index: Source/WTF/wtf/cf/URLCF.cpp
>===================================================================
>--- Source/WTF/wtf/cf/URLCF.cpp	(revision 239408)
>+++ Source/WTF/wtf/cf/URLCF.cpp	(working copy)
>@@ -26,9 +26,9 @@
> #include "config.h"
> #include <wtf/URL.h>
> 
>-#include "CFURLExtras.h"
>-#include "URLParser.h"
> #include <CoreFoundation/CFURL.h>
>+#include <wtf/URLParser.h>
>+#include <wtf/cf/CFURLExtras.h>
> #include <wtf/text/CString.h>
> 
> namespace WTF {
>Index: Source/WTF/wtf/cocoa/NSURLExtras.h
>===================================================================
>--- Source/WTF/wtf/cocoa/NSURLExtras.h	(revision 239408)
>+++ Source/WTF/wtf/cocoa/NSURLExtras.h	(working copy)
>@@ -26,6 +26,8 @@
>  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>+#pragma once
>+
> @class NSString;
> @class NSURL;
> 
>Index: Source/WTF/wtf/cocoa/NSURLExtras.mm
>===================================================================
>--- Source/WTF/wtf/cocoa/NSURLExtras.mm	(revision 239408)
>+++ Source/WTF/wtf/cocoa/NSURLExtras.mm	(working copy)
>@@ -30,16 +30,16 @@
> #import <Foundation/Foundation.h>
> #import "NSURLExtras.h"
> 
>-#import "CFURLExtras.h"
>-#import "URLParser.h"
>+#import <unicode/uchar.h>
>+#import <unicode/uidna.h>
>+#import <unicode/uscript.h>
> #import <wtf/Function.h>
> #import <wtf/HexNumber.h>
> #import <wtf/ObjCRuntimeExtras.h>
> #import <wtf/RetainPtr.h>
>+#import <wtf/URLParser.h>
> #import <wtf/Vector.h>
>-#import <unicode/uchar.h>
>-#import <unicode/uidna.h>
>-#import <unicode/uscript.h>
>+#import <wtf/cf/CFURLExtras.h>
> 
> // Needs to be big enough to hold an IDN-encoded name.
> // For host names bigger than this, we won't do IDN encoding, which is almost certainly OK.
>Index: Source/WTF/wtf/cocoa/URLCocoa.mm
>===================================================================
>--- Source/WTF/wtf/cocoa/URLCocoa.mm	(revision 239408)
>+++ Source/WTF/wtf/cocoa/URLCocoa.mm	(working copy)
>@@ -26,10 +26,10 @@
> #import "config.h"
> #import <wtf/URL.h>
> 
>-#import "CFURLExtras.h"
>-#import "NSURLExtras.h"
> #import <wtf/ObjCRuntimeExtras.h>
> #import <wtf/URLParser.h>
>+#import <wtf/cf/CFURLExtras.h>
>+#import <wtf/cocoa/NSURLExtras.h>
> #import <wtf/text/CString.h>
> 
> @interface NSString (WTFNSURLExtras)
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 239408)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2018-12-19  Alex Christensen  <achristensen@webkit.org>
>+
>+        Resurrect Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=192658
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This makes it so JSC and most of WebCore builds.
>+        WebCore's use of ARC seems inconsistent, so I'll fix that later.
>+
>+        * PlatformMac.cmake:
>+        * config.h:
>+
> 2018-12-18  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         SVGUseElement::findTarget should return nullptr when there is a cycle
>Index: Source/WebCore/CMakeLists.txt
>===================================================================
>--- Source/WebCore/CMakeLists.txt	(revision 239408)
>+++ Source/WebCore/CMakeLists.txt	(working copy)
>@@ -1841,7 +1841,7 @@ add_custom_command(
>     DEPENDS ${WebCore_CSS_VALUE_KEYWORDS}
>     WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
>     COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in
>-    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --gperf-executable "${GPERF_EXECUTABLE}"
>+    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${CSS_VALUE_PLATFORM_DEFINES}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --gperf-executable "${GPERF_EXECUTABLE}"
>     VERBATIM)
> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp)
> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
>Index: Source/WebCore/PlatformMac.cmake
>===================================================================
>--- Source/WebCore/PlatformMac.cmake	(revision 239408)
>+++ Source/WebCore/PlatformMac.cmake	(working copy)
>@@ -1,4 +1,3 @@
>-find_library(ACCELERATE_LIBRARY accelerate)
> find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
> find_library(AVFOUNDATION_LIBRARY AVFoundation)
> find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
>@@ -23,11 +22,9 @@ find_package(ZLIB REQUIRED)
> 
> list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES
>     "SourcesCocoa.txt"
>-    "SourcesMac.txt"
> )
> 
> list(APPEND WebCore_LIBRARIES
>-    ${ACCELERATE_LIBRARY}
>     ${AUDIOTOOLBOX_LIBRARY}
>     ${AUDIOUNIT_LIBRARY}
>     ${AVFOUNDATION_LIBRARY}
>@@ -67,6 +64,8 @@ if (NOT LOOKUP_FRAMEWORK-NOTFOUND)
> endif ()
> 
> list(APPEND WebCore_INCLUDE_DIRECTORIES
>+    "${CMAKE_SOURCE_DIR}/Source"
>+    "${DERIVED_SOURCES_WTF_DIR}"
>     "${THIRDPARTY_DIR}/ANGLE"
>     "${THIRDPARTY_DIR}/ANGLE/include/KHR"
>     "${WEBCORE_DIR}/accessibility/mac"
>@@ -94,6 +93,7 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/platform/graphics/cg"
>     "${WEBCORE_DIR}/platform/graphics/cv"
>     "${WEBCORE_DIR}/platform/graphics/gpu"
>+    "${WEBCORE_DIR}/platform/graphics/gpu/legacy"
>     "${WEBCORE_DIR}/platform/graphics/egl"
>     "${WEBCORE_DIR}/platform/graphics/opentype"
>     "${WEBCORE_DIR}/platform/graphics/opengl"
>@@ -142,11 +142,9 @@ list(APPEND WebCore_SOURCES
>     editing/ios/AutofillElements.cpp
> 
>     editing/mac/AlternativeTextUIController.mm
>-    editing/mac/DictionaryLookup.mm
>     editing/mac/EditorMac.mm
>     editing/mac/TextAlternativeWithRange.mm
>     editing/mac/TextUndoInsertionMarkupMac.mm
>-    editing/mac/WebContentReaderMac.mm
> 
>     html/HTMLSlotElement.cpp
> 
>@@ -158,7 +156,6 @@ list(APPEND WebCore_SOURCES
>     page/mac/EventHandlerMac.mm
>     page/mac/ServicesOverlayController.mm
>     page/mac/TextIndicatorWindow.mm
>-    page/mac/UserAgentMac.mm
>     page/mac/WheelEventDeltaFilterMac.mm
> 
>     page/scrolling/mac/ScrollingCoordinatorMac.mm
>@@ -173,7 +170,6 @@ list(APPEND WebCore_SOURCES
> 
>     platform/audio/AudioSession.cpp
> 
>-    platform/audio/cocoa/MediaSessionManagerCocoa.cpp
>     platform/audio/cocoa/WebAudioBufferList.cpp
> 
>     platform/audio/mac/CAAudioStreamDescription.cpp
>@@ -185,7 +181,6 @@ list(APPEND WebCore_SOURCES
>     platform/audio/mac/AudioSessionMac.cpp
>     platform/audio/mac/CARingBuffer.cpp
>     platform/audio/mac/FFTFrameMac.cpp
>-    platform/audio/mac/MediaSessionManagerMac.mm
> 
>     platform/cf/FileSystemCF.cpp
>     platform/cf/KeyedDecoderCF.cpp
>@@ -202,7 +197,6 @@ list(APPEND WebCore_SOURCES
>     platform/cocoa/KeyEventCocoa.mm
>     platform/cocoa/LocalizedStringsCocoa.mm
>     platform/cocoa/MIMETypeRegistryCocoa.mm
>-    platform/cocoa/MachSendRight.cpp
>     platform/cocoa/NetworkExtensionContentFilter.mm
>     platform/cocoa/ParentalControlsContentFilter.mm
>     platform/cocoa/PasteboardCocoa.mm
>@@ -328,34 +322,10 @@ list(APPEND WebCore_SOURCES
>     platform/graphics/mac/IntPointMac.mm
>     platform/graphics/mac/IntRectMac.mm
>     platform/graphics/mac/IntSizeMac.mm
>-    platform/graphics/mac/MediaPlayerPrivateQTKit.mm
>-    platform/graphics/mac/MediaTimeQTKit.mm
>     platform/graphics/mac/PDFDocumentImageMac.mm
>     platform/graphics/mac/SimpleFontDataCoreText.cpp
>     platform/graphics/mac/WebLayer.mm
> 
>-    platform/graphics/metal/GPUBufferMetal.mm
>-    platform/graphics/metal/GPUCommandBufferMetal.mm
>-    platform/graphics/metal/GPUCommandQueueMetal.mm
>-    platform/graphics/metal/GPUComputeCommandEncoderMetal.mm
>-    platform/graphics/metal/GPUComputePipelineStateMetal.mm
>-    platform/graphics/metal/GPUDepthStencilDescriptorMetal.mm
>-    platform/graphics/metal/GPUDepthStencilStateMetal.mm
>-    platform/graphics/metal/GPUDeviceMetal.mm
>-    platform/graphics/metal/GPUDrawableMetal.mm
>-    platform/graphics/metal/GPUFunctionMetal.mm
>-    platform/graphics/metal/GPULibraryMetal.mm
>-    platform/graphics/metal/GPURenderCommandEncoderMetal.mm
>-    platform/graphics/metal/GPURenderPassAttachmentDescriptorMetal.mm
>-    platform/graphics/metal/GPURenderPassColorAttachmentDescriptorMetal.mm
>-    platform/graphics/metal/GPURenderPassDepthAttachmentDescriptorMetal.mm
>-    platform/graphics/metal/GPURenderPassDescriptorMetal.mm
>-    platform/graphics/metal/GPURenderPipelineColorAttachmentDescriptorMetal.mm
>-    platform/graphics/metal/GPURenderPipelineDescriptorMetal.mm
>-    platform/graphics/metal/GPURenderPipelineStateMetal.mm
>-    platform/graphics/metal/GPUTextureDescriptorMetal.mm
>-    platform/graphics/metal/GPUTextureMetal.mm
>-
>     platform/graphics/opengl/Extensions3DOpenGL.cpp
>     platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
>     platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
>@@ -404,7 +374,6 @@ list(APPEND WebCore_SOURCES
>     platform/mac/WebCoreObjCExtras.mm
>     platform/mac/WebGLBlacklist.mm
>     platform/mac/WebNSAttributedStringExtras.mm
>-    platform/mac/WebWindowAnimation.mm
>     platform/mac/WidgetMac.mm
> 
>     platform/mediastream/mac/MockRealtimeVideoSourceMac.mm
>@@ -512,6 +481,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORI
>     html/forms
>     html/parser
>     html/shadow
>+    html/track
> 
>     inspector/agents
> 
>@@ -534,6 +504,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORI
>     platform/audio
>     platform/cf
>     platform/cocoa
>+    platform/ios
>     platform/graphics
>     platform/mac
>     platform/mediastream
>@@ -547,6 +518,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORI
>     platform/gamepad/cocoa
>     platform/gamepad/mac
> 
>+    platform/graphics/avfoundation
>     platform/graphics/ca
>     platform/graphics/cocoa
>     platform/graphics/cg
>@@ -647,6 +619,7 @@ set(ADDITIONAL_BINDINGS_DEPENDENCIES
>     ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
>     ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
> )
>+set(CSS_VALUE_PLATFORM_DEFINES WTF_PLATFORM_MAC=1)
> 
> list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE WebCore)
> list(APPEND WebCoreTestSupport_SOURCES
>Index: Source/WebCore/SourcesCocoa.txt
>===================================================================
>--- Source/WebCore/SourcesCocoa.txt	(revision 239408)
>+++ Source/WebCore/SourcesCocoa.txt	(working copy)
>@@ -493,7 +493,6 @@ platform/mediastream/ios/CoreAudioCaptur
> 
> platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp
> platform/mediastream/mac/AVCaptureDeviceManager.mm @no-unify
>-platform/mediastream/mac/AVMediaCaptureSource.mm @no-unify
> platform/mediastream/mac/AVVideoCaptureSource.mm @no-unify
> platform/mediastream/mac/MockRealtimeVideoSourceMac.mm
> 
>Index: Source/WebCore/config.h
>===================================================================
>--- Source/WebCore/config.h	(revision 239408)
>+++ Source/WebCore/config.h	(working copy)
>@@ -36,6 +36,9 @@
> // Using CMake with Unix makefiles does not use prefix headers.
> #if PLATFORM(MAC) && defined(BUILDING_WITH_CMAKE)
> #include "WebCorePrefix.h"
>+#ifndef JSC_API_AVAILABLE
>+#define JSC_API_AVAILABLE(...)
>+#endif
> #endif
> 
> #ifdef __cplusplus
>Index: Source/WebCore/Modules/webgpu/WHLSL/WHLSLLexer.cpp
>===================================================================
>--- Source/WebCore/Modules/webgpu/WHLSL/WHLSLLexer.cpp	(revision 239408)
>+++ Source/WebCore/Modules/webgpu/WHLSL/WHLSLLexer.cpp	(working copy)
>@@ -25,11 +25,11 @@
> 
> #pragma once
> 
>-#if ENABLE(WEBGPU)
>-
> #include "config.h"
> #include "WHLSLLexer.h"
> 
>+#if ENABLE(WEBGPU)
>+
> namespace WebCore {
> 
> namespace WHLSL {
>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 239408)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2018-12-19  Alex Christensen  <achristensen@webkit.org>
>+
>+        Resurrect Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=192658
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/PlatformMac.cmake:
>+
> 2018-12-17  Saam barati  <sbarati@apple.com>
> 
>         Enable HTTP and HTTPS proxies on iOS and make it a property of the NSURLSession
>Index: Source/WebCore/PAL/pal/PlatformMac.cmake
>===================================================================
>--- Source/WebCore/PAL/pal/PlatformMac.cmake	(revision 239408)
>+++ Source/WebCore/PAL/pal/PlatformMac.cmake	(working copy)
>@@ -16,6 +16,7 @@ list(APPEND PAL_PUBLIC_HEADERS
>     spi/cg/ImageIOSPI.h
> 
>     spi/cocoa/AVKitSPI.h
>+    spi/cocoa/AudioToolboxSPI.h
>     spi/cocoa/CFNSURLConnectionSPI.h
>     spi/cocoa/CoreTextSPI.h
>     spi/cocoa/DataDetectorsCoreSPI.h
>@@ -47,7 +48,11 @@ list(APPEND PAL_PUBLIC_HEADERS
>     spi/cocoa/WebFilterEvaluatorSPI.h
>     spi/cocoa/pthreadSPI.h
> 
>+    spi/ios/DataDetectorsUISPI.h
>+    spi/ios/GraphicsServicesSPI.h
>+
>     spi/mac/AVFoundationSPI.h
>+    spi/mac/CoreUISPI.h
>     spi/mac/DataDetectorsSPI.h
>     spi/mac/HIServicesSPI.h
>     spi/mac/HIToolboxSPI.h
>@@ -55,11 +60,13 @@ list(APPEND PAL_PUBLIC_HEADERS
>     spi/mac/MediaRemoteSPI.h
>     spi/mac/MetadataSPI.h
>     spi/mac/NSAccessibilitySPI.h
>+    spi/mac/NSAppearanceSPI.h
>     spi/mac/NSApplicationSPI.h
>     spi/mac/NSCellSPI.h
>     spi/mac/NSEventSPI.h
>     spi/mac/NSFontSPI.h
>     spi/mac/NSGraphicsSPI.h
>+    spi/mac/NSImageSPI.h
>     spi/mac/NSImmediateActionGestureRecognizerSPI.h
>     spi/mac/NSMenuSPI.h
>     spi/mac/NSPasteboardSPI.h
>@@ -97,7 +104,6 @@ list(APPEND PAL_SOURCES
>     cf/CoreMediaSoftLink.cpp
> 
>     cocoa/FileSizeFormatterCocoa.mm
>-    cocoa/LoggingCocoa.mm
>     cocoa/PassKitSoftLink.mm
> 
>     crypto/commoncrypto/CryptoDigestCommonCrypto.cpp
>@@ -115,6 +121,7 @@ list(APPEND PAL_SOURCES
> )
> 
> list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
>+    "${DERIVED_SOURCES_WTF_DIR}"
>     "${PAL_DIR}/pal/avfoundation"
>     "${PAL_DIR}/pal/cf"
>     "${PAL_DIR}/pal/cocoa"
>Index: Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h
>===================================================================
>--- Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h	(revision 239408)
>+++ Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h	(working copy)
>@@ -26,12 +26,13 @@
> #if PLATFORM(MAC)
> 
> #import <wtf/RetainPtr.h>
>+#import <wtf/WeakObjCPtr.h>
> 
> WEBCORE_EXPORT @interface WebCoreFullScreenPlaceholderView : NSView {
> @private
>     RetainPtr<NSVisualEffectView> _effectView;
>     RetainPtr<NSTextField> _exitWarning;
>-    __weak NSResponder *_target;
>+    WeakObjCPtr<NSResponder> _target;
> }
> @property (nullable, strong) id contents;
> @property (nullable, weak) NSResponder *target;
>Index: Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm
>===================================================================
>--- Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm	(revision 239408)
>+++ Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm	(working copy)
>@@ -81,7 +81,15 @@ - (id)initWithFrame:(NSRect)frameRect
>     return self;
> }
> 
>-@synthesize target = _target;
>+- (NSResponder *)target
>+{
>+    return _target.get().get();
>+}
>+
>+- (void)setTarget:(NSResponder *)target
>+{
>+    _target = target;
>+}
> 
> @dynamic contents;
> 
>Index: Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm
>===================================================================
>--- Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm	(revision 239408)
>+++ Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm	(nonexistent)
>@@ -1,439 +0,0 @@
>-/*
>- * Copyright (C) 2013-2015 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. ``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
>- * 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.
>- */
>-
>-#import "config.h"
>-#import "AVMediaCaptureSource.h"
>-
>-#if ENABLE(MEDIA_STREAM) && USE(AVFOUNDATION)
>-
>-#import "AVCaptureDeviceManager.h"
>-#import "AudioSourceProvider.h"
>-#import "Logging.h"
>-#import "MediaConstraints.h"
>-#import "RealtimeMediaSourceSettings.h"
>-#import <AVFoundation/AVCaptureDevice.h>
>-#import <AVFoundation/AVCaptureInput.h>
>-#import <AVFoundation/AVCaptureOutput.h>
>-#import <AVFoundation/AVCaptureSession.h>
>-#import <AVFoundation/AVError.h>
>-#import <objc/runtime.h>
>-#import <wtf/MainThread.h>
>-
>-#import <pal/cf/CoreMediaSoftLink.h>
>-
>-typedef AVCaptureConnection AVCaptureConnectionType;
>-typedef AVCaptureDevice AVCaptureDeviceTypedef;
>-typedef AVCaptureDeviceInput AVCaptureDeviceInputType;
>-typedef AVCaptureOutput AVCaptureOutputType;
>-typedef AVCaptureSession AVCaptureSessionType;
>-typedef AVCaptureAudioDataOutput AVCaptureAudioDataOutputType;
>-typedef AVCaptureVideoDataOutput AVCaptureVideoDataOutputType;
>-
>-SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
>-
>-SOFT_LINK_CLASS(AVFoundation, AVCaptureAudioDataOutput)
>-SOFT_LINK_CLASS(AVFoundation, AVCaptureConnection)
>-SOFT_LINK_CLASS(AVFoundation, AVCaptureDevice)
>-SOFT_LINK_CLASS(AVFoundation, AVCaptureDeviceInput)
>-SOFT_LINK_CLASS(AVFoundation, AVCaptureOutput)
>-SOFT_LINK_CLASS(AVFoundation, AVCaptureSession)
>-SOFT_LINK_CLASS(AVFoundation, AVCaptureVideoDataOutput)
>-
>-#define AVCaptureAudioDataOutput getAVCaptureAudioDataOutputClass()
>-#define AVCaptureConnection getAVCaptureConnectionClass()
>-#define AVCaptureDevice getAVCaptureDeviceClass()
>-#define AVCaptureDeviceInput getAVCaptureDeviceInputClass()
>-#define AVCaptureOutput getAVCaptureOutputClass()
>-#define AVCaptureSession getAVCaptureSessionClass()
>-#define AVCaptureVideoDataOutput getAVCaptureVideoDataOutputClass()
>-
>-SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeAudio, NSString *)
>-SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeMuxed, NSString *)
>-SOFT_LINK_CONSTANT(AVFoundation, AVMediaTypeVideo, NSString *)
>-
>-#define AVMediaTypeAudio getAVMediaTypeAudio()
>-#define AVMediaTypeMuxed getAVMediaTypeMuxed()
>-#define AVMediaTypeVideo getAVMediaTypeVideo()
>-
>-#if PLATFORM(IOS_FAMILY)
>-SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionRuntimeErrorNotification, NSString *)
>-SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionWasInterruptedNotification, NSString *)
>-SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionInterruptionEndedNotification, NSString *)
>-SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionInterruptionReasonKey, NSString *)
>-SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVCaptureSessionErrorKey, NSString *)
>-
>-#define AVCaptureSessionRuntimeErrorNotification getAVCaptureSessionRuntimeErrorNotification()
>-#define AVCaptureSessionWasInterruptedNotification getAVCaptureSessionWasInterruptedNotification()
>-#define AVCaptureSessionInterruptionEndedNotification getAVCaptureSessionInterruptionEndedNotification()
>-#define AVCaptureSessionInterruptionReasonKey getAVCaptureSessionInterruptionReasonKey()
>-#define AVCaptureSessionErrorKey getAVCaptureSessionErrorKey()
>-#endif
>-
>-using namespace WebCore;
>-
>-@interface WebCoreAVMediaCaptureSourceObserver : NSObject<AVCaptureAudioDataOutputSampleBufferDelegate, AVCaptureVideoDataOutputSampleBufferDelegate>
>-{
>-    AVMediaCaptureSource* m_callback;
>-}
>-
>--(id)initWithCallback:(AVMediaCaptureSource*)callback;
>--(void)disconnect;
>--(void)addNotificationObservers;
>--(void)removeNotificationObservers;
>--(void)captureOutput:(AVCaptureOutputType*)captureOutput didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer fromConnection:(AVCaptureConnectionType*)connection;
>--(void)observeValueForKeyPath:keyPath ofObject:(id)object change:(NSDictionary*)change context:(void*)context;
>-#if PLATFORM(IOS_FAMILY)
>--(void)sessionRuntimeError:(NSNotification*)notification;
>--(void)beginSessionInterrupted:(NSNotification*)notification;
>--(void)endSessionInterrupted:(NSNotification*)notification;
>-#endif
>-@end
>-
>-namespace WebCore {
>-
>-static NSArray<NSString*>* sessionKVOProperties();
>-
>-static dispatch_queue_t globaAudioCaptureSerialQueue()
>-{
>-    static dispatch_queue_t globalQueue;
>-    static dispatch_once_t onceToken;
>-    dispatch_once(&onceToken, ^{
>-        globalQueue = dispatch_queue_create("WebCoreAVMediaCaptureSource audio capture queue", DISPATCH_QUEUE_SERIAL);
>-    });
>-    return globalQueue;
>-}
>-
>-static dispatch_queue_t globaVideoCaptureSerialQueue()
>-{
>-    static dispatch_queue_t globalQueue;
>-    static dispatch_once_t onceToken;
>-    dispatch_once(&onceToken, ^{
>-        globalQueue = dispatch_queue_create_with_target("WebCoreAVMediaCaptureSource video capture queue", DISPATCH_QUEUE_SERIAL, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0));
>-    });
>-    return globalQueue;
>-}
>-
>-AVMediaCaptureSource::AVMediaCaptureSource(AVCaptureDeviceTypedef* device, const AtomicString& id, RealtimeMediaSource::Type type)
>-    : RealtimeMediaSource(id, type, device.localizedName)
>-    , m_objcObserver(adoptNS([[WebCoreAVMediaCaptureSourceObserver alloc] initWithCallback:this]))
>-    , m_device(device)
>-{
>-#if PLATFORM(IOS_FAMILY)
>-    static_assert(static_cast<int>(InterruptionReason::VideoNotAllowedInBackground) == static_cast<int>(AVCaptureSessionInterruptionReasonVideoDeviceNotAvailableInBackground), "InterruptionReason::VideoNotAllowedInBackground is not AVCaptureSessionInterruptionReasonVideoDeviceNotAvailableInBackground as expected");
>-    static_assert(static_cast<int>(InterruptionReason::VideoNotAllowedInSideBySide) == AVCaptureSessionInterruptionReasonVideoDeviceNotAvailableWithMultipleForegroundApps, "InterruptionReason::VideoNotAllowedInSideBySide is not AVCaptureSessionInterruptionReasonVideoDeviceNotAvailableWithMultipleForegroundApps as expected");
>-    static_assert(static_cast<int>(InterruptionReason::VideoInUse) == AVCaptureSessionInterruptionReasonVideoDeviceInUseByAnotherClient, "InterruptionReason::VideoInUse is not AVCaptureSessionInterruptionReasonVideoDeviceInUseByAnotherClient as expected");
>-    static_assert(static_cast<int>(InterruptionReason::AudioInUse) == AVCaptureSessionInterruptionReasonAudioDeviceInUseByAnotherClient, "InterruptionReason::AudioInUse is not AVCaptureSessionInterruptionReasonAudioDeviceInUseByAnotherClient as expected");
>-#endif
>-    
>-    setPersistentID(String(device.uniqueID));
>-}
>-
>-AVMediaCaptureSource::~AVMediaCaptureSource()
>-{
>-    [m_objcObserver disconnect];
>-
>-    if (!m_session)
>-        return;
>-
>-    for (NSString *keyName in sessionKVOProperties())
>-        [m_session removeObserver:m_objcObserver.get() forKeyPath:keyName];
>-
>-    if ([m_session isRunning])
>-        [m_session stopRunning];
>-
>-}
>-
>-void AVMediaCaptureSource::startProducingData()
>-{
>-    if (!m_session) {
>-        if (!setupSession())
>-            return;
>-    }
>-
>-    if ([m_session isRunning])
>-        return;
>-
>-    [m_objcObserver addNotificationObservers];
>-    [m_session startRunning];
>-}
>-
>-void AVMediaCaptureSource::stopProducingData()
>-{
>-    if (!m_session)
>-        return;
>-
>-    [m_objcObserver removeNotificationObservers];
>-
>-    if ([m_session isRunning])
>-        [m_session stopRunning];
>-
>-    m_interruption = InterruptionReason::None;
>-#if PLATFORM(IOS_FAMILY)
>-    m_session = nullptr;
>-#endif
>-}
>-
>-void AVMediaCaptureSource::beginConfiguration()
>-{
>-    if (m_session)
>-        [m_session beginConfiguration];
>-}
>-
>-void AVMediaCaptureSource::commitConfiguration()
>-{
>-    if (m_session)
>-        [m_session commitConfiguration];
>-}
>-
>-void AVMediaCaptureSource::initializeSettings()
>-{
>-    if (m_currentSettings.deviceId().isEmpty())
>-        m_currentSettings.setSupportedConstraints(supportedConstraints());
>-
>-    m_currentSettings.setDeviceId(id());
>-    updateSettings(m_currentSettings);
>-}
>-
>-const RealtimeMediaSourceSettings& AVMediaCaptureSource::settings() const
>-{
>-    const_cast<AVMediaCaptureSource&>(*this).initializeSettings();
>-    return m_currentSettings;
>-}
>-
>-RealtimeMediaSourceSupportedConstraints& AVMediaCaptureSource::supportedConstraints()
>-{
>-    if (m_supportedConstraints.supportsDeviceId())
>-        return m_supportedConstraints;
>-
>-    m_supportedConstraints.setSupportsDeviceId(true);
>-    initializeSupportedConstraints(m_supportedConstraints);
>-
>-    return m_supportedConstraints;
>-}
>-
>-void AVMediaCaptureSource::initializeCapabilities()
>-{
>-    m_capabilities = std::make_unique<RealtimeMediaSourceCapabilities>(supportedConstraints());
>-    m_capabilities->setDeviceId(id());
>-
>-    initializeCapabilities(*m_capabilities.get());
>-}
>-
>-const RealtimeMediaSourceCapabilities& AVMediaCaptureSource::capabilities() const
>-{
>-    if (!m_capabilities)
>-        const_cast<AVMediaCaptureSource&>(*this).initializeCapabilities();
>-    return *m_capabilities;
>-}
>-
>-bool AVMediaCaptureSource::setupSession()
>-{
>-    if (m_session)
>-        return true;
>-
>-    m_session = adoptNS([allocAVCaptureSessionInstance() init]);
>-    for (NSString* keyName in sessionKVOProperties())
>-        [m_session addObserver:m_objcObserver.get() forKeyPath:keyName options:NSKeyValueObservingOptionNew context:(void *)nil];
>-
>-    [m_session beginConfiguration];
>-    bool success = setupCaptureSession();
>-    [m_session commitConfiguration];
>-
>-    if (!success)
>-        captureFailed();
>-
>-    return success;
>-}
>-
>-void AVMediaCaptureSource::captureSessionIsRunningDidChange(bool state)
>-{
>-    scheduleDeferredTask([this, state] {
>-        if ((state == m_isRunning) && (state == !muted()))
>-            return;
>-
>-        m_isRunning = state;
>-        notifyMutedChange(!m_isRunning);
>-    });
>-}
>-
>-#if PLATFORM(IOS_FAMILY)
>-void AVMediaCaptureSource::captureSessionRuntimeError(RetainPtr<NSError> error)
>-{
>-    if (!m_isRunning || error.get().code != AVErrorMediaServicesWereReset)
>-        return;
>-
>-    // Try to restart the session, but reset m_isRunning immediately so if it fails we won't try again.
>-    [m_session startRunning];
>-    m_isRunning = [m_session isRunning];
>-}
>-
>-void AVMediaCaptureSource::captureSessionBeginInterruption(RetainPtr<NSNotification> notification)
>-{
>-    m_interruption = static_cast<AVMediaCaptureSource::InterruptionReason>([notification.get().userInfo[AVCaptureSessionInterruptionReasonKey] integerValue]);
>-}
>-
>-void AVMediaCaptureSource::captureSessionEndInterruption(RetainPtr<NSNotification>)
>-{
>-    InterruptionReason reason = m_interruption;
>-
>-    m_interruption = InterruptionReason::None;
>-    if (reason != InterruptionReason::VideoNotAllowedInSideBySide || m_isRunning || !m_session)
>-        return;
>-
>-    [m_session startRunning];
>-    m_isRunning = [m_session isRunning];
>-}
>-#endif
>-
>-void AVMediaCaptureSource::setVideoSampleBufferDelegate(AVCaptureVideoDataOutputType* videoOutput)
>-{
>-    [videoOutput setSampleBufferDelegate:m_objcObserver.get() queue:globaVideoCaptureSerialQueue()];
>-}
>-
>-void AVMediaCaptureSource::setAudioSampleBufferDelegate(AVCaptureAudioDataOutputType* audioOutput)
>-{
>-    [audioOutput setSampleBufferDelegate:m_objcObserver.get() queue:globaAudioCaptureSerialQueue()];
>-}
>-
>-bool AVMediaCaptureSource::interrupted() const
>-{
>-    if (m_interruption != InterruptionReason::None)
>-        return true;
>-
>-    return RealtimeMediaSource::interrupted();
>-}
>-
>-NSArray<NSString*>* sessionKVOProperties()
>-{
>-    static NSArray* keys = [@[@"running"] retain];
>-    return keys;
>-}
>-
>-} // namespace WebCore
>-
>-@implementation WebCoreAVMediaCaptureSourceObserver
>-
>-- (id)initWithCallback:(AVMediaCaptureSource*)callback
>-{
>-    self = [super init];
>-    if (!self)
>-        return nil;
>-
>-    m_callback = callback;
>-
>-    return self;
>-}
>-
>-- (void)disconnect
>-{
>-    [NSObject cancelPreviousPerformRequestsWithTarget:self];
>-    [self removeNotificationObservers];
>-    m_callback = nullptr;
>-}
>-
>-- (void)addNotificationObservers
>-{
>-#if PLATFORM(IOS_FAMILY)
>-    ASSERT(m_callback);
>-
>-    NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
>-    AVCaptureSessionType* session = m_callback->session();
>-
>-    [center addObserver:self selector:@selector(sessionRuntimeError:) name:AVCaptureSessionRuntimeErrorNotification object:session];
>-    [center addObserver:self selector:@selector(beginSessionInterrupted:) name:AVCaptureSessionWasInterruptedNotification object:session];
>-    [center addObserver:self selector:@selector(endSessionInterrupted:) name:AVCaptureSessionInterruptionEndedNotification object:session];
>-#endif
>-}
>-
>-- (void)removeNotificationObservers
>-{
>-#if PLATFORM(IOS_FAMILY)
>-    [[NSNotificationCenter defaultCenter] removeObserver:self];
>-#endif
>-}
>-
>-- (void)captureOutput:(AVCaptureOutputType*)captureOutput didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer fromConnection:(AVCaptureConnectionType*)connection
>-{
>-    if (!m_callback)
>-        return;
>-
>-    m_callback->captureOutputDidOutputSampleBufferFromConnection(captureOutput, sampleBuffer, connection);
>-}
>-
>-- (void)observeValueForKeyPath:keyPath ofObject:(id)object change:(NSDictionary*)change context:(void*)context
>-{
>-    UNUSED_PARAM(object);
>-    UNUSED_PARAM(context);
>-
>-    if (!m_callback)
>-        return;
>-
>-    id newValue = [change valueForKey:NSKeyValueChangeNewKey];
>-
>-#if !LOG_DISABLED
>-    bool willChange = [[change valueForKey:NSKeyValueChangeNotificationIsPriorKey] boolValue];
>-
>-    if (willChange)
>-        LOG(Media, "WebCoreAVMediaCaptureSourceObserver::observeValueForKeyPath(%p) - will change, keyPath = %s", self, [keyPath UTF8String]);
>-    else {
>-        RetainPtr<NSString> valueString = adoptNS([[NSString alloc] initWithFormat:@"%@", newValue]);
>-        LOG(Media, "WebCoreAVMediaCaptureSourceObserver::observeValueForKeyPath(%p) - did change, keyPath = %s, value = %s", self, [keyPath UTF8String], [valueString.get() UTF8String]);
>-    }
>-#endif
>-
>-    if ([keyPath isEqualToString:@"running"])
>-        m_callback->captureSessionIsRunningDidChange([newValue boolValue]);
>-}
>-
>-#if PLATFORM(IOS_FAMILY)
>-- (void)sessionRuntimeError:(NSNotification*)notification
>-{
>-    NSError *error = notification.userInfo[AVCaptureSessionErrorKey];
>-    LOG(Media, "WebCoreAVMediaCaptureSourceObserver::sessionRuntimeError(%p) - error = %s", self, [[error localizedDescription] UTF8String]);
>-
>-    if (m_callback)
>-        m_callback->captureSessionRuntimeError(error);
>-}
>-
>--(void)beginSessionInterrupted:(NSNotification*)notification
>-{
>-    LOG(Media, "WebCoreAVMediaCaptureSourceObserver::beginSessionInterrupted(%p) - reason = %d", self, [notification.userInfo[AVCaptureSessionInterruptionReasonKey] integerValue]);
>-
>-    if (m_callback)
>-        m_callback->captureSessionBeginInterruption(notification);
>-}
>-
>-- (void)endSessionInterrupted:(NSNotification*)notification
>-{
>-    LOG(Media, "WebCoreAVMediaCaptureSourceObserver::endSessionInterrupted(%p)", self);
>-
>-    if (m_callback)
>-        m_callback->captureSessionEndInterruption(notification);
>-}
>-#endif
>-
>-@end
>-
>-#endif // ENABLE(MEDIA_STREAM)
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 239418)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2018-12-19  Alex Christensen  <achristensen@webkit.org>
>+
>+        Resurrect Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=192658
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PlatformMac.cmake:
>+
> 2018-12-19  Tim Horton  <timothy_horton@apple.com>
> 
>         Use delegate instead of drawingDelegate in WKDrawingView
>Index: Source/WebKit/PlatformMac.cmake
>===================================================================
>--- Source/WebKit/PlatformMac.cmake	(revision 239408)
>+++ Source/WebKit/PlatformMac.cmake	(working copy)
>@@ -95,8 +95,6 @@ list(APPEND WebKit_SOURCES
>     Shared/API/c/mac/WKWebArchive.cpp
>     Shared/API/c/mac/WKWebArchiveResource.cpp
> 
>-    Shared/Authentication/mac/AuthenticationManager.mac.mm
>-
>     Shared/Cocoa/APIDataCocoa.mm
>     Shared/Cocoa/APIObject.mm
>     Shared/Cocoa/ChildProcessCocoa.mm
>@@ -137,7 +135,6 @@ list(APPEND WebKit_SOURCES
>     Shared/mac/ChildProcessMac.mm
>     Shared/mac/CodeSigning.mm
>     Shared/mac/ColorSpaceData.mm
>-    Shared/mac/CookieStorageShimLibrary.cpp
>     Shared/mac/HangDetectionDisablerMac.mm
>     Shared/mac/NativeWebGestureEventMac.mm
>     Shared/mac/NativeWebKeyboardEventMac.mm
>@@ -263,7 +260,6 @@ list(APPEND WebKit_SOURCES
>     UIProcess/Cocoa/WebPasteboardProxyCocoa.mm
>     UIProcess/Cocoa/WebProcessPoolCocoa.mm
>     UIProcess/Cocoa/WebProcessProxyCocoa.mm
>-    UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm
>     UIProcess/Cocoa/WebURLSchemeHandlerCocoa.mm
>     UIProcess/Cocoa/WebViewImpl.mm
> 
>@@ -271,8 +267,6 @@ list(APPEND WebKit_SOURCES
> 
>     UIProcess/Network/CustomProtocols/LegacyCustomProtocolManagerProxy.cpp
> 
>-    UIProcess/Network/mac/NetworkProcessProxyMac.mm
>-
>     UIProcess/Plugins/mac/PluginInfoStoreMac.mm
>     UIProcess/Plugins/mac/PluginProcessManagerMac.mm
>     UIProcess/Plugins/mac/PluginProcessProxyMac.mm
>Index: Source/WebKitLegacy/ChangeLog
>===================================================================
>--- Source/WebKitLegacy/ChangeLog	(revision 239408)
>+++ Source/WebKitLegacy/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2018-12-19  Alex Christensen  <achristensen@webkit.org>
>+
>+        Resurrect Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=192658
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PlatformMac.cmake:
>+
> 2018-12-11  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [Win][WebKitLegacy][Clang] WebKit.h warning: 'IWebEditingDelegate2::shouldInsertNode' hides overloaded virtual function [-Woverloaded-virtual]
>Index: Source/WebKitLegacy/PlatformMac.cmake
>===================================================================
>--- Source/WebKitLegacy/PlatformMac.cmake	(revision 239408)
>+++ Source/WebKitLegacy/PlatformMac.cmake	(working copy)
>@@ -6,23 +6,20 @@ add_definitions(-iframework ${APPLICATIO
> list(APPEND WebKitLegacy_INCLUDE_DIRECTORIES
>     "${DERIVED_SOURCES_WEBKITLEGACY_DIR}"
>     "${CMAKE_SOURCE_DIR}/WebKitLibraries"
>-)
>-
>-list(APPEND WebKitLegacy_SYSTEM_INCLUDE_DIRECTORIES
>-    mac
>-    mac/Carbon
>-    mac/DefaultDelegates
>-    mac/DOM
>-    mac/History
>-    mac/icu
>-    mac/Misc
>-    mac/Panels
>-    mac/Plugins
>-    mac/Plugins/Hosted
>-    mac/Storage
>-    mac/WebCoreSupport
>-    mac/WebInspector
>-    mac/WebView
>+    "${WEBKITLEGACY_DIR}/mac"
>+    "${WEBKITLEGACY_DIR}/mac/Carbon"
>+    "${WEBKITLEGACY_DIR}/mac/DefaultDelegates"
>+    "${WEBKITLEGACY_DIR}/mac/DOM"
>+    "${WEBKITLEGACY_DIR}/mac/History"
>+    "${WEBKITLEGACY_DIR}/mac/icu"
>+    "${WEBKITLEGACY_DIR}/mac/Misc"
>+    "${WEBKITLEGACY_DIR}/mac/Panels"
>+    "${WEBKITLEGACY_DIR}/mac/Plugins"
>+    "${WEBKITLEGACY_DIR}/mac/Plugins/Hosted"
>+    "${WEBKITLEGACY_DIR}/mac/Storage"
>+    "${WEBKITLEGACY_DIR}/mac/WebCoreSupport"
>+    "${WEBKITLEGACY_DIR}/mac/WebInspector"
>+    "${WEBKITLEGACY_DIR}/mac/WebView"
> )
> 
> list(APPEND WebKitLegacy_SOURCES
>@@ -271,7 +268,6 @@ list(APPEND WebKitLegacy_SOURCES
>     mac/WebCoreSupport/WebProgressTrackerClient.mm
>     mac/WebCoreSupport/WebSecurityOrigin.mm
>     mac/WebCoreSupport/WebSelectionServiceController.mm
>-    mac/WebCoreSupport/WebUserMediaClient.mm
>     mac/WebCoreSupport/WebValidationMessageClient.mm
>     mac/WebCoreSupport/WebVisitedLinkStore.mm
> 
>Index: Source/cmake/OptionsMac.cmake
>===================================================================
>--- Source/cmake/OptionsMac.cmake	(revision 239408)
>+++ Source/cmake/OptionsMac.cmake	(working copy)
>@@ -27,19 +27,22 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE ON)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PDFKIT_PLUGIN PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_LOAD_STATISTICS PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RUBBER_BANDING PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_CONTROLS PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TELEPHONE_NUMBER_DETECTION PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_PRESENTATION_MODE PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGPU PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBMETAL PRIVATE ON)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WIRELESS_PLAYBACK_TARGET PRIVATE ON)
> 
> # FIXME: These are turned off temporarily to get CMake working easier. 
> # https://bugs.webkit.org/show_bug.cgi?id=135856
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 239418)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2018-12-19  Alex Christensen  <achristensen@webkit.org>
>+
>+        Resurrect Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=192658
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * DumpRenderTree/PlatformMac.cmake:
>+        * MiniBrowser/mac/CMakeLists.txt:
>+        * TestWebKitAPI/PlatformMac.cmake:
>+
> 2018-12-19  Benjamin Poulain  <benjamin@webkit.org>
> 
>         <rdar://problem/46194315> macOS: WebKit1 does not handle occlusion changes
>Index: Tools/DumpRenderTree/PlatformMac.cmake
>===================================================================
>--- Tools/DumpRenderTree/PlatformMac.cmake	(revision 239408)
>+++ Tools/DumpRenderTree/PlatformMac.cmake	(working copy)
>@@ -77,7 +77,6 @@ list(APPEND DumpRenderTree_ObjCpp_SOURCE
>     mac/DumpRenderTreeDraggingInfo.mm
>     mac/DumpRenderTreeMain.mm
>     mac/DumpRenderTreePasteboard.mm
>-    mac/DumpRenderTreeSpellChecker.mm
>     mac/DumpRenderTreeWindow.mm
>     mac/EditingDelegate.mm
>     mac/EventSendingController.mm
>Index: Tools/MiniBrowser/mac/CMakeLists.txt
>===================================================================
>--- Tools/MiniBrowser/mac/CMakeLists.txt	(revision 239408)
>+++ Tools/MiniBrowser/mac/CMakeLists.txt	(working copy)
>@@ -12,7 +12,6 @@ set(MiniBrowser_SOURCES
>     ${MINIBROWSER_DIR}/WK2BrowserWindowController.m
>     ${MINIBROWSER_DIR}/main.m
>     ${TOOLS_DIR}/MiniBrowser/MBToolbarItem.m
>-    ${TOOLS_DIR}/MiniBrowser/MiniBrowserWebProcessPlugIn.m
> )
> 
> set(MiniBrowser_INCLUDE_DIRECTORIES
>Index: Tools/TestWebKitAPI/PlatformMac.cmake
>===================================================================
>--- Tools/TestWebKitAPI/PlatformMac.cmake	(revision 239408)
>+++ Tools/TestWebKitAPI/PlatformMac.cmake	(working copy)
>@@ -25,7 +25,6 @@ list(APPEND TestWebKitAPI_LIBRARIES
> )
> 
> set(bundle_harness_SOURCES
>-    ${TESTWEBKITAPI_DIR}/cocoa/InstanceMethodSwizzler.mm
>     ${TESTWEBKITAPI_DIR}/cocoa/PlatformUtilitiesCocoa.mm
>     ${TESTWEBKITAPI_DIR}/cocoa/UtilitiesCocoa.mm
>     ${TESTWEBKITAPI_DIR}/mac/InjectedBundleControllerMac.mm

Flags:

ysuzuki: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 192658: 357210 | 357847