Attachment 400483 Details for Bug 212420 – Patch

[patch] Patch

bug-212420-20200528110710.patch (text/plain), 14.27 KB, created by Darin Adler on 2020-05-28 11:07:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Adler

Created: 2020-05-28 11:07:14 PDT

Size: 14.27 KB

patch

obsolete

>Subversion Revision: 262245
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index fb1ee2035326e92b2484f3f9ff8799bb8097e5eb..28e1aa1a810debcdb5b83e46536ae5250cebd00f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,30 @@
>+2020-05-28  Darin Adler  <darin@apple.com>
>+
>+        Make generate-unified-sources.sh not depend on features being listed in FEATURE_DEFINES environment variable
>+        https://bugs.webkit.org/show_bug.cgi?id=212420
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * CMakeLists.txt: Moved all IDL files outside if blocks. We put the conditionals in the source
>+        files themselves. Could go further to clean up this file, or do the same thing for source files
>+        as well, but this is the minimum to stay compatible with the changes to Sources.txt below.
>+
>+        * Sources.txt: Remove all uses of #if. We put the conditionals in the source files themselves
>+        and don't need conditionals in this file.
>+        * SourcesCocoa.txt: Ditto.
>+
>+        * bindings/scripts/generate-bindings.pl:
>+        (generateEmptyHeaderAndCpp): Changed empty files to no longer say, "This file must not be tried to compile."
>+        These files are generated when a binding is disabled.
>+
>+        * bindings/scripts/test/JS/JSTestImplements.cpp:
>+        * bindings/scripts/test/JS/JSTestImplements.h:
>+        * bindings/scripts/test/JS/JSTestOperationBase.cpp:
>+        * bindings/scripts/test/JS/JSTestOperationBase.h:
>+        * bindings/scripts/test/JS/JSTestSupplemental.cpp:
>+        * bindings/scripts/test/JS/JSTestSupplemental.h:
>+        Updated expected results.
>+
> 2020-05-27  Darin Adler  <darin@apple.com>
> 
>         [Cocoa] Pass all defines from Platform.h to various scripts, not just the ones from .xcconfig
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index 1bb62b17c75efb7c249e8830af8817bd07d50dd1..17639f228f835e4be262a26e7aeb100342b3bd38 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -1280,6 +1280,8 @@ if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
>     list(APPEND WebCoreTestSupport_SOURCES
>         testing/LegacyMockCDM.cpp
>     )
>+endif ()
>+
>     list(APPEND WebCore_IDL_FILES
>         Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.idl
>         Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.idl
>@@ -1288,7 +1290,6 @@ if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
> 
>         html/WebKitMediaKeyError.idl
>     )
>-endif ()
> 
> if (ENABLE_ENCRYPTED_MEDIA)
>     list(APPEND WebCore_SOURCES
>@@ -1303,6 +1304,8 @@ if (ENABLE_ENCRYPTED_MEDIA)
> 
>         html/MediaEncryptedEvent.cpp
>     )
>+endif ()
>+
>     list(APPEND WebCore_IDL_FILES
>         Modules/encryptedmedia/MediaKeyEncryptionScheme.idl
>         Modules/encryptedmedia/MediaKeyMessageEvent.idl
>@@ -1318,7 +1321,6 @@ if (ENABLE_ENCRYPTED_MEDIA)
> 
>         html/MediaEncryptedEvent.idl
>     )
>-endif ()
> 
> list(APPEND WebCore_CSS_VALUE_KEYWORDS
>     ${WEBCORE_DIR}/css/SVGCSSValueKeywords.in
>@@ -1378,6 +1380,8 @@ if (ENABLE_WEBGL)
>         html/canvas/WebGLVertexArrayObjectBase.cpp
>         html/canvas/WebGLVertexArrayObjectOES.cpp
>     )
>+endif ()
>+
>     list(APPEND WebCore_IDL_FILES
>         html/canvas/ANGLEInstancedArrays.idl
>         html/canvas/EXTBlendMinMax.idl
>@@ -1427,9 +1431,7 @@ if (ENABLE_WEBGL)
>         html/canvas/WebGLVertexArrayObject.idl
>         html/canvas/WebGLVertexArrayObjectOES.idl
>     )
>-endif ()
> 
>-if (ENABLE_VIDEO_TRACK)
>     list(APPEND WebCore_IDL_FILES
>         html/track/AudioTrack.idl
>         html/track/AudioTrackList.idl
>@@ -1447,14 +1449,13 @@ if (ENABLE_VIDEO_TRACK)
>         html/track/VideoTrackList.idl
>     )
> 
>-    if (ENABLE_MEDIA_SOURCE)
>         list(APPEND WebCore_IDL_FILES
>             Modules/mediasource/AudioTrackMediaSource.idl
>             Modules/mediasource/TextTrackMediaSource.idl
>             Modules/mediasource/VideoTrackMediaSource.idl
>         )
>-    endif ()
> 
>+if (ENABLE_VIDEO_TRACK)
>     list(APPEND WebCore_SOURCES
>         html/track/AudioTrack.cpp
>         html/track/AudioTrackList.cpp
>@@ -1499,6 +1500,7 @@ if (ENABLE_QUOTA)
>         Modules/quota/StorageQuota.cpp
>         Modules/quota/WorkerNavigatorStorageQuota.cpp
>     )
>+endif ()
> 
>     list(APPEND WebCore_IDL_FILES
>         Modules/quota/DOMWindowQuota.idl
>@@ -1510,7 +1512,6 @@ if (ENABLE_QUOTA)
>         Modules/quota/StorageUsageCallback.idl
>         Modules/quota/WorkerNavigatorStorageQuota.idl
>     )
>-endif ()
> 
> if (ENABLE_GRAPHICS_CONTEXT_GL)
>     list(APPEND WebCore_SOURCES
>@@ -1568,12 +1569,13 @@ if (ENABLE_GRAPHICS_CONTEXT_GL)
>     )
> endif ()
> 
>-if (ENABLE_USER_MESSAGE_HANDLERS)
>     list(APPEND WebCore_IDL_FILES
>         page/UserMessageHandler.idl
>         page/UserMessageHandlersNamespace.idl
>         page/WebKitNamespace.idl
>     )
>+
>+if (ENABLE_USER_MESSAGE_HANDLERS)
>     list(APPEND WebCore_SOURCES
>         page/UserMessageHandler.cpp
>         page/UserMessageHandlerDescriptor.cpp
>diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
>index 47622b95c250dbfdb5f60c23f903342c049fac3b..aad71f8d3676eac4ee10e7d9c0f42eb472bf9e79 100644
>--- a/Source/WebCore/Sources.txt
>+++ b/Source/WebCore/Sources.txt
>@@ -23,16 +23,12 @@
> 
> Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp
> 
>-#if ENABLE_APPLICATION_MANIFEST
>-
> Modules/applicationmanifest/ApplicationManifestParser.cpp
> 
> loader/ApplicationManifestLoader.cpp
> 
> loader/cache/CachedApplicationManifest.cpp
> 
>-#endif
>-
> Modules/async-clipboard/Clipboard.cpp
> Modules/async-clipboard/ClipboardImageReader.cpp
> Modules/async-clipboard/ClipboardItem.cpp
>@@ -412,8 +408,6 @@ Modules/webgpu/WebGPUTexture.cpp
> Modules/webgpu/WebGPUTextureView.cpp
> Modules/webgpu/WorkerNavigatorGPU.cpp
> 
>-#if ENABLE_WEBXR
>-
> Modules/webxr/NavigatorWebXR.cpp @no-unify
> Modules/webxr/WebXRBoundedReferenceSpace.cpp @no-unify
> Modules/webxr/WebXRFrame.cpp @no-unify
>@@ -435,8 +429,6 @@ Modules/webxr/XRInputSourcesChangeEvent.cpp @no-unify
> Modules/webxr/XRReferenceSpaceEvent.cpp @no-unify
> Modules/webxr/XRSessionEvent.cpp @no-unify
> 
>-#endif
>-
> accessibility/AXLogger.cpp
> accessibility/AXObjectCache.cpp
> accessibility/AccessibilityARIAGrid.cpp
>@@ -3570,8 +3562,6 @@ JSXPathNSResolver.cpp
> JSXPathResult.cpp
> JSXSLTProcessor.cpp
> 
>-#if ENABLE_WEBXR
>-
> JSWebXRBoundedReferenceSpace.cpp
> JSXREnvironmentBlendMode.cpp
> JSXREye.cpp
>@@ -3603,29 +3593,17 @@ JSXRVisibilityState.cpp
> JSWebXRWebGLLayer.cpp
> JSXRWebGLLayerInit.cpp
> 
>-#endif
>-
>-#if ENABLE_GAMEPAD
>-
> JSGamepad.cpp
> JSGamepadButton.cpp
> JSGamepadEvent.cpp
> JSNavigatorGamepad.cpp
> 
>-#endif
>-
>-#if ENABLE_LEGACY_ENCRYPTED_MEDIA
>-
> JSWebKitMediaKeyMessageEvent.cpp
> JSWebKitMediaKeyNeededEvent.cpp
> JSWebKitMediaKeySession.cpp
> JSWebKitMediaKeys.cpp
> JSWebKitMediaKeyError.cpp
> 
>-#endif
>-
>-#if ENABLE_ENCRYPTED_MEDIA
>-
> JSMediaKeyEncryptionScheme.cpp
> JSMediaKeyMessageEvent.cpp
> JSMediaKeySession.cpp
>@@ -3640,10 +3618,6 @@ JSNavigatorEME.cpp
> 
> JSMediaEncryptedEvent.cpp
> 
>-#endif
>-
>-#if ENABLE_WEBGL
>-
> JSANGLEInstancedArrays.cpp
> JSEXTBlendMinMax.cpp
> JSEXTColorBufferFloat.cpp
>@@ -3692,10 +3666,6 @@ JSWebGLUniformLocation.cpp
> JSWebGLVertexArrayObject.cpp
> JSWebGLVertexArrayObjectOES.cpp
> 
>-#endif
>-
>-#if ENABLE_VIDEO_TRACK
>-
> JSAudioTrack.cpp
> JSAudioTrackList.cpp
> JSDataCue.cpp
>@@ -3711,15 +3681,9 @@ JSVTTRegionList.cpp
> JSVideoTrack.cpp
> JSVideoTrackList.cpp
> 
>-#if ENABLE_MEDIA_SOURCE
> JSAudioTrackMediaSource.cpp
> JSTextTrackMediaSource.cpp
> JSVideoTrackMediaSource.cpp
>-#endif
>-
>-#endif
>-
>-#if ENABLE_QUOTA
> 
> JSDOMWindowQuota.cpp
> JSNavigatorStorageQuota.cpp
>@@ -3730,19 +3694,9 @@ JSStorageQuotaCallback.cpp
> JSStorageUsageCallback.cpp
> JSWorkerNavigatorStorageQuota.cpp
> 
>-#endif
>-
>-#if ENABLE_USER_MESSAGE_HANDLERS
>-
> JSUserMessageHandler.cpp
> JSUserMessageHandlersNamespace.cpp
> JSWebKitNamespace.cpp
> 
>-#endif
>-
>-#if ENABLE_WIRELESS_PLAYBACK_TARGET
>-
> JSRemotePlayback.cpp
> JSRemotePlaybackAvailabilityCallback.cpp
>-
>-#endif
>diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
>index 6cd17423fc021abc624e75cf2a3d8cb29d3fad73..69146c5063dd5e6038f7757af0f94be0a08d6525 100644
>--- a/Source/WebCore/SourcesCocoa.txt
>+++ b/Source/WebCore/SourcesCocoa.txt
>@@ -588,8 +588,6 @@ testing/cocoa/WebViewVisualIdentificationOverlay.mm
> 
> WHLSLStandardLibraryFunctionMap.cpp
> 
>-#if ENABLE_APPLE_PAY
>-
>     Modules/applepay/ApplePayCancelEvent.cpp
>     Modules/applepay/ApplePayContactField.cpp
>     Modules/applepay/ApplePayError.cpp
>@@ -656,25 +654,9 @@ WHLSLStandardLibraryFunctionMap.cpp
>     JSApplePayShippingMethodUpdate.cpp
>     JSApplePayValidateMerchantEvent.cpp
> 
>-#endif
>-
>-#if ENABLE_MAC_GESTURE_EVENTS
>-
>     dom/mac/GestureEvents.cpp
>     JSGestureEvent.cpp
> 
>-#endif
>-
>-#if ENABLE_IOS_TOUCH_EVENTS
>-
>     JSTouch.cpp
>     JSTouchEvent.cpp
>     JSTouchList.cpp
>-
>-#endif
>-
>-#if ENABLE_IOS_GESTURE_EVENTS
>-
>-    JSGestureEvent.cpp
>-
>-#endif
>diff --git a/Source/WebCore/bindings/scripts/generate-bindings.pl b/Source/WebCore/bindings/scripts/generate-bindings.pl
>index 53eeeea6ccf83dd12fdfecad4a698d459bca9901..b710a2911c3c7986e5f131c670f7b809869d7229 100755
>--- a/Source/WebCore/bindings/scripts/generate-bindings.pl
>+++ b/Source/WebCore/bindings/scripts/generate-bindings.pl
>@@ -161,18 +161,12 @@ sub generateEmptyHeaderAndCpp
> 
>     my $headerName = "${prefix}${targetInterfaceName}.h";
>     my $cppName = "${prefix}${targetInterfaceName}.cpp";
>-    my $contents = "/*
>-    This file is generated just to tell build scripts that $headerName and
>-    $cppName are created for ${targetInterfaceName}.idl, and thus
>-    prevent the build scripts from trying to generate $headerName and
>-    $cppName at every build. This file must not be tried to compile.
>-*/
>-";
>+
>     open FH, "> ${outputHeadersDirectory}/${headerName}" or die "Cannot open $headerName\n";
>-    print FH $contents;
>+    print FH "/* This file is intentionally empty. */\n";
>     close FH;
> 
>     open FH, "> ${outputDirectory}/${cppName}" or die "Cannot open $cppName\n";
>-    print FH $contents;
>+    print FH "/* This file is intentionally empty. */\n";
>     close FH;
> }
>diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.cpp
>index 886f8c5ea3360272d4626fe86b68465f2f62bea0..1635283dc445d595f5ddd828ddec7d6cb1fc6bea 100644
>--- a/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.cpp
>+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.cpp
>@@ -1,6 +1 @@
>-/*
>-    This file is generated just to tell build scripts that JSTestImplements.h and
>-    JSTestImplements.cpp are created for TestImplements.idl, and thus
>-    prevent the build scripts from trying to generate JSTestImplements.h and
>-    JSTestImplements.cpp at every build. This file must not be tried to compile.
>-*/
>+/* This file is intentionally empty. */
>diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.h b/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.h
>index 886f8c5ea3360272d4626fe86b68465f2f62bea0..1635283dc445d595f5ddd828ddec7d6cb1fc6bea 100644
>--- a/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.h
>+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.h
>@@ -1,6 +1 @@
>-/*
>-    This file is generated just to tell build scripts that JSTestImplements.h and
>-    JSTestImplements.cpp are created for TestImplements.idl, and thus
>-    prevent the build scripts from trying to generate JSTestImplements.h and
>-    JSTestImplements.cpp at every build. This file must not be tried to compile.
>-*/
>+/* This file is intentionally empty. */
>diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.cpp
>index 1985ca18ded8e8b7e7509107091bff681ee631fd..1635283dc445d595f5ddd828ddec7d6cb1fc6bea 100644
>--- a/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.cpp
>+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.cpp
>@@ -1,6 +1 @@
>-/*
>-    This file is generated just to tell build scripts that JSTestOperationBase.h and
>-    JSTestOperationBase.cpp are created for TestOperationBase.idl, and thus
>-    prevent the build scripts from trying to generate JSTestOperationBase.h and
>-    JSTestOperationBase.cpp at every build. This file must not be tried to compile.
>-*/
>+/* This file is intentionally empty. */
>diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.h b/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.h
>index 1985ca18ded8e8b7e7509107091bff681ee631fd..1635283dc445d595f5ddd828ddec7d6cb1fc6bea 100644
>--- a/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.h
>+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.h
>@@ -1,6 +1 @@
>-/*
>-    This file is generated just to tell build scripts that JSTestOperationBase.h and
>-    JSTestOperationBase.cpp are created for TestOperationBase.idl, and thus
>-    prevent the build scripts from trying to generate JSTestOperationBase.h and
>-    JSTestOperationBase.cpp at every build. This file must not be tried to compile.
>-*/
>+/* This file is intentionally empty. */
>diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.cpp
>index 66d3214e4af816501e32b4cec36340e446dd8be5..1635283dc445d595f5ddd828ddec7d6cb1fc6bea 100644
>--- a/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.cpp
>+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.cpp
>@@ -1,6 +1 @@
>-/*
>-    This file is generated just to tell build scripts that JSTestSupplemental.h and
>-    JSTestSupplemental.cpp are created for TestSupplemental.idl, and thus
>-    prevent the build scripts from trying to generate JSTestSupplemental.h and
>-    JSTestSupplemental.cpp at every build. This file must not be tried to compile.
>-*/
>+/* This file is intentionally empty. */
>diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.h b/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.h
>index 66d3214e4af816501e32b4cec36340e446dd8be5..1635283dc445d595f5ddd828ddec7d6cb1fc6bea 100644
>--- a/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.h
>+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.h
>@@ -1,6 +1 @@
>-/*
>-    This file is generated just to tell build scripts that JSTestSupplemental.h and
>-    JSTestSupplemental.cpp are created for TestSupplemental.idl, and thus
>-    prevent the build scripts from trying to generate JSTestSupplemental.h and
>-    JSTestSupplemental.cpp at every build. This file must not be tried to compile.
>-*/
>+/* This file is intentionally empty. */

Actions: View | Formatted Diff | Diff

Attachments on bug 212420: 400479 | 400483 | 400496 | 400525 | 403506