Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (229204 => 229205)
--- trunk/Source/_javascript_Core/ChangeLog 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-03-04 20:03:56 UTC (rev 229205)
@@ -1,3 +1,13 @@
+2018-03-04 Tim Horton <[email protected]>
+
+ Make !ENABLE(DATA_DETECTION) iOS build actually succeed
+ https://bugs.webkit.org/show_bug.cgi?id=183283
+ <rdar://problem/38062148>
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-03-02 Mark Lam <[email protected]>
Make the LLInt probe work for ARM64.
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (229204 => 229205)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2018-03-04 20:03:56 UTC (rev 229205)
@@ -119,7 +119,6 @@
ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
-ENABLE_DATA_DETECTION = ENABLE_DATA_DETECTION;
ENABLE_IOS_TOUCH_EVENTS[sdk=iphone*] = $(ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
Modified: trunk/Source/WebCore/ChangeLog (229204 => 229205)
--- trunk/Source/WebCore/ChangeLog 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Source/WebCore/ChangeLog 2018-03-04 20:03:56 UTC (rev 229205)
@@ -1,3 +1,13 @@
+2018-03-04 Tim Horton <[email protected]>
+
+ Make !ENABLE(DATA_DETECTION) iOS build actually succeed
+ https://bugs.webkit.org/show_bug.cgi?id=183283
+ <rdar://problem/38062148>
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-03-03 Said Abou-Hallawa <[email protected]>
Delete incorrect version of clampTo() function from SVGToOTFFontConversion.cpp
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (229204 => 229205)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2018-03-04 20:03:56 UTC (rev 229205)
@@ -119,7 +119,6 @@
ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
-ENABLE_DATA_DETECTION = ENABLE_DATA_DETECTION;
ENABLE_IOS_TOUCH_EVENTS[sdk=iphone*] = $(ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
Modified: trunk/Source/WebCore/PAL/ChangeLog (229204 => 229205)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-03-04 20:03:56 UTC (rev 229205)
@@ -1,3 +1,13 @@
+2018-03-04 Tim Horton <[email protected]>
+
+ Make !ENABLE(DATA_DETECTION) iOS build actually succeed
+ https://bugs.webkit.org/show_bug.cgi?id=183283
+ <rdar://problem/38062148>
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-03-01 Yusuke Suzuki <[email protected]>
Remove monotonicallyIncreasingTime
Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (229204 => 229205)
--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2018-03-04 20:03:56 UTC (rev 229205)
@@ -119,7 +119,6 @@
ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
-ENABLE_DATA_DETECTION = ENABLE_DATA_DETECTION;
ENABLE_IOS_TOUCH_EVENTS[sdk=iphone*] = $(ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
Modified: trunk/Source/WebKit/ChangeLog (229204 => 229205)
--- trunk/Source/WebKit/ChangeLog 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Source/WebKit/ChangeLog 2018-03-04 20:03:56 UTC (rev 229205)
@@ -1,3 +1,16 @@
+2018-03-04 Tim Horton <[email protected]>
+
+ Make !ENABLE(DATA_DETECTION) iOS build actually succeed
+ https://bugs.webkit.org/show_bug.cgi?id=183283
+ <rdar://problem/38062148>
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
+ (-[WKContentView _dataForPreviewItemController:atPosition:type:]):
+ Guard some more code with ENABLE(DATA_DETECTION).
+
2018-03-04 Dan Bernstein <[email protected]>
Building with _ONLY_ACTIVE_ARCH_=NO and ARCHS=x86_64 fails
Modified: trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig (229204 => 229205)
--- trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2018-03-04 20:03:56 UTC (rev 229205)
@@ -119,7 +119,6 @@
ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
-ENABLE_DATA_DETECTION = ENABLE_DATA_DETECTION;
ENABLE_IOS_TOUCH_EVENTS[sdk=iphone*] = $(ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (229204 => 229205)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-03-04 20:03:56 UTC (rev 229205)
@@ -5554,8 +5554,10 @@
return NO;
if (linkURL.protocolIsInHTTPFamily())
return YES;
+#if ENABLE(DATA_DETECTION)
if (DataDetection::canBePresentedByDataDetectors(linkURL))
return YES;
+#endif
return NO;
}
return YES;
@@ -5574,6 +5576,10 @@
BOOL supportsAttachmentPreview = ([uiDelegate respondsToSelector:@selector(_attachmentListForWebView:)] || respondsToAttachmentListForWebViewSourceIsManaged)
&& [uiDelegate respondsToSelector:@selector(_webView:indexIntoAttachmentListForElement:)];
BOOL canShowAttachmentPreview = (_positionInformation.isAttachment || _positionInformation.isImage) && supportsAttachmentPreview;
+ BOOL isDataDetectorLink = NO;
+#if ENABLE(DATA_DETECTION)
+ isDataDetectorLink = _positionInformation.isDataDetectorLink;
+#endif
if (canShowImagePreview && _positionInformation.isAnimatedImage) {
canShowImagePreview = NO;
@@ -5585,7 +5591,7 @@
return nil;
const URL& linkURL = _positionInformation.url;
- if (!useImageURLForLink && (linkURL.isEmpty() || (!linkURL.protocolIsInHTTPFamily() && !_positionInformation.isDataDetectorLink))) {
+ if (!useImageURLForLink && (linkURL.isEmpty() || (!linkURL.protocolIsInHTTPFamily() && !isDataDetectorLink))) {
if (canShowLinkPreview && !canShowImagePreview)
return nil;
canShowLinkPreview = NO;
@@ -5598,7 +5604,8 @@
dataForPreview[UIPreviewDataLink] = (NSURL *)_positionInformation.imageURL;
else
dataForPreview[UIPreviewDataLink] = (NSURL *)linkURL;
- if (_positionInformation.isDataDetectorLink) {
+#if ENABLE(DATA_DETECTION)
+ if (isDataDetectorLink) {
NSDictionary *context = nil;
if ([uiDelegate respondsToSelector:@selector(_dataDetectionContextForWebView:)])
context = [uiDelegate _dataDetectionContextForWebView:_webView];
@@ -5622,6 +5629,7 @@
if (newContext)
dataForPreview[UIPreviewDataDDContext] = newContext;
}
+#endif // ENABLE(DATA_DETECTION)
} else if (canShowImagePreview) {
*type = UIPreviewItemTypeImage;
dataForPreview[UIPreviewDataLink] = (NSURL *)_positionInformation.imageURL;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (229204 => 229205)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-03-04 20:03:56 UTC (rev 229205)
@@ -1,3 +1,13 @@
+2018-03-04 Tim Horton <[email protected]>
+
+ Make !ENABLE(DATA_DETECTION) iOS build actually succeed
+ https://bugs.webkit.org/show_bug.cgi?id=183283
+ <rdar://problem/38062148>
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2018-02-28 Alex Christensen <[email protected]>
Reduce use of NetworkingContext in WebKit
Modified: trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (229204 => 229205)
--- trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2018-03-04 20:03:56 UTC (rev 229205)
@@ -119,7 +119,6 @@
ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
-ENABLE_DATA_DETECTION = ENABLE_DATA_DETECTION;
ENABLE_IOS_TOUCH_EVENTS[sdk=iphone*] = $(ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
Modified: trunk/Tools/ChangeLog (229204 => 229205)
--- trunk/Tools/ChangeLog 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Tools/ChangeLog 2018-03-04 20:03:56 UTC (rev 229205)
@@ -1,3 +1,13 @@
+2018-03-04 Tim Horton <[email protected]>
+
+ Make !ENABLE(DATA_DETECTION) iOS build actually succeed
+ https://bugs.webkit.org/show_bug.cgi?id=183283
+ <rdar://problem/38062148>
+
+ Reviewed by Sam Weinig.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2018-03-02 Chris Dumez <[email protected]>
Converting a load to a download does not work with async policy delegates
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (229204 => 229205)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2018-03-04 19:37:23 UTC (rev 229204)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2018-03-04 20:03:56 UTC (rev 229205)
@@ -119,7 +119,6 @@
ENABLE_MAC_GESTURE_EVENTS_macosx_WITH_INTERNAL_SDK_YES = ENABLE_MAC_GESTURE_EVENTS;
ENABLE_TEXT_AUTOSIZING = ENABLE_TEXT_AUTOSIZING;
-ENABLE_DATA_DETECTION = ENABLE_DATA_DETECTION;
ENABLE_IOS_TOUCH_EVENTS[sdk=iphone*] = $(ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
ENABLE_IOS_TOUCH_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_TOUCH_EVENTS;
