[webkit-reviews] review granted: [Bug 135945] [iOS] Disable ENABLE_IOS_{GESTURE, TOUCH}_EVENTS, and temporarily disable ENABLE_TOUCH_EVENTS and ENABLE_XSLT when building with the iOS public SDK : [Attachment 236899] Patch

[bugzilla-daemon at webkit.org]

Andy Estes <aestes at apple.com> has granted Daniel Bates <dbates at webkit.org>'s
request for review:
Bug 135945: [iOS] Disable ENABLE_IOS_{GESTURE, TOUCH}_EVENTS, and temporarily
disable ENABLE_TOUCH_EVENTS and ENABLE_XSLT when building with the iOS public
SDK
https://bugs.webkit.org/show_bug.cgi?id=135945

Attachment 236899: Patch
https://bugs.webkit.org/attachment.cgi?id=236899&action=review

------- Additional Comments from Andy Estes <aestes at apple.com>
View in context: https://bugs.webkit.org/attachment.cgi?id=236899&action=review


Yeah, I agree with your use of USE(APPLE_INTERNAL_SDK) over has_include checks.
r=me.

> Source/WebCore/bindings/objc/PublicDOMInterfaces.h:1258
> -#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
> +/* FIXME: We should explicitly include this header when generating bindings
for iOS with the internal SDK
> +instead of including it if the file exists so that we error out if the file
doesn't exist when building
> +for iOS with the internal iOS SDK. */
> +#if __has_include(<WebKitAdditions/PublicDOMInterfacesIOS.h>)

You could also have CodeGeneratorObjC.pm add something like
-DUSE_APPLE_INTERNAL_SDK to the compiler invocation that preprocesses this file
if ${USE_INTERNAL_SDK} is YES, then check here if USE_APPLE_INTERNAL_SDK is
defined.

> Source/WebCore/platform/ios/PlatformEventFactoryIOS.h:35
> +#if __has_include(<WebKitAdditions/PlatformTouchEventIOS.h>)
>  #include <WebKitAdditions/PlatformTouchEventIOS.h>
> +#endif

Can this be a USE(APPLE_INTERNAL_SDK) check instead?