<!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>[197902] 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/197902">197902</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-03-09 16:56:31 -0800 (Wed, 09 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/197149">r197149</a>): Missing availability checks when soft-linking DataDetectors.framework
<http://webkit.org/b/155258>
Reviewed by Andy Estes.
Source/WebCore:
* page/mac/ServicesOverlayController.mm:
(WebCore::ServicesOverlayController::Highlight::setDDHighlight):
(WebCore::ServicesOverlayController::Highlight::paintContents):
(WebCore::ServicesOverlayController::mouseIsOverHighlight):
- Add check that returns early if DataDetectors.framework is not
available.
* platform/spi/mac/DataDetectorsSPI.h:
- Mark Objective-C classses as optional.
Source/WebKit/mac:
* WebView/WebImmediateActionController.mm:
(-[WebImmediateActionController _clearImmediateActionState]):
(-[WebImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
(-[WebImmediateActionController _animationControllerForDataDetectedText]):
(-[WebImmediateActionController _animationControllerForDataDetectedLink]):
- Add check that returns early if DataDetectors.framework is not
available.
Source/WebKit2:
* Platform/mac/MenuUtilities.mm:
(WebKit::menuItemForTelephoneNumber):
(WebKit::menuForTelephoneNumber):
- Add check that returns early if DataDetectors.framework is not
available.
* Shared/mac/WebHitTestResultData.mm:
(WebKit::WebHitTestResultData::platformDecode):
- Add Debug assertion. The soft-linked code should never be
called if there was no actionContext passed in.
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::dismissContentRelativeChildWindowsFromViewOnly):
- Protect calls to DDActionsManager with availability check.
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController _clearImmediateActionState]):
(-[WKImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
- Protect calls to DDActionsManager with availability check.
(-[WKImmediateActionController _animationControllerForDataDetectedText]):
(-[WKImmediateActionController _animationControllerForDataDetectedLink]):
- Add check that returns early if DataDetectors.framework is not
available.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagemacServicesOverlayControllermm">trunk/Source/WebCore/page/mac/ServicesOverlayController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacDataDetectorsSPIh">trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebImmediateActionControllermm">trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacMenuUtilitiesmm">trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacWebHitTestResultDatamm">trunk/Source/WebKit2/Shared/mac/WebHitTestResultData.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebViewImplmm">trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm">trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197901 => 197902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-10 00:45:35 UTC (rev 197901)
+++ trunk/Source/WebCore/ChangeLog 2016-03-10 00:56:31 UTC (rev 197902)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-03-09 David Kilzer <ddkilzer@apple.com>
+
+ REGRESSION (r197149): Missing availability checks when soft-linking DataDetectors.framework
+ <http://webkit.org/b/155258>
+
+ Reviewed by Andy Estes.
+
+ * page/mac/ServicesOverlayController.mm:
+ (WebCore::ServicesOverlayController::Highlight::setDDHighlight):
+ (WebCore::ServicesOverlayController::Highlight::paintContents):
+ (WebCore::ServicesOverlayController::mouseIsOverHighlight):
+ - Add check that returns early if DataDetectors.framework is not
+ available.
+
+ * platform/spi/mac/DataDetectorsSPI.h:
+ - Mark Objective-C classses as optional.
+
</ins><span class="cx"> 2016-03-09 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Add heuristic for "main content" videos which override user gesture requirements
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacServicesOverlayControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/ServicesOverlayController.mm (197901 => 197902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2016-03-10 00:45:35 UTC (rev 197901)
+++ trunk/Source/WebCore/page/mac/ServicesOverlayController.mm 2016-03-10 00:56:31 UTC (rev 197902)
</span><span class="lines">@@ -94,6 +94,9 @@
</span><span class="cx">
</span><span class="cx"> void ServicesOverlayController::Highlight::setDDHighlight(DDHighlightRef highlight)
</span><span class="cx"> {
</span><ins>+ if (!DataDetectorsLibrary())
+ return;
+
</ins><span class="cx"> if (!m_controller)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -129,6 +132,9 @@
</span><span class="cx">
</span><span class="cx"> void ServicesOverlayController::Highlight::paintContents(const GraphicsLayer*, GraphicsContext& graphicsContext, GraphicsLayerPaintingPhase, const FloatRect&)
</span><span class="cx"> {
</span><ins>+ if (!DataDetectorsLibrary())
+ return;
+
</ins><span class="cx"> CGContextRef cgContext = graphicsContext.platformContext();
</span><span class="cx">
</span><span class="cx"> CGLayerRef highlightLayer = DDHighlightGetLayerWithContext(ddHighlight(), cgContext);
</span><span class="lines">@@ -425,6 +431,9 @@
</span><span class="cx">
</span><span class="cx"> bool ServicesOverlayController::mouseIsOverHighlight(Highlight& highlight, bool& mouseIsOverButton) const
</span><span class="cx"> {
</span><ins>+ if (!DataDetectorsLibrary())
+ return false;
+
</ins><span class="cx"> Boolean onButton;
</span><span class="cx"> bool hovered = DDHighlightPointIsOnHighlight(highlight.ddHighlight(), (CGPoint)m_mousePosition, &onButton);
</span><span class="cx"> mouseIsOverButton = onButton;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacDataDetectorsSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h (197901 => 197902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2016-03-10 00:45:35 UTC (rev 197901)
+++ trunk/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2016-03-10 00:56:31 UTC (rev 197902)
</span><span class="lines">@@ -99,9 +99,9 @@
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(DataDetectors)
</span><span class="cx">
</span><del>-SOFT_LINK_CLASS(DataDetectors, DDAction)
-SOFT_LINK_CLASS(DataDetectors, DDActionContext)
-SOFT_LINK_CLASS(DataDetectors, DDActionsManager)
</del><ins>+SOFT_LINK_CLASS_OPTIONAL(DataDetectors, DDAction)
+SOFT_LINK_CLASS_OPTIONAL(DataDetectors, DDActionContext)
+SOFT_LINK_CLASS_OPTIONAL(DataDetectors, DDActionsManager)
</ins><span class="cx">
</span><span class="cx"> SOFT_LINK_CONSTANT(DataDetectors, DDBinderPhoneNumberKey, CFStringRef)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (197901 => 197902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-03-10 00:45:35 UTC (rev 197901)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-10 00:56:31 UTC (rev 197902)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-09 David Kilzer <ddkilzer@apple.com>
+
+ REGRESSION (r197149): Missing availability checks when soft-linking DataDetectors.framework
+ <http://webkit.org/b/155258>
+
+ Reviewed by Andy Estes.
+
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController _clearImmediateActionState]):
+ (-[WebImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
+ (-[WebImmediateActionController _animationControllerForDataDetectedText]):
+ (-[WebImmediateActionController _animationControllerForDataDetectedLink]):
+ - Add check that returns early if DataDetectors.framework is not
+ available.
+
</ins><span class="cx"> 2016-03-08 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Start moving to separated writable and executable mappings in the JIT
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm (197901 => 197902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2016-03-10 00:45:35 UTC (rev 197901)
+++ trunk/Source/WebKit/mac/WebView/WebImmediateActionController.mm 2016-03-10 00:56:31 UTC (rev 197902)
</span><span class="lines">@@ -124,6 +124,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)_clearImmediateActionState
</span><span class="cx"> {
</span><ins>+ if (!DataDetectorsLibrary())
+ return;
+
</ins><span class="cx"> DDActionsManager *actionsManager = [getDDActionsManagerClass() sharedManager];
</span><span class="cx"> if ([actionsManager respondsToSelector:@selector(requestBubbleClosureUnanchorOnFailure:)])
</span><span class="cx"> [actionsManager requestBubbleClosureUnanchorOnFailure:YES];
</span><span class="lines">@@ -183,6 +186,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)immediateActionRecognizerWillBeginAnimation:(NSImmediateActionGestureRecognizer *)immediateActionRecognizer
</span><span class="cx"> {
</span><ins>+ if (!DataDetectorsLibrary())
+ return;
+
</ins><span class="cx"> if (immediateActionRecognizer != _immediateActionRecognizer)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -409,6 +415,9 @@
</span><span class="cx">
</span><span class="cx"> - (id <NSImmediateActionAnimationController>)_animationControllerForDataDetectedText
</span><span class="cx"> {
</span><ins>+ if (!DataDetectorsLibrary())
+ return nil;
+
</ins><span class="cx"> RefPtr<Range> detectedDataRange;
</span><span class="cx"> FloatRect detectedDataBoundingBox;
</span><span class="cx"> RetainPtr<DDActionContext> actionContext;
</span><span class="lines">@@ -458,6 +467,9 @@
</span><span class="cx">
</span><span class="cx"> - (id <NSImmediateActionAnimationController>)_animationControllerForDataDetectedLink
</span><span class="cx"> {
</span><ins>+ if (!DataDetectorsLibrary())
+ return nil;
+
</ins><span class="cx"> RetainPtr<DDActionContext> actionContext = adoptNS([allocDDActionContextInstance() init]);
</span><span class="cx">
</span><span class="cx"> if (!actionContext)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197901 => 197902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-10 00:45:35 UTC (rev 197901)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-10 00:56:31 UTC (rev 197902)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-03-09 David Kilzer <ddkilzer@apple.com>
+
+ REGRESSION (r197149): Missing availability checks when soft-linking DataDetectors.framework
+ <http://webkit.org/b/155258>
+
+ Reviewed by Andy Estes.
+
+ * Platform/mac/MenuUtilities.mm:
+ (WebKit::menuItemForTelephoneNumber):
+ (WebKit::menuForTelephoneNumber):
+ - Add check that returns early if DataDetectors.framework is not
+ available.
+
+ * Shared/mac/WebHitTestResultData.mm:
+ (WebKit::WebHitTestResultData::platformDecode):
+ - Add Debug assertion. The soft-linked code should never be
+ called if there was no actionContext passed in.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::dismissContentRelativeChildWindowsFromViewOnly):
+ - Protect calls to DDActionsManager with availability check.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _clearImmediateActionState]):
+ (-[WKImmediateActionController immediateActionRecognizerWillBeginAnimation:]):
+ - Protect calls to DDActionsManager with availability check.
+ (-[WKImmediateActionController _animationControllerForDataDetectedText]):
+ (-[WKImmediateActionController _animationControllerForDataDetectedLink]):
+ - Add check that returns early if DataDetectors.framework is not
+ available.
+
</ins><span class="cx"> 2016-03-09 Keith Rollin <krollin@apple.com>
</span><span class="cx">
</span><span class="cx"> Add state dumping facility
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacMenuUtilitiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm (197901 => 197902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm 2016-03-10 00:45:35 UTC (rev 197901)
+++ trunk/Source/WebKit2/Platform/mac/MenuUtilities.mm 2016-03-10 00:56:31 UTC (rev 197902)
</span><span class="lines">@@ -50,6 +50,9 @@
</span><span class="cx">
</span><span class="cx"> NSMenuItem *menuItemForTelephoneNumber(const String& telephoneNumber)
</span><span class="cx"> {
</span><ins>+ if (!DataDetectorsLibrary())
+ return nil;
+
</ins><span class="cx"> RetainPtr<DDActionContext> actionContext = [[getDDActionContextClass() alloc] init];
</span><span class="cx"> [actionContext setAllowedActionUTIs:@[ @"com.apple.dial" ]];
</span><span class="cx">
</span><span class="lines">@@ -74,6 +77,9 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSMenu> menuForTelephoneNumber(const String& telephoneNumber)
</span><span class="cx"> {
</span><ins>+ if (!DataDetectorsLibrary())
+ return nil;
+
</ins><span class="cx"> RetainPtr<NSMenu> menu = adoptNS([[NSMenu alloc] init]);
</span><span class="cx"> NSMutableArray *faceTimeItems = [NSMutableArray array];
</span><span class="cx"> NSMenuItem *dialItem = nil;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacWebHitTestResultDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/WebHitTestResultData.mm (197901 => 197902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/WebHitTestResultData.mm 2016-03-10 00:45:35 UTC (rev 197901)
+++ trunk/Source/WebKit2/Shared/mac/WebHitTestResultData.mm 2016-03-10 00:56:31 UTC (rev 197902)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx">
</span><span class="cx"> if (!hasActionContext)
</span><span class="cx"> return true;
</span><ins>+ ASSERT(DataDetectorsLibrary());
</ins><span class="cx">
</span><span class="cx"> RetainPtr<CFDataRef> data;
</span><span class="cx"> if (!IPC::decode(decoder, data))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (197901 => 197902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-03-10 00:45:35 UTC (rev 197901)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-03-10 00:56:31 UTC (rev 197902)
</span><span class="lines">@@ -2297,9 +2297,11 @@
</span><span class="cx"> if (m_view.window.isKeyWindow || hasActiveImmediateAction) {
</span><span class="cx"> WebCore::DictionaryLookup::hidePopup();
</span><span class="cx">
</span><del>- DDActionsManager *actionsManager = [getDDActionsManagerClass() sharedManager];
- if ([actionsManager respondsToSelector:@selector(requestBubbleClosureUnanchorOnFailure:)])
- [actionsManager requestBubbleClosureUnanchorOnFailure:YES];
</del><ins>+ if (DataDetectorsLibrary()) {
+ DDActionsManager *actionsManager = [getDDActionsManagerClass() sharedManager];
+ if ([actionsManager respondsToSelector:@selector(requestBubbleClosureUnanchorOnFailure:)])
+ [actionsManager requestBubbleClosureUnanchorOnFailure:YES];
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> clearTextIndicatorWithAnimation(WebCore::TextIndicatorWindowDismissalAnimation::FadeOut);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (197901 => 197902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2016-03-10 00:45:35 UTC (rev 197901)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2016-03-10 00:56:31 UTC (rev 197902)
</span><span class="lines">@@ -122,7 +122,8 @@
</span><span class="cx">
</span><span class="cx"> if (_currentActionContext && _hasActivatedActionContext) {
</span><span class="cx"> _hasActivatedActionContext = NO;
</span><del>- [getDDActionsManagerClass() didUseActions];
</del><ins>+ if (DataDetectorsLibrary())
+ [getDDActionsManagerClass() didUseActions];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _state = ImmediateActionState::None;
</span><span class="lines">@@ -209,8 +210,10 @@
</span><span class="cx">
</span><span class="cx"> if (_currentActionContext) {
</span><span class="cx"> _hasActivatedActionContext = YES;
</span><del>- if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()])
- [self _cancelImmediateAction];
</del><ins>+ if (DataDetectorsLibrary()) {
+ if (![getDDActionsManagerClass() shouldUseActionsWithContext:_currentActionContext.get()])
+ [self _cancelImmediateAction];
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -392,6 +395,9 @@
</span><span class="cx">
</span><span class="cx"> - (id<NSImmediateActionAnimationController>)_animationControllerForDataDetectedText
</span><span class="cx"> {
</span><ins>+ if (!DataDetectorsLibrary())
+ return nil;
+
</ins><span class="cx"> DDActionContext *actionContext = _hitTestResultData.detectedDataActionContext.get();
</span><span class="cx"> if (!actionContext)
</span><span class="cx"> return nil;
</span><span class="lines">@@ -428,6 +434,9 @@
</span><span class="cx">
</span><span class="cx"> - (id<NSImmediateActionAnimationController>)_animationControllerForDataDetectedLink
</span><span class="cx"> {
</span><ins>+ if (!DataDetectorsLibrary())
+ return nil;
+
</ins><span class="cx"> RetainPtr<DDActionContext> actionContext = adoptNS([allocDDActionContextInstance() init]);
</span><span class="cx">
</span><span class="cx"> if (!actionContext)
</span></span></pre>
</div>
</div>
</body>
</html>