Title: [230209] tags/Safari-606.1.11.3/Source/WebKit
- Revision
- 230209
- Author
- jmarc...@apple.com
- Date
- 2018-04-03 10:38:59 -0700 (Tue, 03 Apr 2018)
Log Message
Cherry-pick r230204. rdar://problem/39078586
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:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: tags/Safari-606.1.11.3/Source/WebKit/ChangeLog (230208 => 230209)
--- tags/Safari-606.1.11.3/Source/WebKit/ChangeLog 2018-04-03 17:15:17 UTC (rev 230208)
+++ tags/Safari-606.1.11.3/Source/WebKit/ChangeLog 2018-04-03 17:38:59 UTC (rev 230209)
@@ -1,3 +1,35 @@
+2018-04-03 Jason Marcell <jmarc...@apple.com>
+
+ Cherry-pick r230204. rdar://problem/39078586
+
+ 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:]):
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230204 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-04-02 Beth Dakin <bda...@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 Jason Marcell <jmarc...@apple.com>
Cherry-pick r230160. rdar://problem/39094484
Modified: tags/Safari-606.1.11.3/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (230208 => 230209)
--- tags/Safari-606.1.11.3/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-04-03 17:15:17 UTC (rev 230208)
+++ tags/Safari-606.1.11.3/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-04-03 17:38:59 UTC (rev 230209)
@@ -2244,8 +2244,10 @@
if (!textLength || textLength > 200)
return NO;
+#if !ENABLE(MINIMAL_SIMULATOR)
if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo)
return NO;
+#endif
return YES;
}
@@ -2253,10 +2255,12 @@
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;
}
@@ -2414,8 +2418,10 @@
- (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) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
