Changeset 196148 in webkit


Ignore:
Timestamp:
Feb 4, 2016 1:52:42 PM (8 years ago)
Author:
dbates@webkit.org
Message:

WebKit for iOS Simulator fails to build with public iOS SDK
​https://bugs.webkit.org/show_bug.cgi?id=153881

Reviewed by Alex Christensen.

Source/WebCore:

Make constants have internal linkage to match the Apple Internal SDK.

  • platform/spi/ios/MobileGestaltSPI.h:

Source/WebKit2:

Add version guards around SPI that is now API as of iOS SDK 9.2. Until we upgrade the iOS EWS
and iOS buildbots to use the 9.2 SDK we need to keep these SPI declarations to avoid breaking
the build.

  • Platform/spi/ios/UIKitSPI.h:
Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r196145 r196148  
     12016-02-04  Daniel Bates  <dabates@apple.com>
     2
     3        WebKit for iOS Simulator fails to build with public iOS SDK
     4        https://bugs.webkit.org/show_bug.cgi?id=153881
     5
     6        Reviewed by Alex Christensen.
     7
     8        Make constants have internal linkage to match the Apple Internal SDK.
     9
     10        * platform/spi/ios/MobileGestaltSPI.h:
     11
    1122016-02-04  Chris Dumez  <cdumez@apple.com>
    213

  • trunk/Source/WebCore/platform/spi/ios/MobileGestaltSPI.h

    r191904 r196148  
    3939#else
    4040
    41 EXTERN_C const CFStringRef kMGQAppleInternalInstallCapability = CFSTR("apple-internal-install");
    42 EXTERN_C const CFStringRef kMGQMainScreenPitch = CFSTR("main-screen-pitch");
    43 EXTERN_C const CFStringRef kMGQMainScreenScale = CFSTR("main-screen-scale");
    44 EXTERN_C const CFStringRef kMGQiPadCapability = CFSTR("ipad");
    45 EXTERN_C const CFStringRef kMGQDeviceName = CFSTR("DeviceName");
    46 EXTERN_C const CFStringRef kMGQDeviceClassNumber = CFSTR("DeviceClassNumber");
     41static const CFStringRef kMGQAppleInternalInstallCapability = CFSTR("apple-internal-install");
     42static const CFStringRef kMGQMainScreenPitch = CFSTR("main-screen-pitch");
     43static const CFStringRef kMGQMainScreenScale = CFSTR("main-screen-scale");
     44static const CFStringRef kMGQiPadCapability = CFSTR("ipad");
     45static const CFStringRef kMGQDeviceName = CFSTR("DeviceName");
     46static const CFStringRef kMGQDeviceClassNumber = CFSTR("DeviceClassNumber");
    4747
    4848typedef enum {

  • trunk/Source/WebKit2/ChangeLog

    r196142 r196148  
     12016-02-04  Daniel Bates  <dabates@apple.com>
     2
     3        WebKit for iOS Simulator fails to build with public iOS SDK
     4        https://bugs.webkit.org/show_bug.cgi?id=153881
     5
     6        Reviewed by Alex Christensen.
     7
     8        Add version guards around SPI that is now API as of iOS SDK 9.2. Until we upgrade the iOS EWS
     9        and iOS buildbots to use the 9.2 SDK we need to keep these SPI declarations to avoid breaking
     10        the build.
     11
     12        * Platform/spi/ios/UIKitSPI.h:
     13
    1142016-02-04  Joseph Pecoraro  <pecoraro@apple.com>
    215

  • trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h

    r195991 r196148  
    234234@interface UIGestureRecognizer ()
    235235- (void)requireOtherGestureToFail:(UIGestureRecognizer *)gestureRecognizer;
     236#if __IPHONE_OS_VERSION_MAX_ALLOWED < 90200
    236237@property(nonatomic, copy) NSArray<NSNumber *> *allowedTouchTypes;
     238#endif
    237239@end
    238240
    … …  
    288290@end
    289291
     292#if __IPHONE_OS_VERSION_MAX_ALLOWED < 90100
    290293typedef enum {
    291294    UITouchTypeDirect
    … …  
    295298@property(nonatomic,readonly) UITouchType type;
    296299@end
     300#endif
    297301
    298302@interface UIScrollView ()
Note: See TracChangeset for help on using the changeset viewer.