[Webkit-unassigned] [Bug 199705] Build failure in WebHTMLView.mm with the public SDK (Xcode 11 and Mojave)

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=199705

--- Comment #26 from Kenneth Russell <kbr at google.com> ---
mitz@ thank you for the patch (which builds fine locally) and ap@ thank you for suggesting how to get it to pass the style checker.

Locally, this patch builds successfully; ap@, not sure whether it's what you had in mind. Without the change to Platform.h, HAVE(SUBVIEWS_IVAR_DECLARED_BY_SDK) isn't defined.

If this looks OK then mitz@ would you like to officially post it?

Thanks again for your help!



diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 230bfa69843..65706f2ee91 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -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
diff --git a/Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h b/Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h
index e0d5b4e7ca1..1731664e4b8 100644
--- a/Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h
+++ b/Source/WebCore/PAL/pal/spi/mac/NSViewSPI.h
@@ -29,7 +29,12 @@

 #import <pal/spi/cocoa/QuartzCoreSPI.h>

- at interface NSView () <CALayerDelegate>
+ at interface NSView () <CALayerDelegate> {
+#if !HAVE(SUBVIEWS_IVAR_SPI) && HAVE(SUBVIEWS_IVAR_DECLARED_BY_SDK)
+ at package
+    NSMutableArray<__kindof NSView *> *_subviews;
+#endif
+}

 - (NSView *)_findLastViewInKeyViewLoop;

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-unassigned/attachments/20191007/b11c1be4/attachment.html>