Changeset 246664 in webkit

Timestamp:

Jun 20, 2019 5:49:14 PM (5 years ago)

Author:

dbates@webkit.org

Message:

[iOS] Evernote crashes when creating a note
​https://bugs.webkit.org/show_bug.cgi?id=199083
<rdar://problem/51759247>

Reviewed by Brent Fulgham.

Source/WebCore:

Add runtime check whether WebKit is being used in Evernote. Evernote's bundle ID
references iPhone, but they use the same ID for their iPad app as well.

• platform/RuntimeApplicationChecks.h:
• platform/cocoa/RuntimeApplicationChecksCocoa.mm:

(WebCore::IOSApplication::isEvernote): Added.

Source/WebKit:

Add a hack just for Evernote linked before iOS 13 that dynamically adds a placeholder -[WKContentView keyCommands]
method (it just calls super). Evernote swizzles the IPI -[WKContentView keyCommands], but this
method may not always be present in the WebKit binary following r240514. So, Evernote may end
up swizzling -[UIResponder keyCommands], but their implementation doesn't account for this
scenario and they end up crashing because they call an unrecognized selector.

• UIProcess/Cocoa/VersionChecks.h: Add version check.
• UIProcess/ios/WKContentView.mm:

(keyCommandsPlaceholderHackForEvernote): Added.
(-[WKContentView _commonInitializationWithProcessPool:configuration:]): Install the hack.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/RuntimeApplicationChecks.h (modified) (1 diff)
• WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/UIProcess/Cocoa/VersionChecks.h (modified) (1 diff)
• WebKit/UIProcess/ios/WKContentView.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-20  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Evernote crashes when creating a note
+        https://bugs.webkit.org/show_bug.cgi?id=199083
+        <rdar://problem/51759247>
+
+        Reviewed by Brent Fulgham.
+
+        Add runtime check whether WebKit is being used in Evernote. Evernote's bundle ID
+        references iPhone, but they use the same ID for their iPad app as well.
+
+        * platform/RuntimeApplicationChecks.h:
+        * platform/cocoa/RuntimeApplicationChecksCocoa.mm:
+        (WebCore::IOSApplication::isEvernote): Added.
+
 2019-06-20  Greg Doolittle  <gr3g@apple.com>
 

trunk/Source/WebCore/platform/RuntimeApplicationChecks.h

@@ -93 +93 @@
 WEBCORE_EXPORT bool isFirefox();
 WEBCORE_EXPORT bool isAppleApplication();
+WEBCORE_EXPORT bool isEvernote();
 
 } // IOSApplication

trunk/Source/WebCore/platform/cocoa/RuntimeApplicationChecksCocoa.mm

@@ -295 +295 @@
 }
 
+bool IOSApplication::isEvernote()
+{
+    static bool isEvernote = applicationBundleIsEqualTo("com.evernote.iPhone.Evernote"_s);
+    return isEvernote;
+}
+
 #endif
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-20  Daniel Bates  <dabates@apple.com>
+
+        [iOS] Evernote crashes when creating a note
+        https://bugs.webkit.org/show_bug.cgi?id=199083
+        <rdar://problem/51759247>
+
+        Reviewed by Brent Fulgham.
+
+        Add a hack just for Evernote linked before iOS 13 that dynamically adds a placeholder -[WKContentView keyCommands]
+        method (it just calls super). Evernote swizzles the IPI -[WKContentView keyCommands], but this
+        method may not always be present in the WebKit binary following r240514. So, Evernote may end
+        up swizzling -[UIResponder keyCommands], but their implementation doesn't account for this
+        scenario and they end up crashing because they call an unrecognized selector.
+
+        * UIProcess/Cocoa/VersionChecks.h: Add version check.
+        * UIProcess/ios/WKContentView.mm:
+        (keyCommandsPlaceholderHackForEvernote): Added.
+        (-[WKContentView _commonInitializationWithProcessPool:configuration:]): Install the hack.
+
 2019-06-20  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/VersionChecks.h

@@ -74 +74 @@
     FirstWithModernCompabilityModeByDefault = DYLD_IOS_VERSION_FIRST_WITH_MODERN_COMPATIBILITY_MODE_BY_DEFAULT,
     FirstThatHasUIContextMenuInteraction = DYLD_IOS_VERSION_13_0,
+    FirstWhereWKContentViewDoesNotOverrideKeyCommands = DYLD_IOS_VERSION_13_0,
 #elif PLATFORM(MAC)
     FirstWithNetworkCache = DYLD_MACOSX_VERSION_10_11,

trunk/Source/WebKit/UIProcess/ios/WKContentView.mm

@@ -61 +61 @@
 #import <WebCore/PlatformScreen.h>
 #import <WebCore/Quirks.h>
+#import <WebCore/RuntimeApplicationChecks.h>
 #import <WebCore/VelocityData.h>
+#import <objc/message.h>
 #import <pal/spi/cocoa/QuartzCoreSPI.h>
 #import <wtf/RetainPtr.h>
@@ -142 +144 @@
 }
 
+#if USE(UIKIT_KEYBOARD_ADDITIONS)
+
+// Evernote expects to swizzle -keyCommands on WKContentView or they crash. Remove this hack
+// as soon as reasonably possible. See <rdar://problem/51759247>.
+static NSArray *keyCommandsPlaceholderHackForEvernote(id self, SEL _cmd)
+{
+    struct objc_super super { 0 };
+    super.receiver = self;
+    super.super_class = class_getSuperclass(object_getClass(self));
+
+    using SuperKeyCommandsFunction = NSArray *(*)(struct objc_super*, SEL);
+    return reinterpret_cast<SuperKeyCommandsFunction>(&objc_msgSendSuper)(&super, @selector(keyCommands));
+}
+
+#endif
+
 - (instancetype)_commonInitializationWithProcessPool:(WebKit::WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration
 {
@@ -187 +205 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillResignActive:) name:UIApplicationWillResignActiveNotification object:[UIApplication sharedApplication]];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationDidBecomeActive:) name:UIApplicationDidBecomeActiveNotification object:[UIApplication sharedApplication]];
+
+#if USE(UIKIT_KEYBOARD_ADDITIONS)
+    if (WebCore::IOSApplication::isEvernote() && !linkedOnOrAfter(WebKit::SDKVersion::FirstWhereWKContentViewDoesNotOverrideKeyCommands))
+        class_addMethod(self.class, @selector(keyCommands), reinterpret_cast<IMP>(&keyCommandsPlaceholderHackForEvernote), method_getTypeEncoding(class_getInstanceMethod(self.class, @selector(keyCommands))));
+#endif
 
     return self;