Title: [177645] branches/safari-600.1.4.13-branch/Source/WebKit2
- Revision
- 177645
- Author
- [email protected]
- Date
- 2014-12-22 12:10:13 -0800 (Mon, 22 Dec 2014)
Log Message
Merged r177463. rdar://problem/19327421
Modified Paths
Diff
Modified: branches/safari-600.1.4.13-branch/Source/WebKit2/ChangeLog (177644 => 177645)
--- branches/safari-600.1.4.13-branch/Source/WebKit2/ChangeLog 2014-12-22 20:08:41 UTC (rev 177644)
+++ branches/safari-600.1.4.13-branch/Source/WebKit2/ChangeLog 2014-12-22 20:10:13 UTC (rev 177645)
@@ -1,5 +1,21 @@
2014-12-22 Babak Shafiei <[email protected]>
+ Merge r177463.
+
+ 2014-12-17 Enrica Casucci <[email protected]>
+
+ [iOS] Define button and action should respect profile settings.
+ https://bugs.webkit.org/show_bug.cgi?id=139739
+ rdar://problem/15461887
+
+ Reviewed by Joseph Pecoraro.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView canPerformAction:withSender:]):
+ (-[WKContentView _define:]):
+
+2014-12-22 Babak Shafiei <[email protected]>
+
Merge r173973.
2014-09-25 Tim Horton <[email protected]>
Modified: branches/safari-600.1.4.13-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (177644 => 177645)
--- branches/safari-600.1.4.13-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-12-22 20:08:41 UTC (rev 177644)
+++ branches/safari-600.1.4.13-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-12-22 20:10:13 UTC (rev 177645)
@@ -47,6 +47,8 @@
#import "_WKFormInputSession.h"
#import <CoreText/CTFontDescriptor.h>
#import <DataDetectorsUI/DDDetectionController.h>
+#import <ManagedConfiguration/MCFeatures.h>
+#import <ManagedConfiguration/MCProfileConnection.h>
#import <TextInput/TI_NSStringExtras.h>
#import <UIKit/UIApplication_Private.h>
#import <UIKit/UIFont_Private.h>
@@ -68,7 +70,12 @@
SOFT_LINK_PRIVATE_FRAMEWORK(DataDetectorsUI)
SOFT_LINK_CLASS(DataDetectorsUI, DDDetectionController)
+SOFT_LINK_PRIVATE_FRAMEWORK(ManagedConfiguration);
+SOFT_LINK_CLASS(ManagedConfiguration, MCProfileConnection);
+SOFT_LINK_CONSTANT(ManagedConfiguration, MCFeatureDefinitionLookupAllowed, NSString *)
+#define MCFeatureDefinitionLookupAllowed getMCFeatureDefinitionLookupAllowed()
+
using namespace WebCore;
using namespace WebKit;
@@ -1296,6 +1303,9 @@
if (!textLength || textLength > 200)
return NO;
+ if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo)
+ return NO;
+
return YES;
}
@@ -1441,6 +1451,9 @@
- (void)_define:(id)sender
{
+ if ([[getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:MCFeatureDefinitionLookupAllowed] == MCRestrictedBoolExplicitNo)
+ return;
+
_page->getSelectionOrContentsAsString([self](const String& string, CallbackBase::Error error) {
if (error != CallbackBase::Error::None)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
