Attachment 371430 Details for Bug 197132 – Patch

[patch] Patch

bug-197132-20190605130751.patch (text/plain), 24.97 KB, created by Alex Christensen on 2019-06-05 13:07:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-06-05 13:07:52 PDT

Size: 24.97 KB

patch

obsolete

>Index: Source/JavaScriptCore/ChangeLog
>===================================================================
>--- Source/JavaScriptCore/ChangeLog	(revision 246121)
>+++ Source/JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2019-06-05  Alex Christensen  <achristensen@webkit.org>
>+
>+        Progress towards resurrecting Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=197132
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * API/JSScript.mm:
>+        (-[JSScript readCache]):
>+        (-[JSScript sourceCode]):
>+        (-[JSScript jsSourceCode]):
>+        (-[JSScript writeCache:]):
>+        * CMakeLists.txt:
>+
> 2019-06-04  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Fix miscellaneous build warnings
>Index: Source/JavaScriptCore/CMakeLists.txt
>===================================================================
>--- Source/JavaScriptCore/CMakeLists.txt	(revision 246121)
>+++ Source/JavaScriptCore/CMakeLists.txt	(working copy)
>@@ -424,6 +424,7 @@ set(JavaScriptCore_PRIVATE_FRAMEWORK_HEA
>     API/JSScriptRefPrivate.h
>     API/JSStringRefPrivate.h
>     API/JSValueInternal.h
>+    API/JSValuePrivate.h
>     API/JSVirtualMachineInternal.h
>     API/JSWeakObjectMapRefInternal.h
>     API/JSWeakObjectMapRefPrivate.h
>Index: Source/JavaScriptCore/API/JSScript.mm
>===================================================================
>--- Source/JavaScriptCore/API/JSScript.mm	(revision 246121)
>+++ Source/JavaScriptCore/API/JSScript.mm	(working copy)
>@@ -37,16 +37,17 @@
> #import "JSValuePrivate.h"
> #import "JSVirtualMachineInternal.h"
> #import "Symbol.h"
>-#include <sys/stat.h>
>-#include <wtf/FileMetadata.h>
>-#include <wtf/FileSystem.h>
>-#include <wtf/Scope.h>
>-#include <wtf/spi/darwin/DataVaultSPI.h>
>+#import <sys/stat.h>
>+#import <wtf/FileMetadata.h>
>+#import <wtf/FileSystem.h>
>+#import <wtf/Scope.h>
>+#import <wtf/WeakObjCPtr.h>
>+#import <wtf/spi/darwin/DataVaultSPI.h>
> 
> #if JSC_OBJC_API_ENABLED
> 
> @implementation JSScript {
>-    __weak JSVirtualMachine* m_virtualMachine;
>+    WeakObjCPtr<JSVirtualMachine> m_virtualMachine;
>     JSScriptType m_type;
>     FileSystem::MappedFileData m_mappedSource;
>     String m_source;
>@@ -169,7 +170,7 @@ - (void)readCache
> 
>     Ref<JSC::CachedBytecode> cachedBytecode = JSC::CachedBytecode::create(buffer, size);
> 
>-    JSC::VM& vm = m_virtualMachine.vm;
>+    JSC::VM& vm = [m_virtualMachine vm];
>     JSC::SourceCode sourceCode = [self sourceCode];
>     JSC::SourceCodeKey key = m_type == kJSScriptTypeProgram ? sourceCodeKeyForSerializedProgram(vm, sourceCode) : sourceCodeKeyForSerializedModule(vm, sourceCode);
>     if (isCachedBytecodeStillValid(vm, cachedBytecode.copyRef(), key, m_type == kJSScriptTypeProgram ? JSC::SourceCodeType::ProgramType : JSC::SourceCodeType::ModuleType))
>@@ -237,7 +238,7 @@ - (RefPtr<JSC::CachedBytecode>)cachedByt
> 
> - (JSC::SourceCode)sourceCode
> {
>-    JSC::VM& vm = m_virtualMachine.vm;
>+    JSC::VM& vm = [m_virtualMachine vm];
>     JSC::JSLockHolder locker(vm);
> 
>     TextPosition startPosition { };
>@@ -250,7 +251,7 @@ - (JSC::SourceCode)sourceCode
> 
> - (JSC::JSSourceCode*)jsSourceCode
> {
>-    JSC::VM& vm = m_virtualMachine.vm;
>+    JSC::VM& vm = [m_virtualMachine vm];
>     JSC::JSLockHolder locker(vm);
>     JSC::JSSourceCode* jsSourceCode = JSC::JSSourceCode::create(vm, [self sourceCode]);
>     return jsSourceCode;
>@@ -281,10 +282,10 @@ - (BOOL)writeCache:(String&)error
>     JSC::SourceCode sourceCode = [self sourceCode];
>     switch (m_type) {
>     case kJSScriptTypeModule:
>-        m_cachedBytecode = JSC::generateModuleBytecode(m_virtualMachine.vm, sourceCode, fd, cacheError);
>+        m_cachedBytecode = JSC::generateModuleBytecode([m_virtualMachine vm], sourceCode, fd, cacheError);
>         break;
>     case kJSScriptTypeProgram:
>-        m_cachedBytecode = JSC::generateProgramBytecode(m_virtualMachine.vm, sourceCode, fd, cacheError);
>+        m_cachedBytecode = JSC::generateProgramBytecode([m_virtualMachine vm], sourceCode, fd, cacheError);
>         break;
>     }
> 
>Index: Source/ThirdParty/ANGLE/CMakeLists.txt
>===================================================================
>--- Source/ThirdParty/ANGLE/CMakeLists.txt	(revision 246121)
>+++ Source/ThirdParty/ANGLE/CMakeLists.txt	(working copy)
>@@ -41,6 +41,7 @@ set(gl_prototypes
> 
> set(ANGLE_PRIVATE_INCLUDE_DIRECTORIES
>     "${CMAKE_CURRENT_SOURCE_DIR}/include"
>+    "${CMAKE_CURRENT_SOURCE_DIR}/include/KHR"
>     "${CMAKE_CURRENT_SOURCE_DIR}/src"
>     "${CMAKE_CURRENT_SOURCE_DIR}/src/common/third_party/base"
> )
>Index: Source/WTF/wtf/PlatformMac.cmake
>===================================================================
>--- Source/WTF/wtf/PlatformMac.cmake	(revision 246121)
>+++ Source/WTF/wtf/PlatformMac.cmake	(working copy)
>@@ -28,6 +28,7 @@ list(APPEND WTF_PUBLIC_HEADERS
>     spi/cocoa/SecuritySPI.h
>     spi/cocoa/objcSPI.h
> 
>+    spi/darwin/DataVaultSPI.h
>     spi/darwin/SandboxSPI.h
>     spi/darwin/XPCSPI.h
>     spi/darwin/dyldSPI.h
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 246121)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-06-05  Alex Christensen  <achristensen@webkit.org>
>+
>+        Progress towards resurrecting Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=197132
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt:
>+        * PlatformMac.cmake:
>+        * platform/cocoa/ContentFilterUnblockHandlerCocoa.mm:
>+
> 2019-06-05  Saam Barati  <sbarati@apple.com>
> 
>         [WHLSL] Implement loop expressions
>Index: Source/WebCore/CMakeLists.txt
>===================================================================
>--- Source/WebCore/CMakeLists.txt	(revision 246121)
>+++ Source/WebCore/CMakeLists.txt	(working copy)
>@@ -61,6 +61,8 @@ set(WebCore_PRIVATE_INCLUDE_DIRECTORIES
>     "${WEBCORE_DIR}/Modules/webdatabase"
>     "${WEBCORE_DIR}/Modules/webdriver"
>     "${WEBCORE_DIR}/Modules/webgpu"
>+    "${WEBCORE_DIR}/Modules/webgpu/WHLSL"
>+    "${WEBCORE_DIR}/Modules/webgpu/WHLSL/AST"
>     "${WEBCORE_DIR}/Modules/websockets"
>     "${WEBCORE_DIR}/Modules/webvr"
>     "${WEBCORE_DIR}/accessibility"
>@@ -1896,7 +1898,6 @@ list(APPEND WebCore_SOURCES ${WebCore_DE
> list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/Settings.cpp)
> list(APPEND WebCoreTestSupport_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/InternalSettingsGenerated.cpp)
> 
>-
> GENERATE_FONT_NAMES(${WEBCORE_DIR}/css/WebKitFontFamilyNames.in)
> list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/WebKitFontFamilyNames.cpp)
> 
>Index: Source/WebCore/PlatformMac.cmake
>===================================================================
>--- Source/WebCore/PlatformMac.cmake	(revision 246121)
>+++ Source/WebCore/PlatformMac.cmake	(working copy)
>@@ -71,6 +71,7 @@ if (NOT LOOKUP_FRAMEWORK-NOTFOUND)
> endif ()
> 
> list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>+    "${WEBCORE_DIR}/Modules/webgpu/WHLSL/Metal"
>     "${WEBCORE_DIR}/accessibility/mac"
>     "${WEBCORE_DIR}/bridge/objc"
>     "${WEBCORE_DIR}/editing/cocoa"
>@@ -83,6 +84,7 @@ list(APPEND WebCore_PRIVATE_INCLUDE_DIRE
>     "${WEBCORE_DIR}/loader/mac"
>     "${WEBCORE_DIR}/page/cocoa"
>     "${WEBCORE_DIR}/page/mac"
>+    "${WEBCORE_DIR}/page/scrolling/cocoa"
>     "${WEBCORE_DIR}/page/scrolling/mac"
>     "${WEBCORE_DIR}/platform/audio/mac"
>     "${WEBCORE_DIR}/platform/cf"
>@@ -163,7 +165,6 @@ list(APPEND WebCore_SOURCES
> 
>     page/scrolling/mac/ScrollingCoordinatorMac.mm
>     page/scrolling/mac/ScrollingMomentumCalculatorMac.mm
>-    page/scrolling/mac/ScrollingStateFrameScrollingNodeMac.mm
>     page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
>     page/scrolling/mac/ScrollingTreeMac.cpp
> 
>@@ -229,7 +230,6 @@ list(APPEND WebCore_SOURCES
>     platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm
> 
>     platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm
>-    platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.mm
>     platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
>     platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp
>     platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
>@@ -374,8 +374,6 @@ list(APPEND WebCore_SOURCES
>     platform/mac/WebCoreObjCExtras.mm
>     platform/mac/WebGLBlacklist.mm
>     platform/mac/WebNSAttributedStringExtras.mm
>-    platform/mac/WebVideoFullscreenController.mm
>-    platform/mac/WebVideoFullscreenHUDWindowController.mm
>     platform/mac/WidgetMac.mm
> 
>     platform/mediastream/mac/MockRealtimeVideoSourceMac.mm
>@@ -474,6 +472,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HE
>     platform/cocoa/VideoFullscreenChangeObserver.h
>     platform/cocoa/VideoFullscreenModel.h
>     platform/cocoa/VideoFullscreenModelVideoElement.h
>+    platform/cocoa/WebKitAvailability.h
> 
>     platform/gamepad/cocoa/GameControllerGamepadProvider.h
> 
>@@ -483,8 +482,6 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HE
>     platform/graphics/avfoundation/MediaPlaybackTargetMac.h
>     platform/graphics/avfoundation/WebMediaSessionManagerMac.h
> 
>-    platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.h
>-
>     platform/graphics/ca/GraphicsLayerCA.h
>     platform/graphics/ca/LayerPool.h
>     platform/graphics/ca/PlatformCAAnimation.h
>Index: Source/WebCore/config.h
>===================================================================
>--- Source/WebCore/config.h	(revision 246121)
>+++ Source/WebCore/config.h	(working copy)
>@@ -39,6 +39,12 @@
> #ifndef JSC_API_AVAILABLE
> #define JSC_API_AVAILABLE(...)
> #endif
>+#ifndef JSC_CLASS_AVAILABLE
>+#define JSC_CLASS_AVAILABLE(...) JS_EXPORT
>+#endif
>+#ifndef JSC_API_DEPRECATED
>+#define JSC_API_DEPRECATED(...)
>+#endif
> #endif
> 
> #ifdef __cplusplus
>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 246121)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-06-05  Alex Christensen  <achristensen@webkit.org>
>+
>+        Progress towards resurrecting Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=197132
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/PlatformMac.cmake:
>+
> 2019-06-05  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Upstream content mode support into open source from WebKitAdditions
>Index: Source/WebCore/PAL/pal/PlatformMac.cmake
>===================================================================
>--- Source/WebCore/PAL/pal/PlatformMac.cmake	(revision 246121)
>+++ Source/WebCore/PAL/pal/PlatformMac.cmake	(working copy)
>@@ -3,6 +3,7 @@ list(APPEND PAL_PUBLIC_HEADERS
> 
>     cf/CoreMediaSoftLink.h
> 
>+    cocoa/AVFoundationSoftLink.h
>     cocoa/PassKitSoftLink.h
> 
>     mac/LookupSoftLink.h
>@@ -20,6 +21,7 @@ list(APPEND PAL_PUBLIC_HEADERS
>     spi/cocoa/AVKitSPI.h
>     spi/cocoa/AudioToolboxSPI.h
>     spi/cocoa/CFNSURLConnectionSPI.h
>+    spi/cocoa/CommonCryptoSPI.h
>     spi/cocoa/CoreTextSPI.h
>     spi/cocoa/DataDetectorsCoreSPI.h
>     spi/cocoa/IOPMLibSPI.h
>Index: Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm
>===================================================================
>--- Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm	(revision 246121)
>+++ Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm	(working copy)
>@@ -66,12 +66,13 @@
> #import "TextCheckerClient.h"
> #import "TextCheckingHelper.h"
> #import "VisibleUnits.h"
>-#import "WAKView.h"
>-#import "WAKWindow.h"
> #import "WebCoreFrameView.h"
> 
> #if PLATFORM(MAC)
> #import <pal/spi/mac/HIServicesSPI.h>
>+#else
>+#import "WAKView.h"
>+#import "WAKWindow.h"
> #endif
> 
> using namespace WebCore;
>Index: Source/WebCore/css/parser/CSSParserFastPaths.cpp
>===================================================================
>--- Source/WebCore/css/parser/CSSParserFastPaths.cpp	(revision 246121)
>+++ Source/WebCore/css/parser/CSSParserFastPaths.cpp	(working copy)
>@@ -812,7 +812,7 @@ bool CSSParserFastPaths::isValidKeywordP
> #if ENABLE(OVERFLOW_SCROLLING_TOUCH)
>     case CSSPropertyWebkitOverflowScrolling:
>         if (!context.legacyOverflowScrollingTouchEnabled)
>-            return nullptr;
>+            return false;
>         return valueID == CSSValueAuto || valueID == CSSValueTouch;
> #endif
> #if ENABLE(VARIATION_FONTS)
>Index: Source/WebCore/editing/cocoa/HTMLConverter.mm
>===================================================================
>--- Source/WebCore/editing/cocoa/HTMLConverter.mm	(revision 246121)
>+++ Source/WebCore/editing/cocoa/HTMLConverter.mm	(working copy)
>@@ -66,15 +66,15 @@
> #import "TextIterator.h"
> #import "VisibleSelection.h"
> #import <objc/runtime.h>
>-#import <pal/ios/UIKitSoftLink.h>
> #import <pal/spi/cocoa/NSAttributedStringSPI.h>
>-#import <pal/spi/ios/UIKitSPI.h>
> #import <wtf/ASCIICType.h>
> #import <wtf/text/StringBuilder.h>
> 
> #if PLATFORM(IOS_FAMILY)
> 
> #import "WAKAppKitStubs.h"
>+#import <pal/ios/UIKitSoftLink.h>
>+#import <pal/spi/ios/UIKitSPI.h>
> 
> SOFT_LINK_CLASS(UIFoundation, NSColor)
> SOFT_LINK_CLASS(UIFoundation, NSShadow)
>Index: Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm
>===================================================================
>--- Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm	(revision 246121)
>+++ Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm	(working copy)
>@@ -35,7 +35,10 @@
> #import <wtf/BlockObjCExceptions.h>
> #import <wtf/SoftLinking.h>
> #import <wtf/text/CString.h>
>+
>+#if PLATFORM(IOS_FAMILY)
> #import "WebCoreThreadRun.h"
>+#endif
> 
> static NSString * const unblockURLHostKey { @"unblockURLHost" };
> static NSString * const unreachableURLKey { @"unreachableURL" };
>Index: Source/WebCore/platform/ios/WebItemProviderPasteboard.h
>===================================================================
>--- Source/WebCore/platform/ios/WebItemProviderPasteboard.h	(revision 246121)
>+++ Source/WebCore/platform/ios/WebItemProviderPasteboard.h	(working copy)
>@@ -23,10 +23,10 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import <WebCore/AbstractPasteboard.h>
>-
> #if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
> 
>+#import <WebCore/AbstractPasteboard.h>
>+
> struct CGSize;
> 
> typedef NS_ENUM(NSInteger, WebPreferredPresentationStyle) {
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 246121)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-06-05  Alex Christensen  <achristensen@webkit.org>
>+
>+        Progress towards resurrecting Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=197132
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PlatformMac.cmake:
>+
> 2019-06-05  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Upstream content mode support into open source from WebKitAdditions
>Index: Source/WebKit/PlatformMac.cmake
>===================================================================
>--- Source/WebKit/PlatformMac.cmake	(revision 246121)
>+++ Source/WebKit/PlatformMac.cmake	(working copy)
>@@ -135,7 +135,6 @@ list(APPEND WebKit_SOURCES
> 
>     Shared/cg/ShareableBitmapCG.cpp
> 
>-    Shared/mac/ArgumentCodersMac.mm
>     Shared/mac/AttributedString.mm
>     Shared/mac/AuxiliaryProcessMac.mm
>     Shared/mac/CodeSigning.mm
>@@ -149,9 +148,6 @@ list(APPEND WebKit_SOURCES
>     Shared/mac/PDFKitImports.mm
>     Shared/mac/PasteboardTypes.mm
>     Shared/mac/PrintInfoMac.mm
>-    Shared/mac/SandboxExtensionMac.mm
>-    Shared/mac/SandboxInitialiationParametersMac.mm
>-    Shared/mac/SandboxUtilities.mm
>     Shared/mac/SecItemRequestData.cpp
>     Shared/mac/SecItemResponseData.cpp
>     Shared/mac/SecItemShim.cpp
>@@ -426,22 +422,22 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES
> )
> 
> set(XPCService_SOURCES
>-    Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
>-    Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm
>+    Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm
>+    Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm
> )
> 
> set(WebProcess_SOURCES
>-    WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
>+    WebProcess/EntryPoint/Cocoa/XPCService/WebContentServiceEntryPoint.mm
>     ${XPCService_SOURCES}
> )
> 
> set(PluginProcess_SOURCES
>-    PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm
>+    PluginProcess/EntryPoint/Cocoa/XPCService/PluginServiceEntryPoint.mm
>     ${XPCService_SOURCES}
> )
> 
> list(APPEND NetworkProcess_SOURCES
>-    NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm
>+    NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
>     ${XPCService_SOURCES}
> )
> 
>@@ -767,12 +763,12 @@ function(WEBKIT_DEFINE_XPC_SERVICES)
> 
>     WEBKIT_XPC_SERVICE(WebProcess
>         "com.apple.WebKit.WebContent"
>-        ${WEBKIT_DIR}/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist
>+        ${WEBKIT_DIR}/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-OSX.plist
>         ${WebKit_WebProcess_OUTPUT_NAME})
> 
>     WEBKIT_XPC_SERVICE(NetworkProcess
>         "com.apple.WebKit.Networking"
>-        ${WEBKIT_DIR}/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist
>+        ${WEBKIT_DIR}/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-OSX.plist
>         ${WebKit_NetworkProcess_OUTPUT_NAME})
> 
>     add_custom_target(WebContentProcessNib COMMAND
>Index: Source/WebKitLegacy/ChangeLog
>===================================================================
>--- Source/WebKitLegacy/ChangeLog	(revision 246121)
>+++ Source/WebKitLegacy/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-06-05  Alex Christensen  <achristensen@webkit.org>
>+
>+        Progress towards resurrecting Mac CMake build
>+        https://bugs.webkit.org/show_bug.cgi?id=197132
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * PlatformMac.cmake:
>+
> 2019-06-03  Don Olmstead  <don.olmstead@sony.com>
> 
>         [CMake] Add WebKit::JavaScriptCore target
>Index: Source/WebKitLegacy/PlatformMac.cmake
>===================================================================
>--- Source/WebKitLegacy/PlatformMac.cmake	(revision 246121)
>+++ Source/WebKitLegacy/PlatformMac.cmake	(working copy)
>@@ -23,13 +23,6 @@ list(APPEND WebKitLegacy_PRIVATE_INCLUDE
> list(APPEND WebKitLegacy_SOURCES
>     cf/WebCoreSupport/WebInspectorClientCF.cpp
> 
>-    mac/Carbon/CarbonUtils.m
>-    mac/Carbon/CarbonWindowAdapter.mm
>-    mac/Carbon/CarbonWindowContentView.m
>-    mac/Carbon/CarbonWindowFrame.m
>-    mac/Carbon/HIViewAdapter.m
>-    mac/Carbon/HIWebView.mm
>-
>     mac/DOM/DOM.mm
>     mac/DOM/DOMAbstractView.mm
>     mac/DOM/DOMAttr.mm
>@@ -338,8 +331,6 @@ set(WebKitLegacy_FORWARDING_HEADERS_FILE
> 
>     mac/Storage/WebDatabaseManagerPrivate.h
> 
>-    mac/WebCoreSupport/WebKeyGenerator.h
>-
>     mac/WebInspector/WebInspector.h
> 
>     mac/WebView/WebFrame.h
>@@ -431,20 +422,13 @@ list(APPEND WebKitLegacy_SOURCES
>     ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitPluginHostUser.c
> )
> 
>-WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
>-
>-# FIXME: Forwarding headers should be copies of actual headers.
>-file(GLOB ObjCHeaders ${WEBCORE_DIR}/plugins/*.h)
>-list(APPEND ObjCHeaders
>-    WebKitAvailability.h
>-    WebScriptObject.h
>+WEBKIT_MAKE_FORWARDING_HEADERS(WebKitLegacy
>+    TARGET_NAME WebKitLegacyFrameworkHeaders
>+    DESTINATION ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}/WebKitLegacy
>+    FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES}
>+    FLATTENED
> )
>-foreach (_file ${ObjCHeaders})
>-    get_filename_component(_name ${_file} NAME)
>-    if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKitLegacy/${_name})
>-        file(WRITE ${FORWARDING_HEADERS_DIR}/WebKitLegacy/${_name} "#import <WebCore/${_name}>")
>-    endif ()
>-endforeach ()
>+add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
> 
> set(WebKitLegacy_OUTPUT_NAME WebKitLegacy)
> 
>Index: Source/cmake/OptionsJSCOnly.cmake
>===================================================================
>--- Source/cmake/OptionsJSCOnly.cmake	(revision 246121)
>+++ Source/cmake/OptionsJSCOnly.cmake	(working copy)
>@@ -99,5 +99,5 @@ if (NOT APPLE)
>     find_package(ICU REQUIRED COMPONENTS data i18n uc)
> else ()
>     add_definitions(-DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0)
>-    include(target/icu.cmake)
>+    include(target/icu)
> endif ()
>Index: Source/cmake/OptionsMac.cmake
>===================================================================
>--- Source/cmake/OptionsMac.cmake	(revision 246121)
>+++ Source/cmake/OptionsMac.cmake	(working copy)
>@@ -40,7 +40,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
> 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_WEBGPU PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WIRELESS_PLAYBACK_TARGET PRIVATE ON)
> 
> # FIXME: These are turned off temporarily to get CMake working easier. 
>@@ -60,4 +60,4 @@ set(WebCore_LIBRARY_TYPE SHARED)
> set(WebCoreTestSupport_LIBRARY_TYPE SHARED)
> 
> add_definitions(-DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0)
>-include(target/icu.cmake)
>+include(target/icu)
>Index: Source/cmake/target/icu.cmake
>===================================================================
>--- Source/cmake/target/icu.cmake	(revision 246121)
>+++ Source/cmake/target/icu.cmake	(working copy)
>@@ -1,48 +1,46 @@
> # Apple ports provide their own ICU that can't be found by find_package(ICU).
> # This file will create targets that would be created by find_package(ICU).
>-if (NOT TARGET ICU::data)
>-    if (APPLE)
>-        set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers)
>-
>-        # Apple just has a single dylib for ICU
>-        set(ICU_I18N_LIBRARY libicucore.dylib)
>-        set(ICU_UC_LIBRARY libicucore.dylib)
>-        set(ICU_DATA_LIBRARY libicucore.dylib)
>-
>-        set(ICU_LIBRARIES ${ICU_UC_LIBRARY})
>-    elseif (WIN32 AND NOT WTF_PLATFORM_WIN_CAIRO)
>-        set(ICU_INCLUDE_DIRS ${WEBKIT_LIBRARIES_INCLUDE_DIR})
>-
>-        set(ICU_I18N_LIBRARY ${WEBKIT_LIBRARIES_LINK_DIR}/libicuin${DEBUG_SUFFIX}.lib)
>-        set(ICU_UC_LIBRARY ${WEBKIT_LIBRARIES_LINK_DIR}/libicuuc${DEBUG_SUFFIX}.lib)
>-
>-        # AppleWin does not provide a separate data library
>-        set(ICU_DATA_LIBRARY ${ICU_UC_LIBRARY})
>-
>-        set(ICU_LIBRARIES ${ICU_I18N_LIBRARY} ${ICU_UC_LIBRARY})
>-    else ()
>-        message(FATAL_ERROR "Could not find ICU targets. Use find_package(ICU REQUIRED data i1n8 uc)")
>-    endif ()
>-
>-    # Emulate ICU:: targets
>-    add_library(ICU::data UNKNOWN IMPORTED)
>-    set_target_properties(ICU::data PROPERTIES
>-        INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
>-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
>-        IMPORTED_LOCATION "${ICU_DATA_LIBRARY}"
>-    )
>-
>-    add_library(ICU::i18n UNKNOWN IMPORTED)
>-    set_target_properties(ICU::i18n PROPERTIES
>-        INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
>-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
>-        IMPORTED_LOCATION "${ICU_I18N_LIBRARY}"
>-    )
>-
>-    add_library(ICU::uc UNKNOWN IMPORTED)
>-    set_target_properties(ICU::uc PROPERTIES
>-        INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
>-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
>-        IMPORTED_LOCATION "${ICU_UC_LIBRARY}"
>-    )
>+if (APPLE)
>+    set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers)
>+
>+    # Apple just has a single dylib for ICU
>+    set(ICU_I18N_LIBRARY /usr/lib/libicucore.dylib)
>+    set(ICU_UC_LIBRARY /usr/lib/libicucore.dylib)
>+    set(ICU_DATA_LIBRARY /usr/lib/libicucore.dylib)
>+
>+    set(ICU_LIBRARIES ${ICU_UC_LIBRARY})
>+elseif (WIN32 AND NOT WTF_PLATFORM_WIN_CAIRO)
>+    set(ICU_INCLUDE_DIRS ${WEBKIT_LIBRARIES_INCLUDE_DIR})
>+
>+    set(ICU_I18N_LIBRARY ${WEBKIT_LIBRARIES_LINK_DIR}/libicuin${DEBUG_SUFFIX}.lib)
>+    set(ICU_UC_LIBRARY ${WEBKIT_LIBRARIES_LINK_DIR}/libicuuc${DEBUG_SUFFIX}.lib)
>+
>+    # AppleWin does not provide a separate data library
>+    set(ICU_DATA_LIBRARY ${ICU_UC_LIBRARY})
>+
>+    set(ICU_LIBRARIES ${ICU_I18N_LIBRARY} ${ICU_UC_LIBRARY})
>+else ()
>+    message(FATAL_ERROR "Could not find ICU targets. Use find_package(ICU REQUIRED data i1n8 uc)")
> endif ()
>+
>+# Emulate ICU:: targets
>+add_library(ICU::data UNKNOWN IMPORTED)
>+set_target_properties(ICU::data PROPERTIES
>+    INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
>+    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
>+    IMPORTED_LOCATION "${ICU_DATA_LIBRARY}"
>+)
>+
>+add_library(ICU::i18n UNKNOWN IMPORTED)
>+set_target_properties(ICU::i18n PROPERTIES
>+    INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
>+    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
>+    IMPORTED_LOCATION "${ICU_I18N_LIBRARY}"
>+)
>+
>+add_library(ICU::uc UNKNOWN IMPORTED)
>+set_target_properties(ICU::uc PROPERTIES
>+    INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
>+    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
>+    IMPORTED_LOCATION "${ICU_UC_LIBRARY}"
>+)
>Index: Tools/TestWebKitAPI/PlatformMac.cmake
>===================================================================
>--- Tools/TestWebKitAPI/PlatformMac.cmake	(revision 246121)
>+++ Tools/TestWebKitAPI/PlatformMac.cmake	(working copy)
>@@ -32,3 +32,7 @@ set(bundle_harness_SOURCES
>     ${TESTWEBKITAPI_DIR}/mac/SyntheticBackingScaleFactorWindow.m
>     ${TESTWEBKITAPI_DIR}/mac/TestBrowsingContextLoadDelegate.mm
> )
>+
>+list(APPEND TestWebKitLegacy_SOURCES
>+    ${test_main_SOURCES}
>+)

Actions: View | Formatted Diff | Diff

Attachments on bug 197132: 367865 | 369027 | 369036 | 371430