Title: [277466] branches/safari-612.1.12-branch/Source
- Revision
- 277466
- Author
- [email protected]
- Date
- 2021-05-13 16:35:48 -0700 (Thu, 13 May 2021)
Log Message
Cherry-pick r277464. rdar://problem/77993046
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.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277464 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.12-branch/Source/WebCore/PAL/ChangeLog (277465 => 277466)
--- branches/safari-612.1.12-branch/Source/WebCore/PAL/ChangeLog 2021-05-13 23:31:11 UTC (rev 277465)
+++ branches/safari-612.1.12-branch/Source/WebCore/PAL/ChangeLog 2021-05-13 23:35:48 UTC (rev 277466)
@@ -1,3 +1,42 @@
+2021-05-13 Russell Epstein <[email protected]>
+
+ Cherry-pick r277464. rdar://problem/77993046
+
+ 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.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277464 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-05-13 Tim Horton <[email protected]>
+
+ 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-04-25 Devin Rousso <[email protected]>
Add `ALWAYS_LOG_WITH_STREAM` macro for easier development/debugging
Modified: branches/safari-612.1.12-branch/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h (277465 => 277466)
--- branches/safari-612.1.12-branch/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h 2021-05-13 23:31:11 UTC (rev 277465)
+++ branches/safari-612.1.12-branch/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h 2021-05-13 23:35:48 UTC (rev 277466)
@@ -38,6 +38,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
+
#include <CoreGraphics/CGContextDelegatePrivate.h>
#include <CoreGraphics/CGFontCache.h>
#include <CoreGraphics/CGPathPrivate.h>
@@ -44,6 +49,11 @@
#include <CoreGraphics/CoreGraphicsPrivate.h>
#include <CoreGraphics/CGStylePrivate.h>
+#if defined(WK_NDEBUG) && !defined(NDEBUG)
+#define NDEBUG 1
+#undef WK_NDEBUG
+#endif
+
#if PLATFORM(MAC)
#include <ColorSync/ColorSyncPriv.h>
#include <CoreGraphics/CGAccessibility.h>
Modified: branches/safari-612.1.12-branch/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h (277465 => 277466)
--- branches/safari-612.1.12-branch/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h 2021-05-13 23:31:11 UTC (rev 277465)
+++ branches/safari-612.1.12-branch/Source/WebCore/PAL/pal/spi/ios/GraphicsServicesSPI.h 2021-05-13 23:35:48 UTC (rev 277466)
@@ -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.12-branch/Source/WebKit/ChangeLog (277465 => 277466)
--- branches/safari-612.1.12-branch/Source/WebKit/ChangeLog 2021-05-13 23:31:11 UTC (rev 277465)
+++ branches/safari-612.1.12-branch/Source/WebKit/ChangeLog 2021-05-13 23:35:48 UTC (rev 277466)
@@ -1,3 +1,41 @@
+2021-05-13 Russell Epstein <[email protected]>
+
+ Cherry-pick r277464. rdar://problem/77993046
+
+ 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.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277464 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-05-13 Tim Horton <[email protected]>
+
+ 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-04 Russell Epstein <[email protected]>
Cherry-pick r276947. rdar://problem/77510833
Modified: branches/safari-612.1.12-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h (277465 => 277466)
--- branches/safari-612.1.12-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-05-13 23:31:11 UTC (rev 277465)
+++ branches/safari-612.1.12-branch/Source/WebKit/Platform/spi/ios/UIKitSPI.h 2021-05-13 23:35:48 UTC (rev 277466)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
