Changeset 247324 in webkit


Ignore:
Timestamp:
Jul 10, 2019, 1:30:26 PM (6 years ago)
Author:
commit-queue@webkit.org
Message:

Allow CMake to build WebCore on Mac
​https://bugs.webkit.org/show_bug.cgi?id=198979

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-07-10
Reviewed by Don Olmstead.

Source/ThirdParty/ANGLE:

  • include/GLSLANG/ShaderLang.h:

Source/WebCore:

  • Modules/websockets/ThreadableWebSocketChannel.cpp:

(WebCore::ThreadableWebSocketChannel::validateURL):

  • PlatformMac.cmake:
  • platform/cocoa/VideoFullscreenModelVideoElement.mm:
  • platform/ios/WebItemProviderPasteboard.h:

Source/WebCore/PAL:

  • pal/PlatformMac.cmake:
Location:
trunk/Source
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r247315 r247324  
     12019-07-10  Alex Christensen  <achristensen@webkit.org>
     2
     3        Allow CMake to build WebCore on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=198979
     5
     6        Reviewed by Don Olmstead.
     7
     8        * include/GLSLANG/ShaderLang.h:
     9
    1102019-07-10  Kenneth Russell  <kbr@chromium.org>
    211

  • trunk/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h

    r245088 r247324  
    99#include <stddef.h>
    1010
    11 #if defined(__APPLE__)
     11#if defined(__APPLE__) && !defined(BUILDING_WITH_CMAKE)
    1212#include "khrplatform.h"
    1313#else

  • trunk/Source/WebCore/ChangeLog

    r247323 r247324  
     12019-07-10  Alex Christensen  <achristensen@webkit.org>
     2
     3        Allow CMake to build WebCore on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=198979
     5
     6        Reviewed by Don Olmstead.
     7
     8        * Modules/websockets/ThreadableWebSocketChannel.cpp:
     9        (WebCore::ThreadableWebSocketChannel::validateURL):
     10        * PlatformMac.cmake:
     11        * platform/cocoa/VideoFullscreenModelVideoElement.mm:
     12        * platform/ios/WebItemProviderPasteboard.h:
     13
    1142019-07-10  Chris Dumez  <cdumez@apple.com>
    215

  • trunk/Source/WebCore/Headers.cmake

    r246964 r247324  
    375375    dom/DocumentEventQueue.h
    376376    dom/DocumentFragment.h
     377    dom/DocumentFullscreen.h
    377378    dom/DocumentIdentifier.h
    378379    dom/DocumentMarker.h

  • trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp

    r246877 r247324  
    9191        }
    9292    }
     93#else
     94    UNUSED_PARAM(document);
    9395#endif
    9496    return validatedURL;

  • trunk/Source/WebCore/PAL/ChangeLog

    r247205 r247324  
     12019-07-10  Alex Christensen  <achristensen@webkit.org>
     2
     3        Allow CMake to build WebCore on Mac
     4        https://bugs.webkit.org/show_bug.cgi?id=198979
     5
     6        Reviewed by Don Olmstead.
     7
     8        * pal/PlatformMac.cmake:
     9
    1102019-07-08  Antoine Quint  <graouts@apple.com>
    211

  • trunk/Source/WebCore/PAL/pal/PlatformMac.cmake

    r246126 r247324  
    106106    cf/CoreMediaSoftLink.cpp
    107107
     108    cocoa/AVFoundationSoftLink.mm
    108109    cocoa/FileSizeFormatterCocoa.mm
    109110    cocoa/PassKitSoftLink.mm

  • trunk/Source/WebCore/PlatformMac.cmake

    r246126 r247324  
    145145    dom/SlotAssignment.cpp
    146146
    147     editing/ios/AutofillElements.cpp
     147    editing/cocoa/AutofillElements.cpp
    148148
    149149    editing/mac/AlternativeTextUIController.mm
    … …  
    163163    page/mac/TextIndicatorWindow.mm
    164164    page/mac/WheelEventDeltaFilterMac.mm
     165
     166    page/scrolling/ScrollingTreeScrollingNodeDelegate.cpp
    165167
    166168    page/scrolling/mac/ScrollingCoordinatorMac.mm
    … …  
    303305    platform/graphics/cocoa/WebGPULayer.mm
    304306
     307    platform/graphics/cv/ImageRotationSessionVT.mm
    305308    platform/graphics/cv/PixelBufferConformerCV.cpp
    306309    platform/graphics/cv/TextureCacheCV.mm
    … …  
    431434    bridge/objc/WebScriptObjectPrivate.h
    432435
     436    editing/cocoa/AutofillElements.h
    433437    editing/cocoa/DataDetection.h
    434438    editing/cocoa/HTMLConverter.h
    … …  
    569573    ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
    570574)
    571 set(CSS_VALUE_PLATFORM_DEFINES WTF_PLATFORM_MAC=1)
     575set(CSS_VALUE_PLATFORM_DEFINES "WTF_PLATFORM_MAC=1 HAVE_OS_DARK_MODE_SUPPORT=1")
     576
     577add_custom_command(
     578    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibraryFunctionMap.cpp
     579    MAIN_DEPENDENCY Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt
     580    DEPENDS Modules/webgpu/WHLSL/WHLSLBuildStandardLibraryFunctionMap.py
     581    COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLBuildStandardLibraryFunctionMap.py ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibraryFunctionMap.cpp
     582    VERBATIM)
    572583
    573584list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE WebCore)

  • trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm

    r246490 r247324  
    3030
    3131#import "DOMWindow.h"
     32#import "Event.h"
     33#import "EventListener.h"
     34#import "EventNames.h"
     35#import "HTMLElement.h"
     36#import "HTMLVideoElement.h"
    3237#import "History.h"
    3338#import "Logging.h"
    3439#import "MediaControlsHost.h"
     40#import "Page.h"
    3541#import "PlaybackSessionModelMediaElement.h"
     42#import "TextTrackList.h"
     43#import "TimeRanges.h"
    3644#import <QuartzCore/CoreAnimation.h>
    37 #import <WebCore/Event.h>
    38 #import <WebCore/EventListener.h>
    39 #import <WebCore/EventNames.h>
    40 #import <WebCore/HTMLElement.h>
    41 #import <WebCore/HTMLVideoElement.h>
    42 #import <WebCore/Page.h>
    43 #import <WebCore/TextTrackList.h>
    44 #import <WebCore/TimeRanges.h>
    4545#import <wtf/NeverDestroyed.h>
    4646#import <wtf/SoftLinking.h>

  • trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h

    r246131 r247324  
    2424 */
    2525
     26#if TARGET_OS_IPHONE
     27
    2628#import <WebCore/AbstractPasteboard.h>
    2729
    28 #if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
     30#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
    2931
    3032struct CGSize;
    … …  
    113115NS_ASSUME_NONNULL_END
    114116
    115 #endif // TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
     117#endif // __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
     118#endif // TARGET_OS_IPHONE

  • trunk/Source/cmake/OptionsMac.cmake

    r247297 r247324  
    2020WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ON)
    2121WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE OFF)
    22 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON)
    23 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE ON)
    24 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE ON)
    25 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE ON)
    26 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE ON)
     22WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE OFF)
     23WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE OFF)
     24WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE OFF)
     25WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE OFF)
     26WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE OFF)
    2727WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE ON)
    2828WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
Note: See TracChangeset for help on using the changeset viewer.