WebKit Bugzilla
Attachment 357210 Details for
Bug 192658
: Resurrect Mac CMake build
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-192658-20181212223216.patch (text/plain), 22.57 KB, created by
Alex Christensen
on 2018-12-12 22:32:17 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Alex Christensen
Created:
2018-12-12 22:32:17 PST
Size:
22.57 KB
patch
obsolete
>Index: ChangeLog >=================================================================== >--- ChangeLog (revision 239133) >+++ ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2018-12-12 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-12 Michael Catanzaro <mcatanzaro@igalia.com> > > Unreviewed manual rollout of r239100-r239102 and r239116 >Index: Source/JavaScriptCore/ChangeLog >=================================================================== >--- Source/JavaScriptCore/ChangeLog (revision 239133) >+++ Source/JavaScriptCore/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2018-12-12 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 Yusuke Suzuki <yusukesuzuki@slowstart.org> > > [BigInt] Simplify boolean context evaluation by leveraging JSString::offsetOfLength() == JSBigInt::offsetOfLength() >Index: Source/JavaScriptCore/PlatformMac.cmake >=================================================================== >--- Source/JavaScriptCore/PlatformMac.cmake (revision 239133) >+++ 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 239134) >+++ Source/WTF/ChangeLog (working copy) >@@ -1,3 +1,18 @@ >+2018-12-12 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-12 Alex Christensen <achristensen@webkit.org> > > Implement safe browsing in WebKit on WatchOS >Index: Source/WTF/wtf/PlatformMac.cmake >=================================================================== >--- Source/WTF/wtf/PlatformMac.cmake (revision 239133) >+++ Source/WTF/wtf/PlatformMac.cmake (working copy) >@@ -12,7 +12,6 @@ list(APPEND WTF_PUBLIC_HEADERS > cf/TypeCastsCF.h > > cocoa/Entitlements.h >- cocoa/MachSendRight.h > cocoa/NSURLExtras.h > cocoa/SoftLinking.h > >@@ -23,6 +22,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 +46,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 +69,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 239133) >+++ 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 239133) >+++ 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 239133) >+++ 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 239133) >+++ 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 239133) >+++ 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 239133) >+++ 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 239133) >+++ Source/WebCore/ChangeLog (working copy) >@@ -1,3 +1,17 @@ >+ >+2018-12-12 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-12 Vivek Seth <v_seth@apple.com> > > HTTPS Upgrade: Figure out if/how to tell clients that the HTTPS upgrade happened >Index: Source/WebCore/PlatformMac.cmake >=================================================================== >--- Source/WebCore/PlatformMac.cmake (revision 239133) >+++ Source/WebCore/PlatformMac.cmake (working copy) >@@ -23,7 +23,6 @@ find_package(ZLIB REQUIRED) > > list(APPEND WebCore_UNIFIED_SOURCE_LIST_FILES > "SourcesCocoa.txt" >- "SourcesMac.txt" > ) > > list(APPEND WebCore_LIBRARIES >@@ -67,8 +66,11 @@ 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" >+ "${PAL_DIR}" > "${WEBCORE_DIR}/accessibility/mac" > "${WEBCORE_DIR}/bridge/objc" > "${WEBCORE_DIR}/editing/cocoa" >@@ -76,6 +78,7 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES > "${WEBCORE_DIR}/editing/mac" > "${WEBCORE_DIR}/html/shadow/cocoa" > "${WEBCORE_DIR}/icu" >+ "${WEBCORE_DIR}/layout/layouttree" > "${WEBCORE_DIR}/loader/archive/cf" > "${WEBCORE_DIR}/loader/cf" > "${WEBCORE_DIR}/loader/mac" >@@ -94,6 +97,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 +146,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 +160,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 +174,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 +185,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 +201,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 +326,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 +378,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 +485,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORI > html/forms > html/parser > html/shadow >+ html/track > > inspector/agents > >@@ -534,6 +508,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORI > platform/audio > platform/cf > platform/cocoa >+ platform/ios > platform/graphics > platform/mac > platform/mediastream >@@ -547,6 +522,7 @@ set(WebCore_FORWARDING_HEADERS_DIRECTORI > platform/gamepad/cocoa > platform/gamepad/mac > >+ platform/graphics/avfoundation > platform/graphics/ca > platform/graphics/cocoa > platform/graphics/cg >Index: Source/WebCore/config.h >=================================================================== >--- Source/WebCore/config.h (revision 239133) >+++ 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/PAL/ChangeLog >=================================================================== >--- Source/WebCore/PAL/ChangeLog (revision 239133) >+++ Source/WebCore/PAL/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2018-12-12 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-11 Justin Michaud <justin_michaud@apple.com> > > Implement feature flag for CSS Typed OM >Index: Source/WebCore/PAL/pal/PlatformMac.cmake >=================================================================== >--- Source/WebCore/PAL/pal/PlatformMac.cmake (revision 239133) >+++ Source/WebCore/PAL/pal/PlatformMac.cmake (working copy) >@@ -97,7 +97,6 @@ list(APPEND PAL_SOURCES > cf/CoreMediaSoftLink.cpp > > cocoa/FileSizeFormatterCocoa.mm >- cocoa/LoggingCocoa.mm > cocoa/PassKitSoftLink.mm > > crypto/commoncrypto/CryptoDigestCommonCrypto.cpp >@@ -115,6 +114,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/WebKit/ChangeLog >=================================================================== >--- Source/WebKit/ChangeLog (revision 239134) >+++ Source/WebKit/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2018-12-12 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-12 Alex Christensen <achristensen@webkit.org> > > Implement safe browsing in WebKit on WatchOS >Index: Source/WebKit/PlatformMac.cmake >=================================================================== >--- Source/WebKit/PlatformMac.cmake (revision 239133) >+++ 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 >@@ -262,7 +259,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 > >@@ -270,8 +266,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 239133) >+++ Source/WebKitLegacy/ChangeLog (working copy) >@@ -1,3 +1,12 @@ >+2018-12-12 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 239133) >+++ Source/WebKitLegacy/PlatformMac.cmake (working copy) >@@ -9,20 +9,20 @@ list(APPEND WebKitLegacy_INCLUDE_DIRECTO > ) > > 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 +271,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 239133) >+++ 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 239150) >+++ Tools/ChangeLog (working copy) >@@ -1,3 +1,14 @@ >+2018-12-12 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-12 Ryosuke Niwa <rniwa@webkit.org> > > Make TextInputController.legacyAttributedString take DOM nodes and offsets >Index: Tools/DumpRenderTree/PlatformMac.cmake >=================================================================== >--- Tools/DumpRenderTree/PlatformMac.cmake (revision 239133) >+++ 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 239133) >+++ 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 239133) >+++ 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
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 192658
:
357210
|
357847