Attachment #400483 for bug #212420

View Details Raw Unified Return to Bug 212420

| Differences between



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

Lines 1280-1285 if (ENABLE_LEGACY_ENCRYPTED_MEDIA) a/Source/WebCore/CMakeLists.txt_sec1
- a/Source/WebCore/CMakeLists.txt -8 / +10 lines
1280	list(APPEND WebCoreTestSupport_SOURCES	1280	list(APPEND WebCoreTestSupport_SOURCES
1281	testing/LegacyMockCDM.cpp	1281	testing/LegacyMockCDM.cpp
1282	)	1282	)
		1283	endif ()
		1284
1283	list(APPEND WebCore_IDL_FILES	1285	list(APPEND WebCore_IDL_FILES
1284	Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.idl	1286	Modules/encryptedmedia/legacy/WebKitMediaKeyMessageEvent.idl
1285	Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.idl	1287	Modules/encryptedmedia/legacy/WebKitMediaKeyNeededEvent.idl
Lines 1288-1294 if (ENABLE_LEGACY_ENCRYPTED_MEDIA) a/Source/WebCore/CMakeLists.txt_sec2
1288		1290
1289	html/WebKitMediaKeyError.idl	1291	html/WebKitMediaKeyError.idl
1290	)	1292	)
1291	endif ()
1292		1293
1293	if (ENABLE_ENCRYPTED_MEDIA)	1294	if (ENABLE_ENCRYPTED_MEDIA)
1294	list(APPEND WebCore_SOURCES	1295	list(APPEND WebCore_SOURCES
Lines 1303-1308 if (ENABLE_ENCRYPTED_MEDIA) a/Source/WebCore/CMakeLists.txt_sec3
1303		1304
1304	html/MediaEncryptedEvent.cpp	1305	html/MediaEncryptedEvent.cpp
1305	)	1306	)
		1307	endif ()
		1308
1306	list(APPEND WebCore_IDL_FILES	1309	list(APPEND WebCore_IDL_FILES
1307	Modules/encryptedmedia/MediaKeyEncryptionScheme.idl	1310	Modules/encryptedmedia/MediaKeyEncryptionScheme.idl
1308	Modules/encryptedmedia/MediaKeyMessageEvent.idl	1311	Modules/encryptedmedia/MediaKeyMessageEvent.idl
Lines 1318-1324 if (ENABLE_ENCRYPTED_MEDIA) a/Source/WebCore/CMakeLists.txt_sec4
1318		1321
1319	html/MediaEncryptedEvent.idl	1322	html/MediaEncryptedEvent.idl
1320	)	1323	)
1321	endif ()
1322		1324
1323	list(APPEND WebCore_CSS_VALUE_KEYWORDS	1325	list(APPEND WebCore_CSS_VALUE_KEYWORDS
1324	${WEBCORE_DIR}/css/SVGCSSValueKeywords.in	1326	${WEBCORE_DIR}/css/SVGCSSValueKeywords.in
Lines 1378-1383 if (ENABLE_WEBGL) a/Source/WebCore/CMakeLists.txt_sec5
1378	html/canvas/WebGLVertexArrayObjectBase.cpp	1380	html/canvas/WebGLVertexArrayObjectBase.cpp
1379	html/canvas/WebGLVertexArrayObjectOES.cpp	1381	html/canvas/WebGLVertexArrayObjectOES.cpp
1380	)	1382	)
		1383	endif ()
		1384
1381	list(APPEND WebCore_IDL_FILES	1385	list(APPEND WebCore_IDL_FILES
1382	html/canvas/ANGLEInstancedArrays.idl	1386	html/canvas/ANGLEInstancedArrays.idl
1383	html/canvas/EXTBlendMinMax.idl	1387	html/canvas/EXTBlendMinMax.idl
Lines 1427-1435 if (ENABLE_WEBGL) a/Source/WebCore/CMakeLists.txt_sec6
1427	html/canvas/WebGLVertexArrayObject.idl	1431	html/canvas/WebGLVertexArrayObject.idl
1428	html/canvas/WebGLVertexArrayObjectOES.idl	1432	html/canvas/WebGLVertexArrayObjectOES.idl
1429	)	1433	)
1430	endif ()
1431		1434
1432	if (ENABLE_VIDEO_TRACK)
1433	list(APPEND WebCore_IDL_FILES	1435	list(APPEND WebCore_IDL_FILES
1434	html/track/AudioTrack.idl	1436	html/track/AudioTrack.idl
1435	html/track/AudioTrackList.idl	1437	html/track/AudioTrackList.idl
Lines 1447-1460 if (ENABLE_VIDEO_TRACK) a/Source/WebCore/CMakeLists.txt_sec7
1447	html/track/VideoTrackList.idl	1449	html/track/VideoTrackList.idl
1448	)	1450	)
1449		1451
1450	if (ENABLE_MEDIA_SOURCE)
1451	list(APPEND WebCore_IDL_FILES	1452	list(APPEND WebCore_IDL_FILES
1452	Modules/mediasource/AudioTrackMediaSource.idl	1453	Modules/mediasource/AudioTrackMediaSource.idl
1453	Modules/mediasource/TextTrackMediaSource.idl	1454	Modules/mediasource/TextTrackMediaSource.idl
1454	Modules/mediasource/VideoTrackMediaSource.idl	1455	Modules/mediasource/VideoTrackMediaSource.idl
1455	)	1456	)
1456	endif ()
1457		1457
		1458	if (ENABLE_VIDEO_TRACK)
1458	list(APPEND WebCore_SOURCES	1459	list(APPEND WebCore_SOURCES
1459	html/track/AudioTrack.cpp	1460	html/track/AudioTrack.cpp
1460	html/track/AudioTrackList.cpp	1461	html/track/AudioTrackList.cpp
Lines 1499-1504 if (ENABLE_QUOTA) a/Source/WebCore/CMakeLists.txt_sec8
1499	Modules/quota/StorageQuota.cpp	1500	Modules/quota/StorageQuota.cpp
1500	Modules/quota/WorkerNavigatorStorageQuota.cpp	1501	Modules/quota/WorkerNavigatorStorageQuota.cpp
1501	)	1502	)
		1503	endif ()
1502		1504
1503	list(APPEND WebCore_IDL_FILES	1505	list(APPEND WebCore_IDL_FILES
1504	Modules/quota/DOMWindowQuota.idl	1506	Modules/quota/DOMWindowQuota.idl
Lines 1510-1516 if (ENABLE_QUOTA) a/Source/WebCore/CMakeLists.txt_sec9
1510	Modules/quota/StorageUsageCallback.idl	1512	Modules/quota/StorageUsageCallback.idl
1511	Modules/quota/WorkerNavigatorStorageQuota.idl	1513	Modules/quota/WorkerNavigatorStorageQuota.idl
1512	)	1514	)
1513	endif ()
1514		1515
1515	if (ENABLE_GRAPHICS_CONTEXT_GL)	1516	if (ENABLE_GRAPHICS_CONTEXT_GL)
1516	list(APPEND WebCore_SOURCES	1517	list(APPEND WebCore_SOURCES
Lines 1568-1579 if (ENABLE_GRAPHICS_CONTEXT_GL) a/Source/WebCore/CMakeLists.txt_sec10
1568	)	1569	)
1569	endif ()	1570	endif ()
1570		1571
1571	if (ENABLE_USER_MESSAGE_HANDLERS)
1572	list(APPEND WebCore_IDL_FILES	1572	list(APPEND WebCore_IDL_FILES
1573	page/UserMessageHandler.idl	1573	page/UserMessageHandler.idl
1574	page/UserMessageHandlersNamespace.idl	1574	page/UserMessageHandlersNamespace.idl
1575	page/WebKitNamespace.idl	1575	page/WebKitNamespace.idl
1576	)	1576	)
		1577
		1578	if (ENABLE_USER_MESSAGE_HANDLERS)
1577	list(APPEND WebCore_SOURCES	1579	list(APPEND WebCore_SOURCES
1578	page/UserMessageHandler.cpp	1580	page/UserMessageHandler.cpp
1579	page/UserMessageHandlerDescriptor.cpp	1581	page/UserMessageHandlerDescriptor.cpp




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

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

Modules/webxr/XRReferenceSpaceEvent.cpp @no-unify
Modules/webxr/XRSessionEvent.cpp @no-unify

#endif

accessibility/AXLogger.cpp
accessibility/AXObjectCache.cpp
accessibility/AccessibilityARIAGrid.cpp

JSXPathResult.cpp
JSXSLTProcessor.cpp

#if ENABLE_WEBXR

JSWebXRBoundedReferenceSpace.cpp
JSXREnvironmentBlendMode.cpp
JSXREye.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


JSMediaEncryptedEvent.cpp

#endif

#if ENABLE_WEBGL

JSANGLEInstancedArrays.cpp
JSEXTBlendMinMax.cpp
JSEXTColorBufferFloat.cpp

JSWebGLVertexArrayObject.cpp
JSWebGLVertexArrayObjectOES.cpp

#endif

#if ENABLE_VIDEO_TRACK

JSAudioTrack.cpp
JSAudioTrackList.cpp
JSDataCue.cpp

JSVideoTrack.cpp
JSVideoTrackList.cpp

#if ENABLE_MEDIA_SOURCE
JSAudioTrackMediaSource.cpp
JSTextTrackMediaSource.cpp
JSVideoTrackMediaSource.cpp
#endif

#endif

#if ENABLE_QUOTA

JSDOMWindowQuota.cpp
JSNavigatorStorageQuota.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




WHLSLStandardLibraryFunctionMap.cpp

#if ENABLE_APPLE_PAY

    Modules/applepay/ApplePayCancelEvent.cpp
    Modules/applepay/ApplePayContactField.cpp
    Modules/applepay/ApplePayError.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




    my $headerName = "${prefix}${targetInterfaceName}.h";
    my $cppName = "${prefix}${targetInterfaceName}.cpp";

    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 "/* This file is intentionally empty. */\n";
    close FH;

    open FH, "> ${outputDirectory}/${cppName}" or die "Cannot open $cppName\n";
    print FH "/* This file is intentionally empty. */\n";
    close FH;
}

Lines 1-6 a/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.cpp_sec1
- a/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.cpp -6 / +1 lines
1	/*	1	/* This file is intentionally empty. */
2	This file is generated just to tell build scripts that JSTestImplements.h and
3	JSTestImplements.cpp are created for TestImplements.idl, and thus
4	prevent the build scripts from trying to generate JSTestImplements.h and
5	JSTestImplements.cpp at every build. This file must not be tried to compile.
6	*/

Lines 1-6 a/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.h_sec1
- a/Source/WebCore/bindings/scripts/test/JS/JSTestImplements.h -6 / +1 lines
1	/*	1	/* This file is intentionally empty. */
2	This file is generated just to tell build scripts that JSTestImplements.h and
3	JSTestImplements.cpp are created for TestImplements.idl, and thus
4	prevent the build scripts from trying to generate JSTestImplements.h and
5	JSTestImplements.cpp at every build. This file must not be tried to compile.
6	*/

Lines 1-6 a/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.cpp_sec1
- a/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.cpp -6 / +1 lines
1	/*	1	/* This file is intentionally empty. */
2	This file is generated just to tell build scripts that JSTestOperationBase.h and
3	JSTestOperationBase.cpp are created for TestOperationBase.idl, and thus
4	prevent the build scripts from trying to generate JSTestOperationBase.h and
5	JSTestOperationBase.cpp at every build. This file must not be tried to compile.
6	*/

Lines 1-6 a/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.h_sec1
- a/Source/WebCore/bindings/scripts/test/JS/JSTestOperationBase.h -6 / +1 lines
1	/*	1	/* This file is intentionally empty. */
2	This file is generated just to tell build scripts that JSTestOperationBase.h and
3	JSTestOperationBase.cpp are created for TestOperationBase.idl, and thus
4	prevent the build scripts from trying to generate JSTestOperationBase.h and
5	JSTestOperationBase.cpp at every build. This file must not be tried to compile.
6	*/

Lines 1-6 a/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.cpp_sec1
- a/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.cpp -6 / +1 lines
1	/*	1	/* This file is intentionally empty. */
2	This file is generated just to tell build scripts that JSTestSupplemental.h and
3	JSTestSupplemental.cpp are created for TestSupplemental.idl, and thus
4	prevent the build scripts from trying to generate JSTestSupplemental.h and
5	JSTestSupplemental.cpp at every build. This file must not be tried to compile.
6	*/

Lines 1-6 a/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.h_sec1
- a/Source/WebCore/bindings/scripts/test/JS/JSTestSupplemental.h -6 / +1 lines
1	/*	1	/* This file is intentionally empty. */
2	This file is generated just to tell build scripts that JSTestSupplemental.h and
3	JSTestSupplemental.cpp are created for TestSupplemental.idl, and thus
4	prevent the build scripts from trying to generate JSTestSupplemental.h and
5	JSTestSupplemental.cpp at every build. This file must not be tried to compile.
6	*/

Return to Bug 212420

Lines 588-595 testing/cocoa/WebViewVisualIdentificationOverlay.mm a/Source/WebCore/SourcesCocoa.txt_sec1
- a/Source/WebCore/SourcesCocoa.txt -18 lines
588		588
589	WHLSLStandardLibraryFunctionMap.cpp	589	WHLSLStandardLibraryFunctionMap.cpp
590		590
591	#if ENABLE_APPLE_PAY
592
593	Modules/applepay/ApplePayCancelEvent.cpp	591	Modules/applepay/ApplePayCancelEvent.cpp
594	Modules/applepay/ApplePayContactField.cpp	592	Modules/applepay/ApplePayContactField.cpp
595	Modules/applepay/ApplePayError.cpp	593	Modules/applepay/ApplePayError.cpp
Lines 656-680 WHLSLStandardLibraryFunctionMap.cpp a/Source/WebCore/SourcesCocoa.txt_sec2
656	JSApplePayShippingMethodUpdate.cpp	654	JSApplePayShippingMethodUpdate.cpp
657	JSApplePayValidateMerchantEvent.cpp	655	JSApplePayValidateMerchantEvent.cpp
658		656
659	#endif
660
661	#if ENABLE_MAC_GESTURE_EVENTS
662
663	dom/mac/GestureEvents.cpp	657	dom/mac/GestureEvents.cpp
664	JSGestureEvent.cpp	658	JSGestureEvent.cpp
665		659
666	#endif
667
668	#if ENABLE_IOS_TOUCH_EVENTS
669
670	JSTouch.cpp	660	JSTouch.cpp
671	JSTouchEvent.cpp	661	JSTouchEvent.cpp
672	JSTouchList.cpp	662	JSTouchList.cpp
673
674	#endif
675
676	#if ENABLE_IOS_GESTURE_EVENTS
677
678	JSGestureEvent.cpp
679
680	#endif

Lines 161-178 sub generateEmptyHeaderAndCpp a/Source/WebCore/bindings/scripts/generate-bindings.pl_sec1
- a/Source/WebCore/bindings/scripts/generate-bindings.pl -9 / +3 lines
161		161
162	my $headerName = "${prefix}${targetInterfaceName}.h";	162	my $headerName = "${prefix}${targetInterfaceName}.h";
163	my $cppName = "${prefix}${targetInterfaceName}.cpp";	163	my $cppName = "${prefix}${targetInterfaceName}.cpp";
164	my $contents = "/*	164
165	This file is generated just to tell build scripts that $headerName and
166	$cppName are created for ${targetInterfaceName}.idl, and thus
167	prevent the build scripts from trying to generate $headerName and
168	$cppName at every build. This file must not be tried to compile.
169	*/
170	";
171	open FH, "> ${outputHeadersDirectory}/${headerName}" or die "Cannot open $headerName\n";	165	open FH, "> ${outputHeadersDirectory}/${headerName}" or die "Cannot open $headerName\n";
172	print FH $contents;	166	print FH "/* This file is intentionally empty. */\n";
173	close FH;	167	close FH;
174		168
175	open FH, "> ${outputDirectory}/${cppName}" or die "Cannot open $cppName\n";	169	open FH, "> ${outputDirectory}/${cppName}" or die "Cannot open $cppName\n";
176	print FH $contents;	170	print FH "/* This file is intentionally empty. */\n";
177	close FH;	171	close FH;
178	}	172	}

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +27 lines
		1	2020-05-28 Darin Adler <darin@apple.com>
		2
		3	Make generate-unified-sources.sh not depend on features being listed in FEATURE_DEFINES environment variable
		4	https://bugs.webkit.org/show_bug.cgi?id=212420
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* CMakeLists.txt: Moved all IDL files outside if blocks. We put the conditionals in the source
		9	files themselves. Could go further to clean up this file, or do the same thing for source files
		10	as well, but this is the minimum to stay compatible with the changes to Sources.txt below.
		11
		12	* Sources.txt: Remove all uses of #if. We put the conditionals in the source files themselves
		13	and don't need conditionals in this file.
		14	* SourcesCocoa.txt: Ditto.
		15
		16	* bindings/scripts/generate-bindings.pl:
		17	(generateEmptyHeaderAndCpp): Changed empty files to no longer say, "This file must not be tried to compile."
		18	These files are generated when a binding is disabled.
		19
		20	* bindings/scripts/test/JS/JSTestImplements.cpp:
		21	* bindings/scripts/test/JS/JSTestImplements.h:
		22	* bindings/scripts/test/JS/JSTestOperationBase.cpp:
		23	* bindings/scripts/test/JS/JSTestOperationBase.h:
		24	* bindings/scripts/test/JS/JSTestSupplemental.cpp:
		25	* bindings/scripts/test/JS/JSTestSupplemental.h:
		26	Updated expected results.
		27
1	2020-05-27 Darin Adler <darin@apple.com>	28	2020-05-27 Darin Adler <darin@apple.com>
2		29
3	[Cocoa] Pass all defines from Platform.h to various scripts, not just the ones from .xcconfig	30	[Cocoa] Pass all defines from Platform.h to various scripts, not just the ones from .xcconfig

Lines 23-38 a/Source/WebCore/Sources.txt_sec1
- a/Source/WebCore/Sources.txt -46 lines
23		23
24	Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp	24	Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp
25		25
26	#if ENABLE_APPLICATION_MANIFEST
27
28	Modules/applicationmanifest/ApplicationManifestParser.cpp	26	Modules/applicationmanifest/ApplicationManifestParser.cpp
29		27
30	loader/ApplicationManifestLoader.cpp	28	loader/ApplicationManifestLoader.cpp
31		29
32	loader/cache/CachedApplicationManifest.cpp	30	loader/cache/CachedApplicationManifest.cpp
33		31
34	#endif
35
36	Modules/async-clipboard/Clipboard.cpp	32	Modules/async-clipboard/Clipboard.cpp
37	Modules/async-clipboard/ClipboardImageReader.cpp	33	Modules/async-clipboard/ClipboardImageReader.cpp
38	Modules/async-clipboard/ClipboardItem.cpp	34	Modules/async-clipboard/ClipboardItem.cpp
Lines 412-419 Modules/webgpu/WebGPUTexture.cpp a/Source/WebCore/Sources.txt_sec2
412	Modules/webgpu/WebGPUTextureView.cpp	408	Modules/webgpu/WebGPUTextureView.cpp
413	Modules/webgpu/WorkerNavigatorGPU.cpp	409	Modules/webgpu/WorkerNavigatorGPU.cpp
414		410
415	#if ENABLE_WEBXR
416
417	Modules/webxr/NavigatorWebXR.cpp @no-unify	411	Modules/webxr/NavigatorWebXR.cpp @no-unify
418	Modules/webxr/WebXRBoundedReferenceSpace.cpp @no-unify	412	Modules/webxr/WebXRBoundedReferenceSpace.cpp @no-unify
419	Modules/webxr/WebXRFrame.cpp @no-unify	413	Modules/webxr/WebXRFrame.cpp @no-unify
Lines 435-442 Modules/webxr/XRInputSourcesChangeEvent.cpp @no-unify a/Source/WebCore/Sources.txt_sec3
435	Modules/webxr/XRReferenceSpaceEvent.cpp @no-unify	429	Modules/webxr/XRReferenceSpaceEvent.cpp @no-unify
436	Modules/webxr/XRSessionEvent.cpp @no-unify	430	Modules/webxr/XRSessionEvent.cpp @no-unify
437		431
438	#endif
439
440	accessibility/AXLogger.cpp	432	accessibility/AXLogger.cpp
441	accessibility/AXObjectCache.cpp	433	accessibility/AXObjectCache.cpp
442	accessibility/AccessibilityARIAGrid.cpp	434	accessibility/AccessibilityARIAGrid.cpp
Lines 3570-3577 JSXPathNSResolver.cpp a/Source/WebCore/Sources.txt_sec4
3570	JSXPathResult.cpp	3562	JSXPathResult.cpp
3571	JSXSLTProcessor.cpp	3563	JSXSLTProcessor.cpp
3572		3564
3573	#if ENABLE_WEBXR
3574
3575	JSWebXRBoundedReferenceSpace.cpp	3565	JSWebXRBoundedReferenceSpace.cpp
3576	JSXREnvironmentBlendMode.cpp	3566	JSXREnvironmentBlendMode.cpp
3577	JSXREye.cpp	3567	JSXREye.cpp
Lines 3603-3631 JSXRVisibilityState.cpp a/Source/WebCore/Sources.txt_sec5
3603	JSWebXRWebGLLayer.cpp	3593	JSWebXRWebGLLayer.cpp
3604	JSXRWebGLLayerInit.cpp	3594	JSXRWebGLLayerInit.cpp
3605		3595
3606	#endif
3607
3608	#if ENABLE_GAMEPAD
3609
3610	JSGamepad.cpp	3596	JSGamepad.cpp
3611	JSGamepadButton.cpp	3597	JSGamepadButton.cpp
3612	JSGamepadEvent.cpp	3598	JSGamepadEvent.cpp
3613	JSNavigatorGamepad.cpp	3599	JSNavigatorGamepad.cpp
3614		3600
3615	#endif
3616
3617	#if ENABLE_LEGACY_ENCRYPTED_MEDIA
3618
3619	JSWebKitMediaKeyMessageEvent.cpp	3601	JSWebKitMediaKeyMessageEvent.cpp
3620	JSWebKitMediaKeyNeededEvent.cpp	3602	JSWebKitMediaKeyNeededEvent.cpp
3621	JSWebKitMediaKeySession.cpp	3603	JSWebKitMediaKeySession.cpp
3622	JSWebKitMediaKeys.cpp	3604	JSWebKitMediaKeys.cpp
3623	JSWebKitMediaKeyError.cpp	3605	JSWebKitMediaKeyError.cpp
3624		3606
3625	#endif
3626
3627	#if ENABLE_ENCRYPTED_MEDIA
3628
3629	JSMediaKeyEncryptionScheme.cpp	3607	JSMediaKeyEncryptionScheme.cpp
3630	JSMediaKeyMessageEvent.cpp	3608	JSMediaKeyMessageEvent.cpp
3631	JSMediaKeySession.cpp	3609	JSMediaKeySession.cpp
Lines 3640-3649 JSNavigatorEME.cpp a/Source/WebCore/Sources.txt_sec6
3640		3618
3641	JSMediaEncryptedEvent.cpp	3619	JSMediaEncryptedEvent.cpp
3642		3620
3643	#endif
3644
3645	#if ENABLE_WEBGL
3646
3647	JSANGLEInstancedArrays.cpp	3621	JSANGLEInstancedArrays.cpp
3648	JSEXTBlendMinMax.cpp	3622	JSEXTBlendMinMax.cpp
3649	JSEXTColorBufferFloat.cpp	3623	JSEXTColorBufferFloat.cpp
Lines 3692-3701 JSWebGLUniformLocation.cpp a/Source/WebCore/Sources.txt_sec7
3692	JSWebGLVertexArrayObject.cpp	3666	JSWebGLVertexArrayObject.cpp
3693	JSWebGLVertexArrayObjectOES.cpp	3667	JSWebGLVertexArrayObjectOES.cpp
3694		3668
3695	#endif
3696
3697	#if ENABLE_VIDEO_TRACK
3698
3699	JSAudioTrack.cpp	3669	JSAudioTrack.cpp
3700	JSAudioTrackList.cpp	3670	JSAudioTrackList.cpp
3701	JSDataCue.cpp	3671	JSDataCue.cpp
Lines 3711-3725 JSVTTRegionList.cpp a/Source/WebCore/Sources.txt_sec8
3711	JSVideoTrack.cpp	3681	JSVideoTrack.cpp
3712	JSVideoTrackList.cpp	3682	JSVideoTrackList.cpp
3713		3683
3714	#if ENABLE_MEDIA_SOURCE
3715	JSAudioTrackMediaSource.cpp	3684	JSAudioTrackMediaSource.cpp
3716	JSTextTrackMediaSource.cpp	3685	JSTextTrackMediaSource.cpp
3717	JSVideoTrackMediaSource.cpp	3686	JSVideoTrackMediaSource.cpp
3718	#endif
3719
3720	#endif
3721
3722	#if ENABLE_QUOTA
3723		3687
3724	JSDOMWindowQuota.cpp	3688	JSDOMWindowQuota.cpp
3725	JSNavigatorStorageQuota.cpp	3689	JSNavigatorStorageQuota.cpp
Lines 3730-3748 JSStorageQuotaCallback.cpp a/Source/WebCore/Sources.txt_sec9
3730	JSStorageUsageCallback.cpp	3694	JSStorageUsageCallback.cpp
3731	JSWorkerNavigatorStorageQuota.cpp	3695	JSWorkerNavigatorStorageQuota.cpp
3732		3696
3733	#endif
3734
3735	#if ENABLE_USER_MESSAGE_HANDLERS
3736
3737	JSUserMessageHandler.cpp	3697	JSUserMessageHandler.cpp
3738	JSUserMessageHandlersNamespace.cpp	3698	JSUserMessageHandlersNamespace.cpp
3739	JSWebKitNamespace.cpp	3699	JSWebKitNamespace.cpp
3740		3700
3741	#endif
3742
3743	#if ENABLE_WIRELESS_PLAYBACK_TARGET
3744
3745	JSRemotePlayback.cpp	3701	JSRemotePlayback.cpp
3746	JSRemotePlaybackAvailabilityCallback.cpp	3702	JSRemotePlaybackAvailabilityCallback.cpp
3747
3748	#endif