[Webkit-unassigned] [Bug 238368] Some Apple internal clients fail to build due to redeclared AppKit types in WebKitLegacy

[bugzilla-daemon at webkit.org]

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

David Kilzer (:ddkilzer) <ddkilzer at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #455742|review?                     |review+
              Flags|                            |

--- Comment #4 from David Kilzer (:ddkilzer) <ddkilzer at webkit.org> ---
Comment on attachment 455742
  --> https://bugs.webkit.org/attachment.cgi?id=455742
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=455742&action=review

r=me, but please swap the logic as noted before landing.

Also, make sure this builds on iOS before landing.

It's unlikely that this patch caused layout test failures, either.

> Source/WebKitLegacy/mac/Misc/WebNSViewExtras.h:48
> +#if !TARGET_OS_IPHONE
>  @interface NSView (WebExtras)
> +#else
> + at interface WAKView (WebExtras)
> +#endif

Would be slightly better to reverse the logic here and use `#if TARGET_OS_IPHONE/#else/#endif` instead.

> Source/WebKitLegacy/mac/Misc/WebNSViewExtras.h:55
> +#if !TARGET_OS_IPHONE
>  - (NSView *)_web_superviewOfClass:(Class)viewClass;
> +#else
> +- (WAKView *)_web_superviewOfClass:(Class)viewClass;
> +#endif

Ditto.

> Source/WebKitLegacy/mac/WebView/WebDocumentPrivate.h:81
> +#if !TARGET_OS_IPHONE
>  - (NSView *)selectionView;
> +#else
> +- (WAKView *)selectionView;
> +#endif

Ditto.

> Source/WebKitLegacy/mac/WebView/WebFrameView.h:53
> +#if !TARGET_OS_IPHONE
>  @interface WebFrameView : NSView
> +#else
> + at interface WebFrameView : WAKView
> +#endif

Ditto.

> Source/WebKitLegacy/mac/WebView/WebFrameView.h:74
> +#if !TARGET_OS_IPHONE
>  @property (nonatomic, readonly, strong) NSView<WebDocumentView> *documentView;
> +#else
> + at property (nonatomic, readonly, strong) WAKView<WebDocumentView> *documentView;
> +#endif

Ditto.

> Source/WebKitLegacy/mac/WebView/WebHTMLViewPrivate.h:118
> +#if !TARGET_OS_IPHONE
>  - (NSView *)_compositingLayersHostingView;
> +#else
> +- (WAKView *)_compositingLayersHostingView;
> +#endif

Ditto.

> Source/WebKitLegacy/mac/WebView/WebView.h:133
> +#if !TARGET_OS_IPHONE
>  @interface WebView : NSView
> +#else
> + at interface WebView : WAKView
> +#endif

Ditto.

-- 
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/20220325/22f06ed5/attachment.htm>