<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198986] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198986">198986</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-04-03 11:56:30 -0700 (Sun, 03 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/198653">r198653</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/198864">r198864</a>): 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaDataDetectionmm">trunk/Source/WebCore/editing/cocoa/DataDetection.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaDataDetectorsCoreSoftLinkh">trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaDataDetectorsCoreSoftLinkmm">trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198985 => 198986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-03 16:50:59 UTC (rev 198985)
+++ trunk/Source/WebCore/ChangeLog 2016-04-03 18:56:30 UTC (rev 198986)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-04-03 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Replace all RenderTheme::popupInternalPadding methods with a single one returning a LengthBox
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaDataDetectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (198985 => 198986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-04-03 16:50:59 UTC (rev 198985)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-04-03 18:56:30 UTC (rev 198986)
</span><span class="lines">@@ -156,8 +156,15 @@
</span><span class="cx"> {
</span><span class="cx"> if (!is<HTMLAnchorElement>(element))
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</ins><span class="cx"> return [softLink_DataDetectorsCore_DDURLTapAndHoldSchemes() containsObject:(NSString *)downcast<HTMLAnchorElement>(element).href().protocol().convertToASCIILowercase()];
</span><ins>+#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
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DataDetection::requiresExtendedContext(Element& element)
</span><span class="lines">@@ -172,6 +179,7 @@
</span><span class="cx">
</span><span class="cx"> bool DataDetection::shouldCancelDefaultAction(Element& element)
</span><span class="cx"> {
</span><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</ins><span class="cx"> if (!isDataDetectorLink(element))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -193,6 +201,16 @@
</span><span class="cx"> result = (DDResultRef)[results objectAtIndex:resultIndices[i].toInt()];
</span><span class="cx"> }
</span><span class="cx"> return softLink_DataDetectorsCore_DDShouldImmediatelyShowActionSheetForResult(result);
</span><ins>+#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
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static BOOL resultIsURL(DDResultRef result)
</span><span class="lines">@@ -580,7 +598,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> lastModifiedQueryOffset = queryRange.end;
</span><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</ins><span class="cx"> BOOL shouldUseLightLinks = softLink_DataDetectorsCore_DDShouldUseLightLinksForResult(coreResult, [indexPaths[resultIndex] length] > 1);
</span><ins>+#else
+ BOOL shouldUseLightLinks = NO;
+#endif
</ins><span class="cx">
</span><span class="cx"> for (auto& range : resultRanges) {
</span><span class="cx"> Node* parentNode = range->startContainer().parentNode();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaDataDetectorsCoreSoftLinkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h (198985 => 198986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2016-04-03 16:50:59 UTC (rev 198985)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2016-04-03 18:56:30 UTC (rev 198986)
</span><span class="lines">@@ -48,10 +48,12 @@
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetSubResults, CFArrayRef, (DDResultRef result), (result))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDURLStringForResult, NSString *, (DDResultRef currentResult, NSString * resultIdentifier, DDURLifierPhoneNumberDetectionTypes includingTelGroups, NSDate * referenceDate, NSTimeZone * referenceTimeZone), (currentResult, resultIdentifier, includingTelGroups, referenceDate, referenceTimeZone))
</span><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</ins><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ())
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
</span><ins>+#endif
</ins><span class="cx"> SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
</span><span class="cx"> SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)
</span><span class="cx"> SOFT_LINK_POINTER_FOR_HEADER(WebCore, DataDetectorsCore, DDBinderMailURLKey, CFStringRef)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaDataDetectorsCoreSoftLinkmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm (198985 => 198986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2016-04-03 16:50:59 UTC (rev 198985)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2016-04-03 18:56:30 UTC (rev 198986)
</span><span class="lines">@@ -47,10 +47,12 @@
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetSubResults, CFArrayRef, (DDResultRef result), (result))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDResultGetQueryRangeForURLification, DDQueryRange, (DDResultRef result), (result))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLStringForResult, NSString *, (DDResultRef currentResult, NSString * resultIdentifier, DDURLifierPhoneNumberDetectionTypes includingTelGroups, NSDate * referenceDate, NSTimeZone * referenceTimeZone), (currentResult, resultIdentifier, includingTelGroups, referenceDate, referenceTimeZone))
</span><ins>+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</ins><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDURLTapAndHoldSchemes, NSArray *, (), ())
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForURL, BOOL, (NSURL *url), (url))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldImmediatelyShowActionSheetForResult, BOOL, (DDResultRef result), (result))
</span><span class="cx"> SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, DataDetectorsCore, DDShouldUseLightLinksForResult, BOOL, (DDResultRef result, BOOL extractedFromSignature), (result, extractedFromSignature))
</span><ins>+#endif
</ins><span class="cx"> SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderHttpURLKey, CFStringRef)
</span><span class="cx"> SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderWebURLKey, CFStringRef)
</span><span class="cx"> SOFT_LINK_POINTER_FOR_SOURCE(WebCore, DataDetectorsCore, DDBinderMailURLKey, CFStringRef)
</span></span></pre>
</div>
</div>
</body>
</html>