Attachment 357508 Details for Bug 192777 – Patch

[patch] Patch

bug-192777-20181217174229.patch (text/plain), 5.34 KB, created by Tim Horton on 2018-12-17 17:42:29 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Horton

Created: 2018-12-17 17:42:29 PST

Size: 5.34 KB

patch

obsolete

>Subversion Revision: 239303
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 09eab304d781125e8db1856b74be58b47d9d55c7..680cf1be02edfd2b5b43c4cb0262b0ccea54bab3 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-12-17  Chris Fleizach  <cfleizach@apple.com>
>+
>+        Some builds are broken after r239262
>+        https://bugs.webkit.org/show_bug.cgi?id=192777
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * wtf/Platform.h:
>+
> 2018-12-17  Daniel Bates  <dabates@apple.com>
> 
>         Support concatenating StringView with other string types
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 00c097afeda38753805fd4fdcf809ac849c5e408..cd5ef2a36d672cbc126d9bf523f88024fe9f3056 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-12-17  Chris Fleizach  <cfleizach@apple.com>
>+
>+        Some builds are broken after r239262
>+        https://bugs.webkit.org/show_bug.cgi?id=192777
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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  <cdumez@apple.com>
> 
>         Unreviewed, revert recent CrashReporterClient build fixes as they are no longer needed.
>diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
>index 2753d1ad6db8e38d7f589281edffbe6f93a38dba..e35fe1c21c2fad1e7a1f2ec1f0742ff6fab84982 100644
>--- a/Source/WTF/wtf/Platform.h
>+++ b/Source/WTF/wtf/Platform.h
>@@ -1450,3 +1450,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
>diff --git a/Source/WebKit/Platform/spi/ios/AccessibilitySupportSPI.h b/Source/WebKit/Platform/spi/ios/AccessibilitySupportSPI.h
>index b4b0053ac6ae8ac0ef3c3a41ed67b5b8b73f99b4..50ca2dbb9b559ffc47c13af3f2397715f71e2a1b 100644
>--- a/Source/WebKit/Platform/spi/ios/AccessibilitySupportSPI.h
>+++ b/Source/WebKit/Platform/spi/ios/AccessibilitySupportSPI.h
>@@ -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)
>diff --git a/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h b/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h
>index d296362ca6480d53fb38e5baff8dda9902bf68b1..9d11052f068e70b584898dad37f0406ea2684b18 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h
>+++ b/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.h
>@@ -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)
>diff --git a/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm b/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm
>index bac842eaed97cea20d7413463b1f039e8d996665..5d13fb0757eb65fb30ba89d613ced1a9ce94c5de 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WKFullKeyboardAccessWatcher.mm
>@@ -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 @@ static inline BOOL platformIsFullKeyboardAccessEnabled()
>         // 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 @@ - (id)init
> #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 @@ + (BOOL)fullKeyboardAccessEnabled
> 
> @end
> 
>-#endif // PLATFORM(COCOA)
>+#endif // ENABLE(FULL_KEYBOARD_ACCESS)

Actions: View | Formatted Diff | Diff

Attachments on bug 192777: 357477 | 357481 | 357482 | 357487 | 357494 | 357496 | 357508