Title: [239311] trunk/Source
- Revision
- 239311
- Author
- [email protected]
- Date
- 2018-12-17 18:25:25 -0800 (Mon, 17 Dec 2018)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (239310 => 239311)
--- trunk/Source/WTF/ChangeLog 2018-12-18 02:17:26 UTC (rev 239310)
+++ trunk/Source/WTF/ChangeLog 2018-12-18 02:25:25 UTC (rev 239311)
@@ -1,3 +1,12 @@
+2018-12-17 Chris Fleizach <[email protected]>
+
+ Some builds are broken after r239262
+ https://bugs.webkit.org/show_bug.cgi?id=192777
+
+ Reviewed by Simon Fraser.
+
+ * wtf/Platform.h:
+
2018-12-17 Daniel Bates <[email protected]>
Support concatenating StringView with other string types
Modified: trunk/Source/WTF/wtf/Platform.h (239310 => 239311)
--- trunk/Source/WTF/wtf/Platform.h 2018-12-18 02:17:26 UTC (rev 239310)
+++ trunk/Source/WTF/wtf/Platform.h 2018-12-18 02:25:25 UTC (rev 239311)
@@ -1454,3 +1454,11 @@
/* FIXME: Is this still necessary? CFURLConnection isn't used on Cocoa platforms any more. */
#define ENABLE_SEC_ITEM_SHIM 1
#endif
+
+#if (PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400))
+#define HAVE_ACCESSIBILITY_SUPPORT 1
+#endif
+
+#if PLATFORM(MAC)
+#define ENABLE_FULL_KEYBOARD_ACCESS 1
+#endif
Modified: trunk/Source/WebKit/ChangeLog (239310 => 239311)
--- trunk/Source/WebKit/ChangeLog 2018-12-18 02:17:26 UTC (rev 239310)
+++ trunk/Source/WebKit/ChangeLog 2018-12-18 02:25:25 UTC (rev 239311)
@@ -1,3 +1,17 @@
+2018-12-17 Chris Fleizach <[email protected]>
+
+ Some builds are broken after r239262
+ https://bugs.webkit.org/show_bug.cgi?id=192777
+
+ Reviewed by Simon Fraser.
+
+ * 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.
+
2018-12-17 Chris Dumez <[email protected]>
Allow passing nil as session state to [WKWebView _restoreSessionState:]
Modified: trunk/Source/WebKit/Platform/spi/ios/AccessibilitySupportSPI.h (239310 => 239311)
--- trunk/Source/WebKit/Platform/spi/ios/AccessibilitySupportSPI.h 2018-12-18 02:17:26 UTC (rev 239310)
+++ trunk/Source/WebKit/Platform/spi/ios/AccessibilitySupportSPI.h 2018-12-18 02:25:25 UTC (rev 239311)
@@ -25,20 +25,36 @@
#pragma once
+#if HAVE(ACCESSIBILITY_SUPPORT)
+
#if USE(APPLE_INTERNAL_SDK)
+
// FIXME (46432011): We shouldn't need to wrap this include in extern "C".
WTF_EXTERN_C_BEGIN
#include <AccessibilitySupport.h>
WTF_EXTERN_C_END
-#endif
+#else
+
WTF_EXTERN_C_BEGIN
+#if PLATFORM(IOS_FAMILY)
extern Boolean _AXSKeyRepeatEnabled();
extern CFTimeInterval _AXSKeyRepeatDelay();
+#endif
+
+#if ENABLE(ACCESSIBILITY_EVENTS)
extern CFStringRef kAXSWebAccessibilityEventsEnabledNotification;
extern Boolean _AXSWebAccessibilityEventsEnabled();
+#endif
+
+#if PLATFORM(IOS_FAMILY) && ENABLE(FULL_KEYBOARD_ACCESS)
extern CFStringRef kAXSFullKeyboardAccessEnabledNotification;
extern Boolean _AXSFullKeyboardAccessEnabled();
+#endif
WTF_EXTERN_C_END
+
+#endif
+
+#endif // HAVE(ACCESSIBILITY_SUPPORT)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h (239310 => 239311)
--- trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h 2018-12-18 02:17:26 UTC (rev 239310)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h 2018-12-18 02:25:25 UTC (rev 239311)
@@ -25,7 +25,7 @@
#pragma once
-#if PLATFORM(COCOA)
+#if ENABLE(FULL_KEYBOARD_ACCESS)
@interface WKFullKeyboardAccessWatcher : NSObject {
@private
@@ -36,4 +36,4 @@
@end;
-#endif // PLATFORM(COCOA)
+#endif // ENABLE(FULL_KEYBOARD_ACCESS)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm (239310 => 239311)
--- trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm 2018-12-18 02:17:26 UTC (rev 239310)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm 2018-12-18 02:25:25 UTC (rev 239311)
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKFullKeyboardAccessWatcher.h"
-#if PLATFORM(COCOA)
+#if ENABLE(FULL_KEYBOARD_ACCESS)
#import "WebProcessPool.h"
@@ -55,7 +55,7 @@
// Bit 1 is set if controls other than text fields are included in the tab order (WebKit also always includes lists).
fullKeyboardAccessEnabled = (mode & 0x2);
}
-#elif PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
+#elif PLATFORM(IOS_FAMILY)
fullKeyboardAccessEnabled = _AXSFullKeyboardAccessEnabled();
#endif
@@ -92,7 +92,7 @@
#if PLATFORM(MAC)
notificationCenter = [NSDistributedNotificationCenter defaultCenter];
notitificationName = KeyboardUIModeDidChangeNotification;
-#elif PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
+#elif PLATFORM(IOS_FAMILY)
notificationCenter = [NSNotificationCenter defaultCenter];
notitificationName = (NSString *)kAXSFullKeyboardAccessEnabledNotification;
#endif
@@ -111,4 +111,4 @@
@end
-#endif // PLATFORM(COCOA)
+#endif // ENABLE(FULL_KEYBOARD_ACCESS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
