Changeset 277464 in webkit

Timestamp:

May 13, 2021, 4:27:20 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

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.

Source/WebCore/PAL:

• 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.

Source/WebKit:

• 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.

Location:

trunk/Source

Files:

• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h (modified) (2 diffs)
• WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Platform/spi/ios/UIKitSPI.h (modified) (2 diffs)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-05-13  Tim Horton  <timothy_horton@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-13  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h

@@ -39 +39 @@
 #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
+
 #include <CoreGraphics/CGContextDelegatePrivate.h>
 #include <CoreGraphics/CGFontCache.h>
@@ -44 +49 @@
 #include <CoreGraphics/CoreGraphicsPrivate.h>
 #include <CoreGraphics/CGStylePrivate.h>
+
+#if defined(WK_NDEBUG) && !defined(NDEBUG)
+#define NDEBUG 1
+#undef WK_NDEBUG
+#endif
 
 #if PLATFORM(MAC)

trunk/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h

@@ -32 +32 @@
 #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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-05-13  Tim Horton  <timothy_horton@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  Megan Gardner  <megan_gardner@apple.com>
 

trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -27 +27 @@
 
 #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>
@@ -136 +141 @@
 #endif
 
+#if defined(WK_NDEBUG) && !defined(NDEBUG)
+#define NDEBUG 1
+#undef WK_NDEBUG
+#endif
+
 #else // USE(APPLE_INTERNAL_SDK)