Title: [250809] trunk/Source
- Revision
- 250809
- Author
- commit-qu...@webkit.org
- Date
- 2019-10-07 18:02:45 -0700 (Mon, 07 Oct 2019)
Log Message
Build failure in WebHTMLView.mm with the public SDK (Xcode 11 and Mojave)
https://bugs.webkit.org/show_bug.cgi?id=199705
Patch by Dan Bernstein and Kenneth Russell.
Patch by Alexey Proskuryakov <a...@apple.com> on 2019-10-07
Reviewed by Alexey Proskuryakov.
Source/WebCore/PAL:
* pal/spi/mac/NSViewSPI.h: Declare _subviews when we are not using the
replacement SPI, but the SDK doesn't declare the ivar (because the SDK is too new).
Source/WTF:
* wtf/Platform.h: Added HAVE_SUBVIEWS_IVAR_DECLARED_BY_SDK.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (250808 => 250809)
--- trunk/Source/WTF/ChangeLog 2019-10-08 00:14:52 UTC (rev 250808)
+++ trunk/Source/WTF/ChangeLog 2019-10-08 01:02:45 UTC (rev 250809)
@@ -1,3 +1,13 @@
+2019-10-07 Alexey Proskuryakov <a...@apple.com>
+
+ Build failure in WebHTMLView.mm with the public SDK (Xcode 11 and Mojave)
+ https://bugs.webkit.org/show_bug.cgi?id=199705
+
+ Patch by Dan Bernstein and Kenneth Russell.
+ Reviewed by Alexey Proskuryakov.
+
+ * wtf/Platform.h: Added HAVE_SUBVIEWS_IVAR_DECLARED_BY_SDK.
+
2019-10-04 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r250762.
Modified: trunk/Source/WTF/wtf/Platform.h (250808 => 250809)
--- trunk/Source/WTF/wtf/Platform.h 2019-10-08 00:14:52 UTC (rev 250808)
+++ trunk/Source/WTF/wtf/Platform.h 2019-10-08 01:02:45 UTC (rev 250809)
@@ -1623,6 +1623,10 @@
#define HAVE_SUBVIEWS_IVAR_SPI 1
#endif
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101500
+#define HAVE_SUBVIEWS_IVAR_DECLARED_BY_SDK 1
+#endif
+
#if PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || PLATFORM(WATCHOS) || PLATFORM(APPLETV)
#define USE_PLATFORM_SYSTEM_FALLBACK_LIST 1
#endif
Modified: trunk/Source/WebCore/PAL/ChangeLog (250808 => 250809)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-10-08 00:14:52 UTC (rev 250808)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-10-08 01:02:45 UTC (rev 250809)
@@ -1,3 +1,14 @@
+2019-10-07 Alexey Proskuryakov <a...@apple.com>
+
+ Build failure in WebHTMLView.mm with the public SDK (Xcode 11 and Mojave)
+ https://bugs.webkit.org/show_bug.cgi?id=199705
+
+ Patch by Dan Bernstein and Kenneth Russell.
+ Reviewed by Alexey Proskuryakov.
+
+ * pal/spi/mac/NSViewSPI.h: Declare _subviews when we are not using the
+ replacement SPI, but the SDK doesn't declare the ivar (because the SDK is too new).
+
2019-10-04 Alex Christensen <achristen...@webkit.org>
Simplify sandbox enabling macros
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h (250808 => 250809)
--- trunk/Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h 2019-10-08 00:14:52 UTC (rev 250808)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h 2019-10-08 01:02:45 UTC (rev 250809)
@@ -29,7 +29,12 @@
#import <pal/spi/cocoa/QuartzCoreSPI.h>
-@interface NSView () <CALayerDelegate>
+@interface NSView () <CALayerDelegate> {
+#if !HAVE(SUBVIEWS_IVAR_SPI) && !HAVE(SUBVIEWS_IVAR_DECLARED_BY_SDK)
+@package
+ NSMutableArray<__kindof NSView *> *_subviews;
+#endif
+}
- (NSView *)_findLastViewInKeyViewLoop;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
