Attachment 373780 Details for Bug 198979 – Patch

[patch] Patch

bug-198979-20190709152410.patch (text/plain), 9.89 KB, created by Alex Christensen on 2019-07-09 15:24:11 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-07-09 15:24:11 PDT

Size: 9.89 KB

patch

obsolete

>Index: Source/JavaScriptCore/CMakeLists.txt
>===================================================================
>--- Source/JavaScriptCore/CMakeLists.txt	(revision 247279)
>+++ Source/JavaScriptCore/CMakeLists.txt	(working copy)
>@@ -1307,7 +1307,7 @@ WEBKIT_COPY_FILES(JavaScriptCore_CopyPri
> # dependency of JavaScriptCore for CMake Visual Studio generator to
> # eliminate duplicated custom commands. Otherwise,
> # CombinedDomains.json will be generated in both projects.
>-add_dependencies(JavaScriptCore_CopyPrivateHeaders JavaScriptCore)
>+add_dependencies(JavaScriptCore JavaScriptCore_CopyPrivateHeaders)
> 
> target_include_directories(LLIntSettingsExtractor PRIVATE
>     ${JavaScriptCore_INCLUDE_DIRECTORIES}
>Index: Source/ThirdParty/ANGLE/ChangeLog
>===================================================================
>--- Source/ThirdParty/ANGLE/ChangeLog	(revision 247279)
>+++ Source/ThirdParty/ANGLE/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-07-09  Alex Christensen  <achristensen@webkit.org>
>+
>+        Allow CMake to build WebCore on Mac
>+        https://bugs.webkit.org/show_bug.cgi?id=198979
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * include/GLSLANG/ShaderLang.h:
>+
> 2019-06-27  Beth Dakin  <bdakin@apple.com>
> 
>         Upstream use of MACCATALYST
>Index: Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h
>===================================================================
>--- Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h	(revision 247279)
>+++ Source/ThirdParty/ANGLE/include/GLSLANG/ShaderLang.h	(working copy)
>@@ -8,7 +8,7 @@
> 
> #include <stddef.h>
> 
>-#if defined(__APPLE__)
>+#if defined(__APPLE__) && !defined(BUILDING_WITH_CMAKE)
> #include "khrplatform.h"
> #else
> #include "../KHR/khrplatform.h"
>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 247282)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2019-07-09  Alex Christensen  <achristensen@webkit.org>
>+
>+        Allow CMake to build WebCore on Mac
>+        https://bugs.webkit.org/show_bug.cgi?id=198979
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Modules/websockets/ThreadableWebSocketChannel.cpp:
>+        (WebCore::ThreadableWebSocketChannel::validateURL):
>+        * PlatformMac.cmake:
>+        * platform/cocoa/VideoFullscreenModelVideoElement.mm:
>+        * platform/ios/WebItemProviderPasteboard.h:
>+
> 2019-07-09  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix build after r247279
>Index: Source/WebCore/Headers.cmake
>===================================================================
>--- Source/WebCore/Headers.cmake	(revision 247279)
>+++ Source/WebCore/Headers.cmake	(working copy)
>@@ -374,6 +374,7 @@ set(WebCore_PRIVATE_FRAMEWORK_HEADERS
>     dom/Document.h
>     dom/DocumentEventQueue.h
>     dom/DocumentFragment.h
>+    dom/DocumentFullscreen.h
>     dom/DocumentIdentifier.h
>     dom/DocumentMarker.h
>     dom/DocumentMarkerController.h
>Index: Source/WebCore/PlatformMac.cmake
>===================================================================
>--- Source/WebCore/PlatformMac.cmake	(revision 247279)
>+++ Source/WebCore/PlatformMac.cmake	(working copy)
>@@ -144,7 +144,7 @@ list(APPEND WebCore_SOURCES
>     dom/DataTransferMac.mm
>     dom/SlotAssignment.cpp
> 
>-    editing/ios/AutofillElements.cpp
>+    editing/cocoa/AutofillElements.cpp
> 
>     editing/mac/AlternativeTextUIController.mm
>     editing/mac/EditorMac.mm
>@@ -163,6 +163,8 @@ list(APPEND WebCore_SOURCES
>     page/mac/TextIndicatorWindow.mm
>     page/mac/WheelEventDeltaFilterMac.mm
> 
>+    page/scrolling/ScrollingTreeScrollingNodeDelegate.cpp
>+
>     page/scrolling/mac/ScrollingCoordinatorMac.mm
>     page/scrolling/mac/ScrollingMomentumCalculatorMac.mm
>     page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
>@@ -302,6 +304,7 @@ list(APPEND WebCore_SOURCES
>     platform/graphics/cocoa/WebGLLayer.mm
>     platform/graphics/cocoa/WebGPULayer.mm
> 
>+    platform/graphics/cv/ImageRotationSessionVT.mm
>     platform/graphics/cv/PixelBufferConformerCV.cpp
>     platform/graphics/cv/TextureCacheCV.mm
>     platform/graphics/cv/VideoTextureCopierCV.cpp
>@@ -430,6 +433,7 @@ list(APPEND WebCore_PRIVATE_FRAMEWORK_HE
>     bridge/objc/WebScriptObject.h
>     bridge/objc/WebScriptObjectPrivate.h
> 
>+    editing/cocoa/AutofillElements.h
>     editing/cocoa/DataDetection.h
>     editing/cocoa/HTMLConverter.h
> 
>@@ -568,7 +572,14 @@ set(ADDITIONAL_BINDINGS_DEPENDENCIES
>     ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
>     ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
> )
>-set(CSS_VALUE_PLATFORM_DEFINES WTF_PLATFORM_MAC=1)
>+set(CSS_VALUE_PLATFORM_DEFINES "WTF_PLATFORM_MAC=1 HAVE_OS_DARK_MODE_SUPPORT=1")
>+
>+add_custom_command(
>+    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibraryFunctionMap.cpp
>+    MAIN_DEPENDENCY Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt
>+    DEPENDS Modules/webgpu/WHLSL/WHLSLBuildStandardLibraryFunctionMap.py
>+    COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLBuildStandardLibraryFunctionMap.py ${WEBCORE_DIR}/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt ${WebCore_DERIVED_SOURCES_DIR}/WHLSLStandardLibraryFunctionMap.cpp
>+    VERBATIM)
> 
> list(APPEND WebCoreTestSupport_LIBRARIES PRIVATE WebCore)
> list(APPEND WebCoreTestSupport_SOURCES
>Index: Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp
>===================================================================
>--- Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp	(revision 247279)
>+++ Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp	(working copy)
>@@ -90,6 +90,8 @@ Optional<ThreadableWebSocketChannel::Val
>             validatedURL.areCookiesAllowed = !results.summary.blockedCookies;
>         }
>     }
>+#else
>+    UNUSED_PARAM(document);
> #endif
>     return validatedURL;
> }
>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 247279)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2019-07-09  Alex Christensen  <achristensen@webkit.org>
>+
>+        Allow CMake to build WebCore on Mac
>+        https://bugs.webkit.org/show_bug.cgi?id=198979
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pal/PlatformMac.cmake:
>+
> 2019-07-08  Antoine Quint  <graouts@apple.com>
> 
>         [Pointer Events] Enable only on the most recent version of the supported iOS family
>Index: Source/WebCore/PAL/pal/PlatformMac.cmake
>===================================================================
>--- Source/WebCore/PAL/pal/PlatformMac.cmake	(revision 247279)
>+++ Source/WebCore/PAL/pal/PlatformMac.cmake	(working copy)
>@@ -105,6 +105,7 @@ list(APPEND PAL_SOURCES
> 
>     cf/CoreMediaSoftLink.cpp
> 
>+    cocoa/AVFoundationSoftLink.mm
>     cocoa/FileSizeFormatterCocoa.mm
>     cocoa/PassKitSoftLink.mm
> 
>Index: Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm
>===================================================================
>--- Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm	(revision 247279)
>+++ Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm	(working copy)
>@@ -29,19 +29,19 @@
> #import "VideoFullscreenModelVideoElement.h"
> 
> #import "DOMWindow.h"
>+#import "Event.h"
>+#import "EventListener.h"
>+#import "EventNames.h"
>+#import "HTMLElement.h"
>+#import "HTMLVideoElement.h"
> #import "History.h"
> #import "Logging.h"
> #import "MediaControlsHost.h"
>+#import "Page.h"
> #import "PlaybackSessionModelMediaElement.h"
>+#import "TextTrackList.h"
>+#import "TimeRanges.h"
> #import <QuartzCore/CoreAnimation.h>
>-#import <WebCore/Event.h>
>-#import <WebCore/EventListener.h>
>-#import <WebCore/EventNames.h>
>-#import <WebCore/HTMLElement.h>
>-#import <WebCore/HTMLVideoElement.h>
>-#import <WebCore/Page.h>
>-#import <WebCore/TextTrackList.h>
>-#import <WebCore/TimeRanges.h>
> #import <wtf/NeverDestroyed.h>
> #import <wtf/SoftLinking.h>
> 
>Index: Source/WebCore/platform/ios/WebItemProviderPasteboard.h
>===================================================================
>--- Source/WebCore/platform/ios/WebItemProviderPasteboard.h	(revision 247279)
>+++ Source/WebCore/platform/ios/WebItemProviderPasteboard.h	(working copy)
>@@ -23,9 +23,11 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>+#if TARGET_OS_IPHONE
>+
> #import <WebCore/AbstractPasteboard.h>
> 
>-#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
> 
> struct CGSize;
> 
>@@ -112,4 +114,5 @@ WEBCORE_EXPORT @interface WebItemProvide
> 
> NS_ASSUME_NONNULL_END
> 
>-#endif // TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
>+#endif // __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
>+#endif // TARGET_OS_IPHONE
>Index: Source/cmake/OptionsMac.cmake
>===================================================================
>--- Source/cmake/OptionsMac.cmake	(revision 247279)
>+++ Source/cmake/OptionsMac.cmake	(working copy)
>@@ -20,11 +20,11 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS_LEVEL_2 PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS PRIVATE OFF)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR PRIVATE ON)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE ON)
>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE ON)
>-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_INPUT_TYPE_COLOR PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATE PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_DATETIMELOCAL PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_MONTH PRIVATE OFF)
>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_TIME PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE ON)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LETTERPRESS PRIVATE OFF)
> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_SOURCE PRIVATE ON)

Actions: View | Formatted Diff | Diff

Attachments on bug 198979: 372396 | 372610 | 373780 | 373803