Changeset 239311 in webkit


Ignore:
Timestamp:
Dec 17, 2018 6:25:25 PM (5 years ago)
Author:
Chris Fleizach
Message:

Some builds are broken after r239262
https://bugs.webkit.org/show_bug.cgi?id=192777

Reviewed by Simon Fraser.

Source/WebKit:

  • Platform/spi/ios/AccessibilitySupportSPI.h:
  • UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h:
  • UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm:

(platformIsFullKeyboardAccessEnabled):
(-[WKFullKeyboardAccessWatcher init]):
Fix the build by being more clear about when it's OK to use AccessibilitySupport.

Source/WTF:

  • wtf/Platform.h:
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WTF/ChangeLog

    r239282 r239311  
     12018-12-17  Chris Fleizach  <cfleizach@apple.com>
     2
     3        Some builds are broken after r239262
     4        https://bugs.webkit.org/show_bug.cgi?id=192777
     5
     6        Reviewed by Simon Fraser.
     7
     8        * wtf/Platform.h:
     9
    1102018-12-17  Daniel Bates  <dabates@apple.com>
    211
  • trunk/Source/WTF/wtf/Platform.h

    r239306 r239311  
    14551455#define ENABLE_SEC_ITEM_SHIM 1
    14561456#endif
     1457
     1458#if (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400))
     1459#define HAVE_ACCESSIBILITY_SUPPORT 1
     1460#endif
     1461
     1462#if PLATFORM(MAC)
     1463#define ENABLE_FULL_KEYBOARD_ACCESS 1
     1464#endif
  • trunk/Source/WebKit/ChangeLog

    r239310 r239311  
     12018-12-17  Chris Fleizach  <cfleizach@apple.com>
     2
     3        Some builds are broken after r239262
     4        https://bugs.webkit.org/show_bug.cgi?id=192777
     5
     6        Reviewed by Simon Fraser.
     7
     8        * Platform/spi/ios/AccessibilitySupportSPI.h:
     9        * UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h:
     10        * UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm:
     11        (platformIsFullKeyboardAccessEnabled):
     12        (-[WKFullKeyboardAccessWatcher init]):
     13        Fix the build by being more clear about when it's OK to use AccessibilitySupport.
     14
    1152018-12-17  Chris Dumez  <cdumez@apple.com>
    216
  • trunk/Source/WebKit/Platform/spi/ios/AccessibilitySupportSPI.h

    r239262 r239311  
    2626#pragma once
    2727
     28#if HAVE(ACCESSIBILITY_SUPPORT)
     29
    2830#if USE(APPLE_INTERNAL_SDK)
     31
    2932// FIXME (46432011): We shouldn't need to wrap this include in extern "C".
    3033WTF_EXTERN_C_BEGIN
    3134#include <AccessibilitySupport.h>
    3235WTF_EXTERN_C_END
    33 #endif
     36
     37#else
    3438
    3539WTF_EXTERN_C_BEGIN
    3640
     41#if PLATFORM(IOS_FAMILY)
    3742extern Boolean _AXSKeyRepeatEnabled();
    3843extern CFTimeInterval _AXSKeyRepeatDelay();
     44#endif
     45
     46#if ENABLE(ACCESSIBILITY_EVENTS)
    3947extern CFStringRef kAXSWebAccessibilityEventsEnabledNotification;
    4048extern Boolean _AXSWebAccessibilityEventsEnabled();
     49#endif
     50
     51#if PLATFORM(IOS_FAMILY) && ENABLE(FULL_KEYBOARD_ACCESS)
    4152extern CFStringRef kAXSFullKeyboardAccessEnabledNotification;
    4253extern Boolean _AXSFullKeyboardAccessEnabled();
     54#endif
    4355
    4456WTF_EXTERN_C_END
     57
     58#endif
     59
     60#endif // HAVE(ACCESSIBILITY_SUPPORT)
  • trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h

    r239262 r239311  
    2626#pragma once
    2727
    28 #if PLATFORM(COCOA)
     28#if ENABLE(FULL_KEYBOARD_ACCESS)
    2929
    3030@interface WKFullKeyboardAccessWatcher : NSObject {
     
    3737@end;
    3838
    39 #endif // PLATFORM(COCOA)
     39#endif // ENABLE(FULL_KEYBOARD_ACCESS)
  • trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm

    r239276 r239311  
    2727#import "WKFullKeyboardAccessWatcher.h"
    2828
    29 #if PLATFORM(COCOA)
     29#if ENABLE(FULL_KEYBOARD_ACCESS)
    3030
    3131#import "WebProcessPool.h"
     
    5656        fullKeyboardAccessEnabled = (mode & 0x2);
    5757    }
    58 #elif PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
     58#elif PLATFORM(IOS_FAMILY)
    5959    fullKeyboardAccessEnabled = _AXSFullKeyboardAccessEnabled();
    6060#endif
     
    9393    notificationCenter = [NSDistributedNotificationCenter defaultCenter];
    9494    notitificationName = KeyboardUIModeDidChangeNotification;
    95 #elif PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
     95#elif PLATFORM(IOS_FAMILY)
    9696    notificationCenter = [NSNotificationCenter defaultCenter];
    9797    notitificationName = (NSString *)kAXSFullKeyboardAccessEnabledNotification;
     
    112112@end
    113113
    114 #endif // PLATFORM(COCOA)
     114#endif // ENABLE(FULL_KEYBOARD_ACCESS)
Note: See TracChangeset for help on using the changeset viewer.