Title: [277461] branches/safari-612.1.15-branch/Source
- Revision
- 277461
- Author
- repst...@apple.com
- Date
- 2021-05-13 16:16:47 -0700 (Thu, 13 May 2021)
Log Message
Apply patch. rdar://problem/77992162
Modified Paths
Diff
Modified: branches/safari-612.1.15-branch/Source/WebCore/PAL/ChangeLog (277460 => 277461)
--- branches/safari-612.1.15-branch/Source/WebCore/PAL/ChangeLog 2021-05-13 23:16:00 UTC (rev 277460)
+++ branches/safari-612.1.15-branch/Source/WebCore/PAL/ChangeLog 2021-05-13 23:16:47 UTC (rev 277461)
@@ -1,3 +1,15 @@
+2021-05-13 Tim Horton <timothy_hor...@apple.com>
+
+ Work around WebCore failing to build due to NDEBUG getting undefined in release
+ https://bugs.webkit.org/show_bug.cgi\?id\=225782
+ <rdar://problem/77982432>
+
+ Reviewed by Simon Fraser.
+ * pal/spi/cg/CoreGraphicsSPI.h:
+ * pal/spi/ios/GraphicsServicesSPI.h:
+ Apply a temporary workaround to preserve NDEBUG through these includes.
+ There are a few ways to get to CoreGraphicsPrivate.h, so we fix all of them.
+
2021-05-12 Jean-Yves Avenard <j...@apple.com>
Adopt CoreMedia SPI to identify audio-only playback for MSE clients
Modified: branches/safari-612.1.15-branch/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h (277460 => 277461)
--- branches/safari-612.1.15-branch/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h 2021-05-13 23:16:00 UTC (rev 277460)
+++ branches/safari-612.1.15-branch/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h 2021-05-13 23:16:47 UTC (rev 277461)
@@ -31,10 +31,20 @@
#if USE(APPLE_INTERNAL_SDK)
+// FIXME (77983361): Remove this workaround when <rdar://problem/77977216> is fixed.
+#if defined(NDEBUG) && NDEBUG
+#define WK_NDEBUG 1
+#endif
+
#import <GraphicsServices/GraphicsServices.h>
+#if defined(WK_NDEBUG) && !defined(NDEBUG)
+#define NDEBUG 1
+#undef WK_NDEBUG
#endif
+#endif
+
WTF_EXTERN_C_BEGIN
void GSInitialize(void);
Modified: branches/safari-612.1.15-branch/Source/WebKit/ChangeLog (277460 => 277461)
--- branches/safari-612.1.15-branch/Source/WebKit/ChangeLog 2021-05-13 23:16:00 UTC (rev 277460)
+++ branches/safari-612.1.15-branch/Source/WebKit/ChangeLog 2021-05-13 23:16:47 UTC (rev 277461)
@@ -1,3 +1,15 @@
+2021-05-13 Tim Horton <timothy_hor...@apple.com>
+
+ Work around WebCore failing to build due to NDEBUG getting undefined in release
+ https://bugs.webkit.org/show_bug.cgi\?id\=225782
+ <rdar://problem/77982432>
+
+ Reviewed by Simon Fraser.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ Apply a temporary workaround to preserve NDEBUG through these includes
+ There are a few ways to get to CoreGraphicsPrivate.h, so we fix all of them.
+
2021-05-13 Chris Dumez <cdu...@apple.com>
Rename FileSystem::fileIsDirectory(path, followSymlinks) to isDirectory(path) / isDirectoryFollowingSymlinks(path)
Modified: branches/safari-612.1.15-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h (277460 => 277461)
--- branches/safari-612.1.15-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-05-13 23:16:00 UTC (rev 277460)
+++ branches/safari-612.1.15-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-05-13 23:16:47 UTC (rev 277461)
@@ -27,6 +27,11 @@
#if USE(APPLE_INTERNAL_SDK)
+// FIXME (77983361): Remove this workaround when <rdar://problem/77977216> is fixed.
+#if defined(NDEBUG) && NDEBUG
+#define WK_NDEBUG 1
+#endif
+
#import <UIKit/NSTextAlternatives.h>
#import <UIKit/UIAlertController_Private.h>
#import <UIKit/UIApplication_Private.h>
@@ -135,6 +140,11 @@
#import <UIKit/UIPointerStyle_Private.h>
#endif
+#if defined(WK_NDEBUG) && !defined(NDEBUG)
+#define NDEBUG 1
+#undef WK_NDEBUG
+#endif
+
#else // USE(APPLE_INTERNAL_SDK)
#if ENABLE(DRAG_SUPPORT)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
