<!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>[198653] trunk/Source</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/198653">198653</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2016-03-24 16:56:27 -0700 (Thu, 24 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adopt new SPI from DataDetectorsCore to decide link behavior.
https://bugs.webkit.org/show_bug.cgi?id=155780
rdar://problem/25303631
Reviewed by Sam Weinig.
Source/WebCore:
isDataDetectorLink and shouldCancelDefaultAction now
use the SPI provided by DataDetectorsCore to decide
what is the link behavior when the user taps on it.
* editing/cocoa/DataDetection.h:
* editing/cocoa/DataDetection.mm:
(WebCore::detectItemAtPositionWithRange):
(WebCore::DataDetection::isDataDetectorLink):
(WebCore::DataDetection::requiresExtendedContext):
(WebCore::DataDetection::dataDetectorIdentifier):
(WebCore::DataDetection::shouldCancelDefaultAction):
* platform/cocoa/DataDetectorsCoreSoftLink.h:
* platform/cocoa/DataDetectorsCoreSoftLink.mm:
* platform/spi/cocoa/DataDetectorsCoreSPI.h:
Source/WebKit2:
Changed use of data detection functions to take
a reference to Element instead of a pointer.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::handleTap):
(WebKit::WebPage::commitPotentialTap):
(WebKit::WebPage::getPositionInformation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaDataDetectionh">trunk/Source/WebCore/editing/cocoa/DataDetection.h</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>
<li><a href="#trunkSourceWebCoreplatformspicocoaDataDetectorsCoreSPIh">trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198652 => 198653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-24 23:18:49 UTC (rev 198652)
+++ trunk/Source/WebCore/ChangeLog 2016-03-24 23:56:27 UTC (rev 198653)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2016-03-24 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><ins>+ Adopt new SPI from DataDetectorsCore to decide link behavior.
+ https://bugs.webkit.org/show_bug.cgi?id=155780
+ rdar://problem/25303631
+
+ Reviewed by Sam Weinig.
+
+ isDataDetectorLink and shouldCancelDefaultAction now
+ use the SPI provided by DataDetectorsCore to decide
+ what is the link behavior when the user taps on it.
+
+ * editing/cocoa/DataDetection.h:
+ * editing/cocoa/DataDetection.mm:
+ (WebCore::detectItemAtPositionWithRange):
+ (WebCore::DataDetection::isDataDetectorLink):
+ (WebCore::DataDetection::requiresExtendedContext):
+ (WebCore::DataDetection::dataDetectorIdentifier):
+ (WebCore::DataDetection::shouldCancelDefaultAction):
+ * platform/cocoa/DataDetectorsCoreSoftLink.h:
+ * platform/cocoa/DataDetectorsCoreSoftLink.mm:
+ * platform/spi/cocoa/DataDetectorsCoreSPI.h:
+
+2016-03-24 Enrica Casucci <enrica@apple.com>
+
</ins><span class="cx"> DataDetection creates links that are longer than the actual result.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155850
</span><span class="cx"> rdar://problem/25280740
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaDataDetectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.h (198652 => 198653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/DataDetection.h 2016-03-24 23:18:49 UTC (rev 198652)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.h 2016-03-24 23:56:27 UTC (rev 198653)
</span><span class="lines">@@ -58,10 +58,12 @@
</span><span class="cx"> WEBCORE_EXPORT static RetainPtr<DDActionContext> detectItemAroundHitTestResult(const HitTestResult&, FloatRect& detectedDataBoundingBox, RefPtr<Range>& detectedDataRange);
</span><span class="cx"> #endif
</span><span class="cx"> WEBCORE_EXPORT static NSArray *detectContentInRange(RefPtr<Range>& contextRange, DataDetectorTypes);
</span><del>- WEBCORE_EXPORT static bool isDataDetectorLink(Element*);
- WEBCORE_EXPORT static String dataDetectorIdentifier(Element*);
- WEBCORE_EXPORT static bool shouldCancelDefaultAction(Element*);
- WEBCORE_EXPORT static bool requiresExtendedContext(Element*);
</del><ins>+#if PLATFORM(IOS)
+ WEBCORE_EXPORT static bool isDataDetectorLink(Element&);
+ WEBCORE_EXPORT static String dataDetectorIdentifier(Element&);
+ WEBCORE_EXPORT static bool shouldCancelDefaultAction(Element&);
+ WEBCORE_EXPORT static bool requiresExtendedContext(Element&);
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaDataDetectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (198652 => 198653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-03-24 23:18:49 UTC (rev 198652)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-03-24 23:56:27 UTC (rev 198653)
</span><span class="lines">@@ -55,48 +55,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool DataDetection::isDataDetectorLink(Element* element)
-{
- // FIXME: We should be able to ask this from DataDetectorsCore when rdar://problem/25206062 is fixed.
- if (!is<HTMLAnchorElement>(*element))
- return false;
-
- if (element->getAttribute(dataDetectorsURLScheme) == "true")
- return true;
- URL url = downcast<HTMLAnchorElement>(*element).href();
- return url.protocolIs("mailto") || url.protocolIs("tel");
-}
-
-bool DataDetection::requiresExtendedContext(Element* element)
-{
- return element->getAttribute(dataDetectorsAttributeTypeKey) == "calendar-event";
-}
-
-String DataDetection::dataDetectorIdentifier(Element* element)
-{
- return element->getAttribute(dataDetectorsAttributeResultKey);
-}
-
-bool DataDetection::shouldCancelDefaultAction(Element* element)
-{
</del><span class="cx"> #if PLATFORM(MAC)
</span><del>- UNUSED_PARAM(element);
- return false;
-#else
- // FIXME: We should be able to retrieve this information from DataDetectorsCore when rdar://problem/25169133 is fixed.
- if (!is<HTMLAnchorElement>(*element))
- return false;
- if (element->getAttribute(dataDetectorsURLScheme) != "true")
- return false;
- String type = element->getAttribute(dataDetectorsAttributeTypeKey);
- if (type == "misc" || type == "calendar-event" || type == "telephone")
- return true;
- return false;
-#endif
-}
</del><span class="cx">
</span><del>-#if PLATFORM(MAC)
-
</del><span class="cx"> static RetainPtr<DDActionContext> detectItemAtPositionWithRange(VisiblePosition position, RefPtr<Range> contextRange, FloatRect& detectedDataBoundingBox, RefPtr<Range>& detectedDataRange)
</span><span class="cx"> {
</span><span class="cx"> String fullPlainTextString = plainText(contextRange.get());
</span><span class="lines">@@ -189,7 +149,49 @@
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+bool DataDetection::isDataDetectorLink(Element& element)
+{
+ if (!is<HTMLAnchorElement>(element))
+ return false;
</ins><span class="cx">
</span><ins>+ return [softLink_DataDetectorsCore_DDURLTapAndHoldSchemes() containsObject:(NSString *)downcast<HTMLAnchorElement>(element).href().protocol().convertToASCIILowercase()];
+}
+
+bool DataDetection::requiresExtendedContext(Element& element)
+{
+ return equalIgnoringASCIICase(element.fastGetAttribute(QualifiedName(nullAtom, dataDetectorsAttributeTypeKey, nullAtom)), "calendar-event");
+}
+
+String DataDetection::dataDetectorIdentifier(Element& element)
+{
+ return element.fastGetAttribute(QualifiedName(nullAtom, dataDetectorsAttributeResultKey, nullAtom));
+}
+
+bool DataDetection::shouldCancelDefaultAction(Element& element)
+{
+ if (!isDataDetectorLink(element))
+ return false;
+
+ if (softLink_DataDetectorsCore_DDShouldImmediatelyShowActionSheetForURL(downcast<HTMLAnchorElement>(element).href()))
+ return true;
+
+ const AtomicString& resultAttribute = element.fastGetAttribute(QualifiedName(nullAtom, dataDetectorsAttributeResultKey, nullAtom));
+ if (resultAttribute.isEmpty())
+ return false;
+ NSArray *results = element.document().frame()->dataDetectionResults();
+ if (!results)
+ return false;
+ Vector<String> resultIndices;
+ resultAttribute.string().split('/', resultIndices);
+ DDResultRef result = [[results objectAtIndex:resultIndices[0].toInt()] coreResult];
+ // Handle the case of a signature block, where we need to check the correct subresult.
+ for (size_t i = 1; i < resultIndices.size(); i++) {
+ results = (NSArray *)softLink_DataDetectorsCore_DDResultGetSubResults(result);
+ result = (DDResultRef)[results objectAtIndex:resultIndices[i].toInt()];
+ }
+ return softLink_DataDetectorsCore_DDShouldImmediatelyShowActionSheetForResult(result);
+}
+
</ins><span class="cx"> static BOOL resultIsURL(DDResultRef result)
</span><span class="cx"> {
</span><span class="cx"> if (!result)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaDataDetectorsCoreSoftLinkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h (198652 => 198653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2016-03-24 23:18:49 UTC (rev 198652)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.h 2016-03-24 23:56:27 UTC (rev 198653)
</span><span class="lines">@@ -48,6 +48,9 @@
</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>+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))
</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 (198652 => 198653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2016-03-24 23:18:49 UTC (rev 198652)
+++ trunk/Source/WebCore/platform/cocoa/DataDetectorsCoreSoftLink.mm 2016-03-24 23:56:27 UTC (rev 198653)
</span><span class="lines">@@ -47,6 +47,9 @@
</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>+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))
</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>
<a id="trunkSourceWebCoreplatformspicocoaDataDetectorsCoreSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h (198652 => 198653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2016-03-24 23:18:49 UTC (rev 198652)
+++ trunk/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2016-03-24 23:56:27 UTC (rev 198653)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef DataDetectorsCoreSPI_h
</span><span class="cx"> #define DataDetectorsCoreSPI_h
</span><span class="cx">
</span><ins>+typedef struct __DDResult *DDResultRef;
+
</ins><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><span class="cx"> #import <DataDetectorsCore/DDBinderKeys_Private.h>
</span><span class="lines">@@ -97,6 +99,7 @@
</span><span class="cx">
</span><span class="cx"> @interface DDScannerResult : NSObject <NSCoding, NSSecureCoding>
</span><span class="cx"> + (NSArray *)resultsFromCoreResults:(CFArrayRef)coreResults;
</span><ins>+- (DDResultRef)coreResult;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #define DDResultPropertyPassiveDisplay (1 << 0)
</span><span class="lines">@@ -113,7 +116,6 @@
</span><span class="cx">
</span><span class="cx"> #endif // !USE(APPLE_INTERNAL_SDK)
</span><span class="cx">
</span><del>-typedef struct __DDResult *DDResultRef;
</del><span class="cx"> typedef struct __DDScanQuery *DDScanQueryRef;
</span><span class="cx"> typedef struct __DDScanner *DDScannerRef;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198652 => 198653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-24 23:18:49 UTC (rev 198652)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-24 23:56:27 UTC (rev 198653)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-24 Enrica Casucci <enrica@apple.com>
+
+ Adopt new SPI from DataDetectorsCore to decide link behavior.
+ https://bugs.webkit.org/show_bug.cgi?id=155780
+ rdar://problem/25303631
+
+ Reviewed by Sam Weinig.
+
+ Changed use of data detection functions to take
+ a reference to Element instead of a pointer.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::handleTap):
+ (WebKit::WebPage::commitPotentialTap):
+ (WebKit::WebPage::getPositionInformation):
+
</ins><span class="cx"> 2016-03-24 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Disable network cache speculative validation by default
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (198652 => 198653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-03-24 23:18:49 UTC (rev 198652)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-03-24 23:56:27 UTC (rev 198653)
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx">
</span><span class="cx"> if (!frameRespondingToClick || lastLayerTreeTransactionId < WebFrame::fromCoreFrame(*frameRespondingToClick)->firstLayerTreeTransactionIDAfterDidCommitLoad())
</span><span class="cx"> send(Messages::WebPageProxy::DidNotHandleTapAsClick(adjustedIntPoint));
</span><del>- else if (is<Element>(*nodeRespondingToClick) && DataDetection::shouldCancelDefaultAction(&downcast<Element>(*nodeRespondingToClick))) {
</del><ins>+ else if (is<Element>(*nodeRespondingToClick) && DataDetection::shouldCancelDefaultAction(downcast<Element>(*nodeRespondingToClick))) {
</ins><span class="cx"> requestPositionInformation(adjustedIntPoint);
</span><span class="cx"> send(Messages::WebPageProxy::DidNotHandleTapAsClick(adjustedIntPoint));
</span><span class="cx"> } else
</span><span class="lines">@@ -683,7 +683,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_potentialTapNode == nodeRespondingToClick) {
</span><del>- if (is<Element>(*nodeRespondingToClick) && DataDetection::shouldCancelDefaultAction(&downcast<Element>(*nodeRespondingToClick))) {
</del><ins>+ if (is<Element>(*nodeRespondingToClick) && DataDetection::shouldCancelDefaultAction(downcast<Element>(*nodeRespondingToClick))) {
</ins><span class="cx"> requestPositionInformation(roundedIntPoint(m_potentialTapLocation));
</span><span class="cx"> commitPotentialTapFailed();
</span><span class="cx"> } else
</span><span class="lines">@@ -2223,12 +2223,12 @@
</span><span class="cx"> info.linkIndicator = textIndicator->data();
</span><span class="cx"> }
</span><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><del>- info.isDataDetectorLink = DataDetection::isDataDetectorLink(element);
</del><ins>+ info.isDataDetectorLink = DataDetection::isDataDetectorLink(*element);
</ins><span class="cx"> if (info.isDataDetectorLink) {
</span><span class="cx"> const int dataDetectionExtendedContextLength = 350;
</span><del>- info.dataDetectorIdentifier = DataDetection::dataDetectorIdentifier(element);
</del><ins>+ info.dataDetectorIdentifier = DataDetection::dataDetectorIdentifier(*element);
</ins><span class="cx"> info.dataDetectorResults = element->document().frame()->dataDetectionResults();
</span><del>- if (DataDetection::requiresExtendedContext(element)) {
</del><ins>+ if (DataDetection::requiresExtendedContext(*element)) {
</ins><span class="cx"> RefPtr<Range> linkRange = Range::create(element->document());
</span><span class="cx"> linkRange->selectNodeContents(element, ASSERT_NO_EXCEPTION);
</span><span class="cx"> info.textBefore = plainTextReplacingNoBreakSpace(rangeExpandedByCharactersInDirectionAtWordBoundary(linkRange->startPosition(), dataDetectionExtendedContextLength, DirectionBackward).get(), TextIteratorDefaultBehavior, true);
</span></span></pre>
</div>
</div>
</body>
</html>