Changeset 198986 in webkit

Timestamp:

Apr 3, 2016 11:56:30 AM (8 years ago)

Author:

ddkilzer@apple.com

Message:

REGRESSION (r198653, r198864): http/tests/contentdispositionattachmentsandbox/referer-header-stripped*.html tests crashing due to unavailable SPI
<​http://webkit.org/b/156145>

Reviewed by Tim Horton.

Covered by existing tests under GuardMalloc:

http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-always.html
http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-default.html
http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-never.html
http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-when-downgrade.html
http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer.html
http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-origin.html
http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-unsafe-url.html
http/tests/contentdispositionattachmentsandbox/referer-header-stripped.html

• editing/cocoa/DataDetection.mm:

(WebCore::DataDetection::isDataDetectorLink):
(WebCore::DataDetection::shouldCancelDefaultAction):

• Restore iOS 9.x code.

(WebCore::DataDetection::detectContentInRange):

• Guard new SPI with version macros.

• platform/cocoa/DataDetectorsCoreSoftLink.h:
• platform/cocoa/DataDetectorsCoreSoftLink.mm:
• Guard new SPI with version macros.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/cocoa/DataDetection.mm (modified) (4 diffs)
• platform/cocoa/DataDetectorsCoreSoftLink.h (modified) (1 diff)
• platform/cocoa/DataDetectorsCoreSoftLink.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-03  David Kilzer  <ddkilzer@apple.com>
+
+        REGRESSION (r198653, r198864): http/tests/contentdispositionattachmentsandbox/referer-header-stripped*.html tests crashing due to unavailable SPI
+        <http://webkit.org/b/156145>
+
+        Reviewed by Tim Horton.
+
+        Covered by existing tests under GuardMalloc:
+
+            http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-always.html
+            http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-default.html
+            http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-never.html
+            http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer-when-downgrade.html
+            http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-no-referrer.html
+            http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-origin.html
+            http/tests/contentdispositionattachmentsandbox/referer-header-stripped-with-meta-referer-unsafe-url.html
+            http/tests/contentdispositionattachmentsandbox/referer-header-stripped.html
+
+        * editing/cocoa/DataDetection.mm:
+        (WebCore::DataDetection::isDataDetectorLink):
+        (WebCore::DataDetection::shouldCancelDefaultAction):
+        - Restore iOS 9.x code.
+        (WebCore::DataDetection::detectContentInRange):
+        - Guard new SPI with version macros.
+
+        * platform/cocoa/DataDetectorsCoreSoftLink.h:
+        * platform/cocoa/DataDetectorsCoreSoftLink.mm:
+        - Guard new SPI with version macros.
+
 2016-04-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/editing/cocoa/DataDetection.mm

@@ -157 +157 @@
     if (!is<HTMLAnchorElement>(element))
         return false;
-    
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     return [softLink_DataDetectorsCore_DDURLTapAndHoldSchemes() containsObject:(NSString *)downcast<HTMLAnchorElement>(element).href().protocol().convertToASCIILowercase()];
+#else
+    if (equalIgnoringASCIICase(element.fastGetAttribute(x_apple_data_detectorsAttr), "true"))
+        return true;
+    URL url = downcast<HTMLAnchorElement>(element).href();
+    return url.protocolIs("mailto") || url.protocolIs("tel");
+#endif
 }
 
@@ -173 +180 @@
 bool DataDetection::shouldCancelDefaultAction(Element& element)
 {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
     if (!isDataDetectorLink(element))
         return false;
@@ -194 +202 @@
     }
     return softLink_DataDetectorsCore_DDShouldImmediatelyShowActionSheetForResult(result);
+#else
+    if (!is<HTMLAnchorElement>(element))
+        return false;
+    if (!equalIgnoringASCIICase(element.fastGetAttribute(x_apple_data_detectorsAttr), "true"))
+        return false;
+    String type = element.getAttribute(x_apple_data_detectors_typeAttr).convertToASCIILowercase();
+    if (type == "misc" || type == "calendar-event" || type == "telephone")
+        return true;
+    return false;
+#endif
 }
 
@@ -581 +599 @@
         
         lastModifiedQueryOffset = queryRange.end;
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
         BOOL shouldUseLightLinks = softLink_DataDetectorsCore_DDShouldUseLightLinksForResult(coreResult, [indexPaths[resultIndex] length] > 1);
+#else
+        BOOL shouldUseLightLinks = NO;
+#endif
 
         for (auto& range : resultRanges) {

trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h

@@ -49 +49 @@
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result))
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDURLStringForResult, NSString *, (DDResultRef currentResult, NSString * resultIdentifier, DDURLifierPhoneNumberDetectionTypes includingTelGroups, NSDate * referenceDate, NSTimeZone * referenceTimeZone), (currentResult, resultIdentifier, includingTelGroups, referenceDate, referenceTimeZone))
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ())
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
 SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
+#endif
 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
 SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)

trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm

@@ -48 +48 @@
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLStringForResult, NSString *, (DDResultRef currentResult, NSString * resultIdentifier, DDURLifierPhoneNumberDetectionTypes includingTelGroups, NSDate * referenceDate, NSTimeZone * referenceTimeZone), (currentResult, resultIdentifier, includingTelGroups, referenceDate, referenceTimeZone))
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ())
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
 SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
+#endif
 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
 SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)