Attachment 372866 Details for Bug 199199 – Patch

[patch] Patch

bug-199199-20190625144046.patch (text/plain), 26.08 KB, created by Brent Fulgham on 2019-06-25 14:40:50 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2019-06-25 14:40:50 PDT

Size: 26.08 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>--- ChangeLog	(revision 246794)
>+++ ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-06-25  Brent Fulgham  <bfulgham@apple.com>
>+
>+        Move Direct2D port to its own CMake files
>+        https://bugs.webkit.org/show_bug.cgi?id=199199
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt:
>+        * Source/cmake/OptionsAppleWin.cmake:
>+        * Source/cmake/OptionsFTW.cmake: Added.
>+
> 2019-06-25  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Fully rename WebKitGTK+ -> WebKitGTK everywhere
>Index: CMakeLists.txt
>===================================================================
>--- CMakeLists.txt	(revision 246794)
>+++ CMakeLists.txt	(working copy)
>@@ -37,6 +37,7 @@ endif ()
> set(ALL_PORTS
>     AppleWin
>     Efl
>+    FTW
>     GTK
>     JSCOnly
>     Mac
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 246794)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-06-25  Brent Fulgham  <bfulgham@apple.com>
>+
>+        Move Direct2D port to its own CMake files
>+        https://bugs.webkit.org/show_bug.cgi?id=199199
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        SSIA.
>+
>+        * PlatformAppleWin.cmake:
>+        * PlatformFTW.cmake: Added.
>+        * PlatformWin.cmake:
>+
> 2019-06-25  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Add user agent quirk for bankofamerica.com
>Index: Source/WebCore/PlatformAppleWin.cmake
>===================================================================
>--- Source/WebCore/PlatformAppleWin.cmake	(revision 246794)
>+++ Source/WebCore/PlatformAppleWin.cmake	(working copy)
>@@ -69,116 +69,88 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HE
>     platform/network/cf/SocketStreamHandleImpl.h
> )
> 
>-if (${USE_DIRECT2D})
>-    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-        "${WEBCORE_DIR}/platform/graphics/win"
>-    )
>-
>-    list(APPEND WebCore_SOURCES
>-        page/win/FrameWinDirect2D.cpp
>-
>-        platform/graphics/win/FontCascadeDirect2D.cpp
>-        platform/graphics/win/FontPlatformDataDirect2D.cpp
>-        platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp
>-        platform/graphics/win/GradientDirect2D.cpp
>-        platform/graphics/win/GraphicsContextDirect2D.cpp
>-        platform/graphics/win/GraphicsLayerDirect2D.cpp
>-        platform/graphics/win/ImageBufferDataDirect2D.cpp
>-        platform/graphics/win/ImageBufferDirect2D.cpp
>-        platform/graphics/win/ImageDecoderDirect2D.cpp
>-        platform/graphics/win/ImageDirect2D.cpp
>-        platform/graphics/win/NativeImageDirect2D.cpp
>-        platform/graphics/win/PathDirect2D.cpp
>-        platform/graphics/win/PatternDirect2D.cpp
>-        platform/graphics/win/SimpleFontDataDirect2D.cpp
>-        platform/graphics/win/TextAnalyzerHelper.cpp
>-
>-        platform/win/DragImageDirect2D.cpp
>-    )
>-else ()
>-    list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>-        "${WEBCORE_DIR}/platform/graphics/avfoundation"
>-        "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
>-        "${WEBCORE_DIR}/platform/graphics/ca"
>-        "${WEBCORE_DIR}/platform/graphics/ca/win"
>-        "${WEBCORE_DIR}/platform/graphics/cg"
>-    )
>-
>-    list(APPEND WebCore_SOURCES
>-        page/win/FrameCGWin.cpp
>-
>-        platform/graphics/ca/GraphicsLayerCA.cpp
>-        platform/graphics/ca/LayerPool.cpp
>-        platform/graphics/ca/PlatformCALayer.cpp
>-        platform/graphics/ca/TileController.cpp
>-        platform/graphics/ca/TileCoverageMap.cpp
>-        platform/graphics/ca/TileGrid.cpp
>-        platform/graphics/ca/TransformationMatrixCA.cpp
>-
>-        platform/graphics/ca/win/CACFLayerTreeHost.cpp
>-        platform/graphics/ca/win/LayerChangesFlusher.cpp
>-        platform/graphics/ca/win/PlatformCAAnimationWin.cpp
>-        platform/graphics/ca/win/PlatformCAFiltersWin.cpp
>-        platform/graphics/ca/win/PlatformCALayerWin.cpp
>-        platform/graphics/ca/win/PlatformCALayerWinInternal.cpp
>-        platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp
>-        platform/graphics/ca/win/WebTiledBackingLayerWin.cpp
>-
>-        platform/graphics/cg/ColorCG.cpp
>-        platform/graphics/cg/FloatPointCG.cpp
>-        platform/graphics/cg/FloatRectCG.cpp
>-        platform/graphics/cg/FloatSizeCG.cpp
>-        platform/graphics/cg/GradientCG.cpp
>-        platform/graphics/cg/GraphicsContext3DCG.cpp
>-        platform/graphics/cg/GraphicsContextCG.cpp
>-        platform/graphics/cg/IOSurfacePool.cpp
>-        platform/graphics/cg/ImageBufferCG.cpp
>-        platform/graphics/cg/ImageBufferDataCG.cpp
>-        platform/graphics/cg/ImageBufferUtilitiesCG.cpp
>-        platform/graphics/cg/ImageDecoderCG.cpp
>-        platform/graphics/cg/ImageSourceCGWin.cpp
>-        platform/graphics/cg/IntPointCG.cpp
>-        platform/graphics/cg/IntRectCG.cpp
>-        platform/graphics/cg/IntSizeCG.cpp
>-        platform/graphics/cg/NativeImageCG.cpp
>-        platform/graphics/cg/PDFDocumentImage.cpp
>-        platform/graphics/cg/PathCG.cpp
>-        platform/graphics/cg/PatternCG.cpp
>-        platform/graphics/cg/SubimageCacheWithTimer.cpp
>-        platform/graphics/cg/TransformationMatrixCG.cpp
>-        platform/graphics/cg/UTIRegistry.cpp
>-
>-        platform/graphics/opentype/OpenTypeCG.cpp
>-
>-        platform/graphics/win/FontCGWin.cpp
>-        platform/graphics/win/FontPlatformDataCGWin.cpp
>-        platform/graphics/win/GlyphPageTreeNodeCGWin.cpp
>-        platform/graphics/win/GraphicsContextCGWin.cpp
>-        platform/graphics/win/ImageCGWin.cpp
>-        platform/graphics/win/SimpleFontDataCGWin.cpp
>-
>-        platform/win/DragImageCGWin.cpp
>-    )
>-
>-    list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>-        platform/graphics/ca/GraphicsLayerCA.h
>-        platform/graphics/ca/LayerPool.h
>-        platform/graphics/ca/PlatformCAAnimation.h
>-        platform/graphics/ca/PlatformCAFilters.h
>-        platform/graphics/ca/PlatformCALayer.h
>-        platform/graphics/ca/PlatformCALayerClient.h
>-        platform/graphics/ca/TileController.h
>-
>-        platform/graphics/ca/win/AbstractCACFLayerTreeHost.h
>-        platform/graphics/ca/win/CACFLayerTreeHost.h
>-        platform/graphics/ca/win/CACFLayerTreeHostClient.h
>-        platform/graphics/ca/win/PlatformCALayerWin.h
>-
>-        platform/graphics/cg/GraphicsContextCG.h
>-        platform/graphics/cg/IOSurfacePool.h
>-        platform/graphics/cg/ImageBufferDataCG.h
>-        platform/graphics/cg/ImageBufferUtilitiesCG.h
>-        platform/graphics/cg/PDFDocumentImage.h
>-        platform/graphics/cg/UTIRegistry.h
>-    )
>-endif ()
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>+    "${WEBCORE_DIR}/platform/graphics/avfoundation"
>+    "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
>+    "${WEBCORE_DIR}/platform/graphics/ca"
>+    "${WEBCORE_DIR}/platform/graphics/ca/win"
>+    "${WEBCORE_DIR}/platform/graphics/cg"
>+)
>+
>+list(APPEND WebCore_SOURCES
>+    page/win/FrameCGWin.cpp
>+
>+    platform/graphics/ca/GraphicsLayerCA.cpp
>+    platform/graphics/ca/LayerPool.cpp
>+    platform/graphics/ca/PlatformCALayer.cpp
>+    platform/graphics/ca/TileController.cpp
>+    platform/graphics/ca/TileCoverageMap.cpp
>+    platform/graphics/ca/TileGrid.cpp
>+    platform/graphics/ca/TransformationMatrixCA.cpp
>+
>+    platform/graphics/ca/win/CACFLayerTreeHost.cpp
>+    platform/graphics/ca/win/LayerChangesFlusher.cpp
>+    platform/graphics/ca/win/PlatformCAAnimationWin.cpp
>+    platform/graphics/ca/win/PlatformCAFiltersWin.cpp
>+    platform/graphics/ca/win/PlatformCALayerWin.cpp
>+    platform/graphics/ca/win/PlatformCALayerWinInternal.cpp
>+    platform/graphics/ca/win/WKCACFViewLayerTreeHost.cpp
>+    platform/graphics/ca/win/WebTiledBackingLayerWin.cpp
>+
>+    platform/graphics/cg/ColorCG.cpp
>+    platform/graphics/cg/FloatPointCG.cpp
>+    platform/graphics/cg/FloatRectCG.cpp
>+    platform/graphics/cg/FloatSizeCG.cpp
>+    platform/graphics/cg/GradientCG.cpp
>+    platform/graphics/cg/GraphicsContext3DCG.cpp
>+    platform/graphics/cg/GraphicsContextCG.cpp
>+    platform/graphics/cg/IOSurfacePool.cpp
>+    platform/graphics/cg/ImageBufferCG.cpp
>+    platform/graphics/cg/ImageBufferDataCG.cpp
>+    platform/graphics/cg/ImageBufferUtilitiesCG.cpp
>+    platform/graphics/cg/ImageDecoderCG.cpp
>+    platform/graphics/cg/ImageSourceCGWin.cpp
>+    platform/graphics/cg/IntPointCG.cpp
>+    platform/graphics/cg/IntRectCG.cpp
>+    platform/graphics/cg/IntSizeCG.cpp
>+    platform/graphics/cg/NativeImageCG.cpp
>+    platform/graphics/cg/PDFDocumentImage.cpp
>+    platform/graphics/cg/PathCG.cpp
>+    platform/graphics/cg/PatternCG.cpp
>+    platform/graphics/cg/SubimageCacheWithTimer.cpp
>+    platform/graphics/cg/TransformationMatrixCG.cpp
>+    platform/graphics/cg/UTIRegistry.cpp
>+
>+    platform/graphics/opentype/OpenTypeCG.cpp
>+
>+    platform/graphics/win/FontCGWin.cpp
>+    platform/graphics/win/FontPlatformDataCGWin.cpp
>+    platform/graphics/win/GlyphPageTreeNodeCGWin.cpp
>+    platform/graphics/win/GraphicsContextCGWin.cpp
>+    platform/graphics/win/ImageCGWin.cpp
>+    platform/graphics/win/SimpleFontDataCGWin.cpp
>+
>+    platform/win/DragImageCGWin.cpp
>+)
>+
>+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    platform/graphics/ca/GraphicsLayerCA.h
>+    platform/graphics/ca/LayerPool.h
>+    platform/graphics/ca/PlatformCAAnimation.h
>+    platform/graphics/ca/PlatformCAFilters.h
>+    platform/graphics/ca/PlatformCALayer.h
>+    platform/graphics/ca/PlatformCALayerClient.h
>+    platform/graphics/ca/TileController.h
>+
>+    platform/graphics/ca/win/AbstractCACFLayerTreeHost.h
>+    platform/graphics/ca/win/CACFLayerTreeHost.h
>+    platform/graphics/ca/win/CACFLayerTreeHostClient.h
>+    platform/graphics/ca/win/PlatformCALayerWin.h
>+
>+    platform/graphics/cg/GraphicsContextCG.h
>+    platform/graphics/cg/IOSurfacePool.h
>+    platform/graphics/cg/ImageBufferDataCG.h
>+    platform/graphics/cg/ImageBufferUtilitiesCG.h
>+    platform/graphics/cg/PDFDocumentImage.h
>+    platform/graphics/cg/UTIRegistry.h
>+)
>Index: Source/WebCore/PlatformFTW.cmake
>===================================================================
>--- Source/WebCore/PlatformFTW.cmake	(nonexistent)
>+++ Source/WebCore/PlatformFTW.cmake	(working copy)
>@@ -0,0 +1,96 @@
>+add_definitions(-DQUARTZCORE_DLL -DDISABLE_COREIMAGE -DDISABLE_FRONTEND -DDISABLE_IOSURFACE -DDISABLE_RENDERSERVER
>+    -DDISABLE_3D_TRANSFORMS -DWEBCORE_CONTEXT_MENUS -DPSAPI_VERSION=1)
>+
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>+    "${WEBKIT_LIBRARIES_DIR}/include"
>+    "${WEBCORE_DIR}/loader/archive/cf"
>+    "${WEBCORE_DIR}/platform/graphics/avfoundation"
>+    "${WEBCORE_DIR}/platform/graphics/avfoundation/cf"
>+    "${WEBCORE_DIR}/platform/graphics/ca"
>+    "${WEBCORE_DIR}/platform/graphics/ca/win"
>+    "${WEBCORE_DIR}/platform/graphics/cg"
>+    "${WEBCORE_DIR}/platform/network/cf"
>+)
>+
>+list(APPEND WebCore_SOURCES
>+    loader/cf/ResourceLoaderCFNet.cpp
>+
>+    page/CaptionUserPreferencesMediaAF.cpp
>+
>+    platform/cf/MediaAccessibilitySoftLink.cpp
>+
>+    platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp
>+    platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
>+    platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
>+    platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp
>+
>+    platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp
>+    platform/graphics/avfoundation/cf/InbandTextTrackPrivateAVCF.cpp
>+    platform/graphics/avfoundation/cf/InbandTextTrackPrivateLegacyAVCF.cpp
>+    platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp
>+    platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp
>+
>+    platform/graphics/win/FontCustomPlatformData.cpp
>+
>+    platform/network/cf/AuthenticationCF.cpp
>+    platform/network/cf/CertificateInfoCFNet.cpp
>+    platform/network/cf/CookieStorageCFNet.cpp
>+    platform/network/cf/CredentialStorageCFNet.cpp
>+    platform/network/cf/DNSResolveQueueCFNet.cpp
>+    platform/network/cf/FormDataStreamCFNet.cpp
>+    platform/network/cf/LoaderRunLoopCF.cpp
>+    platform/network/cf/NetworkStorageSessionCFNet.cpp
>+    platform/network/cf/NetworkStorageSessionCFNetWin.cpp
>+    platform/network/cf/ProtectionSpaceCFNet.cpp
>+    platform/network/cf/ProxyServerCFNet.cpp
>+    platform/network/cf/ResourceErrorCF.cpp
>+    platform/network/cf/ResourceHandleCFNet.cpp
>+    platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
>+    platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
>+    platform/network/cf/ResourceRequestCFNet.cpp
>+    platform/network/cf/ResourceResponseCFNet.cpp
>+    platform/network/cf/SocketStreamHandleImplCFNet.cpp
>+    platform/network/cf/SynchronousLoaderClientCFNet.cpp
>+
>+    platform/text/LocaleNone.cpp
>+)
>+
>+list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
>+    platform/network/cf/AuthenticationCF.h
>+    platform/network/cf/AuthenticationChallenge.h
>+    platform/network/cf/CertificateInfo.h
>+    platform/network/cf/DownloadBundle.h
>+    platform/network/cf/LoaderRunLoopCF.h
>+    platform/network/cf/ProtectionSpaceCFNet.h
>+    platform/network/cf/ResourceError.h
>+    platform/network/cf/ResourceRequest.h
>+    platform/network/cf/ResourceRequestCFNet.h
>+    platform/network/cf/ResourceResponse.h
>+    platform/network/cf/SocketStreamHandleImpl.h
>+)
>+
>+list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
>+    "${WEBCORE_DIR}/platform/graphics/win"
>+)
>+
>+list(APPEND WebCore_SOURCES
>+    page/win/FrameWinDirect2D.cpp
>+
>+    platform/graphics/win/FontCascadeDirect2D.cpp
>+    platform/graphics/win/FontPlatformDataDirect2D.cpp
>+    platform/graphics/win/GlyphPageTreeNodeDirect2D.cpp
>+    platform/graphics/win/GradientDirect2D.cpp
>+    platform/graphics/win/GraphicsContextDirect2D.cpp
>+    platform/graphics/win/GraphicsLayerDirect2D.cpp
>+    platform/graphics/win/ImageBufferDataDirect2D.cpp
>+    platform/graphics/win/ImageBufferDirect2D.cpp
>+    platform/graphics/win/ImageDecoderDirect2D.cpp
>+    platform/graphics/win/ImageDirect2D.cpp
>+    platform/graphics/win/NativeImageDirect2D.cpp
>+    platform/graphics/win/PathDirect2D.cpp
>+    platform/graphics/win/PatternDirect2D.cpp
>+    platform/graphics/win/SimpleFontDataDirect2D.cpp
>+    platform/graphics/win/TextAnalyzerHelper.cpp
>+
>+    platform/win/DragImageDirect2D.cpp
>+)
>Index: Source/WebCore/PlatformWin.cmake
>===================================================================
>--- Source/WebCore/PlatformWin.cmake	(revision 246794)
>+++ Source/WebCore/PlatformWin.cmake	(working copy)
>@@ -207,7 +207,11 @@ endif ()
> if (${WTF_PLATFORM_WIN_CAIRO})
>     include(PlatformWinCairo.cmake)
> else ()
>-    include(PlatformAppleWin.cmake)
>+    if (${WTF_PLATFORM_FTW})
>+        include(PlatformFTW.cmake)
>+    else ()
>+        include(PlatformAppleWin.cmake)
>+    endif ()
> endif ()
> 
> make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj)
>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 246808)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-06-25  Brent Fulgham  <bfulgham@apple.com>
>+
>+        Move Direct2D port to its own CMake files
>+        https://bugs.webkit.org/show_bug.cgi?id=199199
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        SSIA.
>+
>+        * pal/PlatformFTW.cmake: Added.
>+
> 2019-06-25  Alex Christensen  <achristensen@webkit.org>
> 
>         Make HTTPCookieAcceptPolicy an enum class
>Index: Source/WebCore/PAL/pal/PlatformFTW.cmake
>===================================================================
>--- Source/WebCore/PAL/pal/PlatformFTW.cmake	(nonexistent)
>+++ Source/WebCore/PAL/pal/PlatformFTW.cmake	(working copy)
>@@ -0,0 +1,31 @@
>+list(APPEND PAL_PUBLIC_HEADERS
>+    avfoundation/MediaTimeAVFoundation.h
>+
>+    cf/CoreMediaSoftLink.h
>+
>+    spi/cf/CFLocaleSPI.h
>+    spi/cf/CFNetworkConnectionCacheSPI.h
>+    spi/cf/CFNetworkSPI.h
>+    spi/cf/CFUtilitiesSPI.h
>+    spi/cf/CoreAudioSPI.h
>+    spi/cf/CoreMediaSPI.h
>+
>+    spi/win/CoreTextSPIWin.h
>+)
>+
>+list(APPEND PAL_SOURCES
>+    avfoundation/MediaTimeAVFoundation.cpp
>+
>+    cf/CoreMediaSoftLink.cpp
>+
>+    crypto/win/CryptoDigestWin.cpp
>+
>+    spi/cf/CFNetworkSPIWin.cpp
>+)
>+
>+list(APPEND PAL_PRIVATE_INCLUDE_DIRECTORIES
>+    "${PAL_DIR}/pal/avfoundation"
>+    "${PAL_DIR}/pal/cf"
>+    "${PAL_DIR}/pal/spi/cf"
>+    "${PAL_DIR}/pal/spi/win"
>+)
>Index: Source/cmake/OptionsAppleWin.cmake
>===================================================================
>--- Source/cmake/OptionsAppleWin.cmake	(revision 246794)
>+++ Source/cmake/OptionsAppleWin.cmake	(working copy)
>@@ -19,58 +19,51 @@ set(ZLIB_LIBRARIES zdll${DEBUG_SUFFIX})
> 
> include(target/icu)
> 
>-# Uncomment the following line to try the Direct2D backend.
>-# set(USE_DIRECT2D 1)
>+SET_AND_EXPOSE_TO_BUILD(USE_CA ON)
>+SET_AND_EXPOSE_TO_BUILD(USE_CG ON)
> 
>-if (${USE_DIRECT2D})
>-    SET_AND_EXPOSE_TO_BUILD(USE_DIRECT2D ON)
>-else ()
>-    SET_AND_EXPOSE_TO_BUILD(USE_CA ON)
>-    SET_AND_EXPOSE_TO_BUILD(USE_CG ON)
>-
>-    set(CMAKE_REQUIRED_INCLUDES ${WEBKIT_LIBRARIES_INCLUDE_DIR})
>-    set(CMAKE_REQUIRED_LIBRARIES
>-        "${WEBKIT_LIBRARIES_LINK_DIR}/CoreFoundation${DEBUG_SUFFIX}.lib"
>-        "${WEBKIT_LIBRARIES_LINK_DIR}/AVFoundationCF${DEBUG_SUFFIX}.lib"
>-        "${WEBKIT_LIBRARIES_LINK_DIR}/QuartzCore${DEBUG_SUFFIX}.lib"
>-        "${WEBKIT_LIBRARIES_LINK_DIR}/libdispatch${DEBUG_SUFFIX}.lib"
>-    )
>-
>-    WEBKIT_CHECK_HAVE_INCLUDE(HAVE_AVCF AVFoundationCF/AVCFBase.h)
>-
>-    if (HAVE_AVCF)
>-         SET_AND_EXPOSE_TO_BUILD(USE_AVFOUNDATION ON)
>-    endif ()
>-
>-    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVCF_LEGIBLE_OUTPUT AVCFPlayerItemLegibleOutputSetCallbacks "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h;AVFoundationCF/AVCFPlayerItemLegibleOutput.h")
>-    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVFOUNDATION_LOADER_DELEGATE AVCFAssetResourceLoaderSetCallbacks "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h")
>-    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVCFURL_PLAYABLE_MIMETYPE AVCFURLAssetIsPlayableExtendedMIMEType "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h")
>-
>-    # CMake cannot identify an enum through a symbol check so a source file is required
>-    WEBKIT_CHECK_SOURCE_COMPILES(HAVE_AVCFPLAYERITEM_CALLBACK_VERSION_2 "
>-    #include <AVFoundationCF/AVFoundationCF.h>
>-    #include <AVFoundationCF/AVCFPlayerItemLegibleOutput.h>
>-    #include <CoreFoundation/CoreFoundation.h>
>-    #include <dispatch/dispatch.h>
>-
>-    int main() {
>-        CFArrayRef types = CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr);
>-        AVCFPlayerItemLegibleOutputRef legibleOutput = AVCFPlayerItemLegibleOutputCreateWithMediaSubtypesForNativeRepresentation(kCFAllocatorDefault, types);
>-        AVCFPlayerItemLegibleOutputCallbacks callbackInfo;
>-        callbackInfo.version = kAVCFPlayerItemLegibleOutput_CallbacksVersion_2;
>-        dispatch_queue_t dispatchQueue = dispatch_queue_create(\"test\", DISPATCH_QUEUE_SERIAL);
>-        AVCFPlayerItemLegibleOutputSetCallbacks(legibleOutput, &callbackInfo, dispatchQueue);
>-    }")
>-
>-    if (HAVE_AVCF_LEGIBLE_OUTPUT)
>-        SET_AND_EXPOSE_TO_BUILD(HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP ON)
>-        SET_AND_EXPOSE_TO_BUILD(HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT ON)
>-        SET_AND_EXPOSE_TO_BUILD(HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK ON)
>-    endif ()
>+set(CMAKE_REQUIRED_INCLUDES ${WEBKIT_LIBRARIES_INCLUDE_DIR})
>+set(CMAKE_REQUIRED_LIBRARIES
>+    "${WEBKIT_LIBRARIES_LINK_DIR}/CoreFoundation${DEBUG_SUFFIX}.lib"
>+    "${WEBKIT_LIBRARIES_LINK_DIR}/AVFoundationCF${DEBUG_SUFFIX}.lib"
>+    "${WEBKIT_LIBRARIES_LINK_DIR}/QuartzCore${DEBUG_SUFFIX}.lib"
>+    "${WEBKIT_LIBRARIES_LINK_DIR}/libdispatch${DEBUG_SUFFIX}.lib"
>+)
> 
>-    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_CACFLAYER_SETCONTENTSSCALE CACFLayerSetContentsScale QuartzCore/CoreAnimationCF.h)
>+WEBKIT_CHECK_HAVE_INCLUDE(HAVE_AVCF AVFoundationCF/AVCFBase.h)
>+
>+if (HAVE_AVCF)
>+     SET_AND_EXPOSE_TO_BUILD(USE_AVFOUNDATION ON)
>+endif ()
>+
>+WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVCF_LEGIBLE_OUTPUT AVCFPlayerItemLegibleOutputSetCallbacks "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h;AVFoundationCF/AVCFPlayerItemLegibleOutput.h")
>+WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVFOUNDATION_LOADER_DELEGATE AVCFAssetResourceLoaderSetCallbacks "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h")
>+WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVCFURL_PLAYABLE_MIMETYPE AVCFURLAssetIsPlayableExtendedMIMEType "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h")
>+
>+# CMake cannot identify an enum through a symbol check so a source file is required
>+WEBKIT_CHECK_SOURCE_COMPILES(HAVE_AVCFPLAYERITEM_CALLBACK_VERSION_2 "
>+#include <AVFoundationCF/AVFoundationCF.h>
>+#include <AVFoundationCF/AVCFPlayerItemLegibleOutput.h>
>+#include <CoreFoundation/CoreFoundation.h>
>+#include <dispatch/dispatch.h>
>+
>+int main() {
>+    CFArrayRef types = CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr);
>+    AVCFPlayerItemLegibleOutputRef legibleOutput = AVCFPlayerItemLegibleOutputCreateWithMediaSubtypesForNativeRepresentation(kCFAllocatorDefault, types);
>+    AVCFPlayerItemLegibleOutputCallbacks callbackInfo;
>+    callbackInfo.version = kAVCFPlayerItemLegibleOutput_CallbacksVersion_2;
>+    dispatch_queue_t dispatchQueue = dispatch_queue_create(\"test\", DISPATCH_QUEUE_SERIAL);
>+    AVCFPlayerItemLegibleOutputSetCallbacks(legibleOutput, &callbackInfo, dispatchQueue);
>+}")
>+
>+if (HAVE_AVCF_LEGIBLE_OUTPUT)
>+    SET_AND_EXPOSE_TO_BUILD(HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP ON)
>+    SET_AND_EXPOSE_TO_BUILD(HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT ON)
>+    SET_AND_EXPOSE_TO_BUILD(HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK ON)
> endif ()
> 
>+WEBKIT_CHECK_HAVE_SYMBOL(HAVE_CACFLAYER_SETCONTENTSSCALE CACFLayerSetContentsScale QuartzCore/CoreAnimationCF.h)
>+
> # Warnings as errors (ignore narrowing conversions)
> add_compile_options(/WX /Wv:18)
> 
>Index: Source/cmake/OptionsFTW.cmake
>===================================================================
>--- Source/cmake/OptionsFTW.cmake	(nonexistent)
>+++ Source/cmake/OptionsFTW.cmake	(working copy)
>@@ -0,0 +1,77 @@
>+include(OptionsWin)
>+
>+set(ENABLE_WEBCORE ON)
>+set(WTF_PLATFORM_FTW 1)
>+
>+SET_AND_EXPOSE_TO_BUILD(USE_CF ON)
>+SET_AND_EXPOSE_TO_BUILD(USE_CFURLCONNECTION ON)
>+
>+# Libraries where find_package does not work
>+set(COREFOUNDATION_LIBRARY CoreFoundation${DEBUG_SUFFIX})
>+set(LIBXML2_LIBRARIES libxml2${DEBUG_SUFFIX})
>+set(LIBXSLT_LIBRARIES libxslt${DEBUG_SUFFIX})
>+set(SQLITE_LIBRARIES SQLite3${DEBUG_SUFFIX})
>+set(ZLIB_INCLUDE_DIRS "${WEBKIT_LIBRARIES_DIR}/include/zlib")
>+set(ZLIB_LIBRARIES zdll${DEBUG_SUFFIX})
>+
>+include(target/icu)
>+
>+# Uncomment the following line to try the Direct2D backend.
>+set(USE_DIRECT2D 1)
>+
>+if (${USE_DIRECT2D})
>+    SET_AND_EXPOSE_TO_BUILD(USE_DIRECT2D ON)
>+else ()
>+    SET_AND_EXPOSE_TO_BUILD(USE_CA ON)
>+    SET_AND_EXPOSE_TO_BUILD(USE_CG ON)
>+
>+    set(CMAKE_REQUIRED_INCLUDES ${WEBKIT_LIBRARIES_INCLUDE_DIR})
>+    set(CMAKE_REQUIRED_LIBRARIES
>+        "${WEBKIT_LIBRARIES_LINK_DIR}/CoreFoundation${DEBUG_SUFFIX}.lib"
>+        "${WEBKIT_LIBRARIES_LINK_DIR}/AVFoundationCF${DEBUG_SUFFIX}.lib"
>+        "${WEBKIT_LIBRARIES_LINK_DIR}/QuartzCore${DEBUG_SUFFIX}.lib"
>+        "${WEBKIT_LIBRARIES_LINK_DIR}/libdispatch${DEBUG_SUFFIX}.lib"
>+    )
>+
>+    WEBKIT_CHECK_HAVE_INCLUDE(HAVE_AVCF AVFoundationCF/AVCFBase.h)
>+
>+    if (HAVE_AVCF)
>+         SET_AND_EXPOSE_TO_BUILD(USE_AVFOUNDATION ON)
>+    endif ()
>+
>+    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVCF_LEGIBLE_OUTPUT AVCFPlayerItemLegibleOutputSetCallbacks "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h;AVFoundationCF/AVCFPlayerItemLegibleOutput.h")
>+    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVFOUNDATION_LOADER_DELEGATE AVCFAssetResourceLoaderSetCallbacks "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h")
>+    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_AVCFURL_PLAYABLE_MIMETYPE AVCFURLAssetIsPlayableExtendedMIMEType "TargetConditionals.h;dispatch/dispatch.h;AVFoundationCF/AVFoundationCF.h")
>+
>+    # CMake cannot identify an enum through a symbol check so a source file is required
>+    WEBKIT_CHECK_SOURCE_COMPILES(HAVE_AVCFPLAYERITEM_CALLBACK_VERSION_2 "
>+    #include <AVFoundationCF/AVFoundationCF.h>
>+    #include <AVFoundationCF/AVCFPlayerItemLegibleOutput.h>
>+    #include <CoreFoundation/CoreFoundation.h>
>+    #include <dispatch/dispatch.h>
>+
>+    int main() {
>+        CFArrayRef types = CFArrayCreate(kCFAllocatorDefault, nullptr, 0, nullptr);
>+        AVCFPlayerItemLegibleOutputRef legibleOutput = AVCFPlayerItemLegibleOutputCreateWithMediaSubtypesForNativeRepresentation(kCFAllocatorDefault, types);
>+        AVCFPlayerItemLegibleOutputCallbacks callbackInfo;
>+        callbackInfo.version = kAVCFPlayerItemLegibleOutput_CallbacksVersion_2;
>+        dispatch_queue_t dispatchQueue = dispatch_queue_create(\"test\", DISPATCH_QUEUE_SERIAL);
>+        AVCFPlayerItemLegibleOutputSetCallbacks(legibleOutput, &callbackInfo, dispatchQueue);
>+    }")
>+
>+    if (HAVE_AVCF_LEGIBLE_OUTPUT)
>+        SET_AND_EXPOSE_TO_BUILD(HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP ON)
>+        SET_AND_EXPOSE_TO_BUILD(HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT ON)
>+        SET_AND_EXPOSE_TO_BUILD(HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK ON)
>+    endif ()
>+
>+    WEBKIT_CHECK_HAVE_SYMBOL(HAVE_CACFLAYER_SETCONTENTSSCALE CACFLayerSetContentsScale QuartzCore/CoreAnimationCF.h)
>+endif ()
>+
>+# Warnings as errors (ignore narrowing conversions)
>+add_compile_options(/WX /Wv:18)
>+
>+if (INTERNAL_BUILD)
>+    set(WTF_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/WTF/Scripts")
>+    set(JavaScriptCore_SCRIPTS_DIR "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore/Scripts")
>+endif ()
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 246794)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2018-11-16  Brent Fulgham  <bfulgham@apple.com>
>+
>+        [Win] Reduce the use of WKSI library calls: CoreAnimation
>+        https://bugs.webkit.org/show_bug.cgi?id=191777
>+        <rdar://problem/46140542>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update the Windows build of WebKit to refer to the SPI headers, rather than WebKitSystemInterface.
>+        Move a small amount of glue code from WKSI to WebCore, and remove any includes or link
>+        directives for WebKitSystemInterface.lib.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/PlatformWin.cmake:
>+
> 2019-06-25  Aakash Jain  <aakash_jain@apple.com>
> 
>         [ews-build] UploadTestResults and ExtractTestResults clobber results in case of multiple layout test runs in a build

Actions: View | Formatted Diff | Diff

Attachments on bug 199199: 372866 | 372869 | 372871 | 373144 | 373145 | 373162 | 373163