Skip to content

Commit

Permalink
Fix the managed configurations build
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dethbakin committed Apr 3, 2018
1 parent dd073f9 commit 276d268
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
13 changes: 13 additions & 0 deletions Source/WebKit/ChangeLog
@@ -1,3 +1,16 @@
2018-04-02 Beth Dakin <bdakin@apple.com>

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 <cgarcia@igalia.com>

[Enchant] Clean up TextCheckerEnchant
Expand Down
10 changes: 8 additions & 2 deletions Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
Expand Up @@ -2243,19 +2243,23 @@ - (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;
}

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;
}

Expand Down Expand Up @@ -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<WKContentView> view = self;
_page->getSelectionOrContentsAsString([view](const String& string, WebKit::CallbackBase::Error error) {
Expand Down

0 comments on commit 276d268

Please sign in to comment.