Changeset 192823 in webkit


Ignore:
Timestamp:
Nov 30, 2015 1:49:47 PM (8 years ago)
Author:
bshafiei@apple.com
Message:

Merged r192678. rdar://problem/23624934

Location:
tags/Safari-602.1.12.1/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • tags/Safari-602.1.12.1/Source/WebCore/ChangeLog

    r192822 r192823  
     12015-11-30  Babak Shafiei  <bshafiei@apple.com>
     2
     3        Merge r192678.
     4
     5    2015-11-20  David Kilzer  <ddkilzer@apple.com>
     6
     7            REGRESSION (r192460,r192677): Fix all the builds
     8
     9            * platform/spi/cocoa/QuartzCoreSPI.h: Check different.
     10
    1112015-11-30  Babak Shafiei  <bshafiei@apple.com>
    212

  • tags/Safari-602.1.12.1/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h

    r192822 r192823  
    197197EXTERN_C NSString * const kCAContextIgnoresHitTest;
    198198
    199 #if (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED < 90000) \
    200     || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MAX_ALLOWED < 30000) \
    201     || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000) \
    202     || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101200)
     199#if (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED < 100000) \
     200    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED < 30000) \
     201    || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000) \
     202    || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200)
    203203@protocol CALayerDelegate <NSObject>
    204204@end
Note: See TracChangeset for help on using the changeset viewer.