Bug 125369 – Fix build for PLATFORM(MAC) && !ENABLE(DRAG_SUPPORT)

• Component: WebCore Misc.
• Status: RESOLVED INVALID

[Brian Burg]

Some missing guards have accreted over time.

[Brian Burg]

Created attachment 218634 [details]
patch

[Build Bot]

Comment on attachment 218634 [details]
patch

Attachment 218634 [details] did not pass win-ews (win):
Output: http://webkit-queues.appspot.com/results/46318001

[Brian Burg]

Comment on attachment 218634 [details]
patch

bad patch

[Brian Burg]

Created attachment 218643 [details]
v1

[Darin Adler]

Comment on attachment 218643 [details]
v1

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

> Source/WebCore/ChangeLog:3
> +        Build fix for PLATFORM(MAC) && !ENABLE(DRAG_SUPPORT)

I don’t think this is helpful to do. We don’t need to support all combinations of ENABLE and PLATFORM. We do want to build for iOS without drag supported, but I see no reason we have to support non-iOS PLATFORM(MAC) with drag support off.

> Source/WebCore/dom/ClipboardMac.mm:29
> +#if ENABLE(DRAG_SUPPORT)

Not helpful to add this.

> Source/WebCore/platform/DragImage.cpp:-29
> -#if ENABLE(DRAG_SUPPORT)

Fine to remove this.

> Source/WebCore/platform/mac/DragImageMac.mm:-29
> -#if ENABLE(DRAG_SUPPORT)

Fine to remove this.

> Source/WebCore/platform/mac/PasteboardMac.mm:144
> +#if ENABLE(DRAG_SUPPORT)

Not helpful to add this.

> Source/WebCore/platform/mac/PasteboardMac.mm:645
> +#if ENABLE(DRAG_SUPPORT)

Not helpful to add this.

[Brian Burg]

Thanks for the quick turnaround.

(In reply to comment #5)
> (From update of attachment 218643 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=218643&action=review
> 
> > Source/WebCore/ChangeLog:3
> > +        Build fix for PLATFORM(MAC) && !ENABLE(DRAG_SUPPORT)
> 
> I don’t think this is helpful to do. We don’t need to support all combinations of ENABLE and PLATFORM. We do want to build for iOS without drag supported, but I see no reason we have to support non-iOS PLATFORM(MAC) with drag support off.

I really just want the ENABLE(DRAG_SUPPORT) guards to be accurate in DragImage.h. However, changing DragImage.{cpp,h} first will cascade into also fixing DragData, DragClient, and other stuff, so I wanted to split up the patches. This first patch was just getting me to a baseline where I can test !ENABLE(DRAG_SUPPORT) from a non-windows environment. The other patches fix guards for DragData, DragClient, and DragImage mostly independently.

[Brian Burg]

I'll just close this bug since the changes are really only helpful for my testing of the other bugs, not for anyone else.