From 276d268399f4741e8d78b97c3a6b4c366ae5bec7 Mon Sep 17 00:00:00 2001 From: Beth Dakin Date: Tue, 3 Apr 2018 15:51:50 +0000 Subject: [PATCH] Fix the managed configurations build https://bugs.webkit.org/show_bug.cgi?id=184253 -and corresponding- rdar://problem/39078586 Reviewed by Dan Bernstein. * UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView canPerformActionForWebView:withSender:]): (-[WKContentView _defineForWebView:]): Canonical link: https://commits.webkit.org/199814@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230204 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/ChangeLog | 13 +++++++++++++ .../UIProcess/ios/WKContentViewInteraction.mm | 10 ++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog index 4d1e378fed49..11293e1c6406 100644 --- a/Source/WebKit/ChangeLog +++ b/Source/WebKit/ChangeLog @@ -1,3 +1,16 @@ +2018-04-02 Beth Dakin + + Fix the managed configurations build + https://bugs.webkit.org/show_bug.cgi?id=184253 + -and corresponding- + rdar://problem/39078586 + + Reviewed by Dan Bernstein. + + * UIProcess/ios/WKContentViewInteraction.mm: + (-[WKContentView canPerformActionForWebView:withSender:]): + (-[WKContentView _defineForWebView:]): + 2018-04-02 Carlos Garcia Campos [Enchant] Clean up TextCheckerEnchant diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm index 87c44277e3ad..b99764ffb407 100644 --- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm +++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm @@ -2243,8 +2243,10 @@ - (BOOL)canPerformActionForWebView:(SEL)action withSender:(id)sender if (!textLength || textLength > 200) return NO; +#if !ENABLE(MINIMAL_SIMULATOR) if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo) return NO; +#endif return YES; } @@ -2252,10 +2254,12 @@ - (BOOL)canPerformActionForWebView:(SEL)action withSender:(id)sender if (action == @selector(_lookup:)) { if (_page->editorState().isInPasswordField) return NO; - + +#if !ENABLE(MINIMAL_SIMULATOR) if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo) return NO; - +#endif + return YES; } @@ -2413,8 +2417,10 @@ - (void)_showDictionary:(NSString *)text - (void)_defineForWebView:(id)sender { +#if !ENABLE(MINIMAL_SIMULATOR) if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo) return; +#endif RetainPtr view = self; _page->getSelectionOrContentsAsString([view](const String& string, WebKit::CallbackBase::Error error) {