WebKit Bugzilla
Attachment 369027 Details for
Bug 197132
: Progress towards resurrecting Mac CMake build
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-197132-20190503171631.patch (text/plain), 17.60 KB, created by
Alex Christensen
on 2019-05-03 17:16:32 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Alex Christensen
Created:
2019-05-03 17:16:32 PDT
Size:
17.60 KB
patch
obsolete
>Index: Source/JavaScriptCore/ChangeLog >=================================================================== >--- Source/JavaScriptCore/ChangeLog (revision 244917) >+++ Source/JavaScriptCore/ChangeLog (working copy) >@@ -1,3 +1,17 @@ >+2019-05-03 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-05-03 Yusuke Suzuki <ysuzuki@apple.com> > > [JSC] Generator CodeBlock generation should be idempotent >Index: Source/JavaScriptCore/CMakeLists.txt >=================================================================== >--- Source/JavaScriptCore/CMakeLists.txt (revision 244917) >+++ Source/JavaScriptCore/CMakeLists.txt (working copy) >@@ -430,6 +430,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 244917) >+++ Source/JavaScriptCore/API/JSScript.mm (working copy) >@@ -37,14 +37,15 @@ > #import "JSVirtualMachineInternal.h" > #import "ParserError.h" > #import "Symbol.h" >-#include <sys/stat.h> >-#include <wtf/FileSystem.h> >-#include <wtf/Scope.h> >+#import <sys/stat.h> >+#import <wtf/FileSystem.h> >+#import <wtf/Scope.h> >+#import <wtf/WeakObjCPtr.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; >@@ -122,7 +123,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)) >@@ -190,7 +191,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 { }; >@@ -203,7 +204,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; >@@ -234,10 +235,10 @@ - (BOOL)writeCache:(String&)error > JSC::SourceCode sourceCode = [self sourceCode]; > switch (m_type) { > case kJSScriptTypeModule: >- m_cachedBytecode = JSC::generateModuleBytecode(m_virtualMachine.vm, sourceCode, parserError); >+ m_cachedBytecode = JSC::generateModuleBytecode([m_virtualMachine vm], sourceCode, parserError); > break; > case kJSScriptTypeProgram: >- m_cachedBytecode = JSC::generateProgramBytecode(m_virtualMachine.vm, sourceCode, parserError); >+ m_cachedBytecode = JSC::generateProgramBytecode([m_virtualMachine vm], sourceCode, parserError); > break; > } > >Index: Source/WebCore/ChangeLog >=================================================================== >--- Source/WebCore/ChangeLog (revision 244917) >+++ Source/WebCore/ChangeLog (working copy) >@@ -1,3 +1,14 @@ >+2019-05-03 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-05-03 Tomoki Imai <Tomoki.Imai@sony.com> > > [Cairo] Improve ShadowBlur performance using tiling optimization >Index: Source/WebCore/CMakeLists.txt >=================================================================== >--- Source/WebCore/CMakeLists.txt (revision 244917) >+++ Source/WebCore/CMakeLists.txt (working copy) >@@ -62,6 +62,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" >@@ -2036,7 +2038,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 244917) >+++ Source/WebCore/PlatformMac.cmake (working copy) >@@ -74,6 +74,7 @@ list(APPEND WebCore_PRIVATE_INCLUDE_DIRE > "${CMAKE_SOURCE_DIR}/Source" > "${THIRDPARTY_DIR}/ANGLE" > "${THIRDPARTY_DIR}/ANGLE/include/KHR" >+ "${WEBCORE_DIR}/Modules/webgpu/WHLSL/Metal" > "${WEBCORE_DIR}/accessibility/mac" > "${WEBCORE_DIR}/bridge/objc" > "${WEBCORE_DIR}/editing/cocoa" >@@ -86,6 +87,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" >@@ -166,7 +168,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 > >@@ -377,8 +378,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 +473,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 > >Index: Source/WebCore/config.h >=================================================================== >--- Source/WebCore/config.h (revision 244917) >+++ 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 244917) >+++ Source/WebCore/PAL/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2019-05-03 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-05-03 Commit Queue <commit-queue@webkit.org> > > Unreviewed, rolling out r244881. >Index: Source/WebCore/PAL/pal/PlatformMac.cmake >=================================================================== >--- Source/WebCore/PAL/pal/PlatformMac.cmake (revision 244917) >+++ 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 244917) >+++ 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/editing/cocoa/HTMLConverter.mm >=================================================================== >--- Source/WebCore/editing/cocoa/HTMLConverter.mm (revision 244917) >+++ Source/WebCore/editing/cocoa/HTMLConverter.mm (working copy) >@@ -65,15 +65,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 244917) >+++ 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/WebKit/ChangeLog >=================================================================== >--- Source/WebKit/ChangeLog (revision 244917) >+++ Source/WebKit/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2019-05-03 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-05-03 Brent Fulgham <bfulgham@apple.com> > > Use more efficient path resolution logic >Index: Source/WebKit/PlatformMac.cmake >=================================================================== >--- Source/WebKit/PlatformMac.cmake (revision 244917) >+++ Source/WebKit/PlatformMac.cmake (working copy) >@@ -133,7 +133,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 >@@ -147,9 +146,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 244917) >+++ Source/WebKitLegacy/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2019-05-03 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-05-03 Commit Queue <commit-queue@webkit.org> > > Unreviewed, rolling out r244881. >Index: Source/WebKitLegacy/PlatformMac.cmake >=================================================================== >--- Source/WebKitLegacy/PlatformMac.cmake (revision 244917) >+++ 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/OptionsMac.cmake >=================================================================== >--- Source/cmake/OptionsMac.cmake (revision 244917) >+++ 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. >Index: Tools/TestWebKitAPI/PlatformMac.cmake >=================================================================== >--- Tools/TestWebKitAPI/PlatformMac.cmake (revision 244917) >+++ Tools/TestWebKitAPI/PlatformMac.cmake (working copy) >@@ -33,3 +33,7 @@ set(bundle_harness_SOURCES > ${TESTWEBKITAPI_DIR}/mac/SyntheticBackingScaleFactorWindow.m > ${TESTWEBKITAPI_DIR}/mac/TestBrowsingContextLoadDelegate.mm > ) >+ >+list(APPEND TestWebKitLegacy_SOURCES >+ ${test_main_SOURCES} >+)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 197132
:
367865
|
369027
|
369036
|
371430