<!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>[176808] branches/safari-600.3-branch/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/176808">176808</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-12-04 11:54:16 -0800 (Thu, 04 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176682">r176682</a>. rdar://problems/18903995</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebCoreChangeLog">branches/safari-600.3-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebCorepagemacServicesOverlayControllermm">branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.mm</a></li>
<li><a href="#branchessafari6003branchSourceWebCoreplatformspimacDataDetectorsSPIh">branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176807 => 176808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-04 19:47:31 UTC (rev 176807)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-12-04 19:54:16 UTC (rev 176808)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-12-04 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176682. <rdar://problem/18903995>
+
+ 2014-12-02 Tim Horton <timothy_horton@apple.com>
+
+ Always show the arrow for text selection services
+ https://bugs.webkit.org/show_bug.cgi?id=139191
+ <rdar://problem/18903995>
+
+ Reviewed by Anders Carlsson.
+
+ * platform/spi/mac/DataDetectorsSPI.h:
+ * page/mac/ServicesOverlayController.mm:
+ Move a few things to DataDetectorsSPI.h.
+
+ (WebCore::ServicesOverlayController::buildPhoneNumberHighlights):
+ (WebCore::ServicesOverlayController::buildSelectionHighlight):
+ Make use of the real DDHighlightStyle names.
+ Add DDHighlightStyleButtonShowAlways for selection services.
+
+2014-12-04 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r176766. <rdar://problem/19072083>
</span><span class="cx">
</span><span class="cx"> 2014-12-03 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCorepagemacServicesOverlayControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.mm (176807 => 176808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.mm 2014-12-04 19:47:31 UTC (rev 176807)
+++ branches/safari-600.3-branch/Source/WebCore/page/mac/ServicesOverlayController.mm 2014-12-04 19:54:16 UTC (rev 176808)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import "Chrome.h"
</span><span class="cx"> #import "ChromeClient.h"
</span><ins>+#import "DataDetectorsSPI.h"
</ins><span class="cx"> #import "Document.h"
</span><span class="cx"> #import "Editor.h"
</span><span class="cx"> #import "EventHandler.h"
</span><span class="lines">@@ -50,23 +51,9 @@
</span><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx">
</span><del>-#if __has_include(<DataDetectors/DDHighlightDrawing.h>)
-#import <DataDetectors/DDHighlightDrawing.h>
-#else
-typedef struct __DDHighlight DDHighlight, *DDHighlightRef;
-#endif
-
-#if __has_include(<DataDetectors/DDHighlightDrawing_Private.h>)
-#import <DataDetectors/DDHighlightDrawing_Private.h>
-#endif
-
</del><span class="cx"> const float highlightFadeAnimationDuration = 0.3;
</span><span class="cx">
</span><del>-typedef NSUInteger DDHighlightStyle;
-static const DDHighlightStyle DDHighlightNoOutlineWithArrow = (1 << 16);
-static const DDHighlightStyle DDHighlightOutlineWithArrow = (1 << 16) | 1;
-
-SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(DataDetectors)
</del><ins>+// FIXME: Move more of this to DataDetectorsSPI.h.
</ins><span class="cx"> SOFT_LINK(DataDetectors, DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection, DDHighlightRef, (CFAllocatorRef allocator, CGRect* rects, CFIndex count, CGRect globalVisibleRect, DDHighlightStyle style, Boolean withArrow, NSWritingDirection writingDirection, Boolean endsWithEOL, Boolean flipped), (allocator, rects, count, globalVisibleRect, style, withArrow, writingDirection, endsWithEOL, flipped))
</span><span class="cx"> SOFT_LINK(DataDetectors, DDHighlightGetLayerWithContext, CGLayerRef, (DDHighlightRef highlight, CGContextRef context), (highlight, context))
</span><span class="cx"> SOFT_LINK(DataDetectors, DDHighlightGetBoundingRect, CGRect, (DDHighlightRef highlight), (highlight))
</span><span class="lines">@@ -511,7 +498,7 @@
</span><span class="cx"> rect.setLocation(mainFrameView.windowToContents(viewForRange->contentsToWindow(rect.location())));
</span><span class="cx">
</span><span class="cx"> CGRect cgRect = rect;
</span><del>- RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, &cgRect, 1, mainFrameView.visibleContentRect(), DDHighlightOutlineWithArrow, YES, NSWritingDirectionNatural, NO, YES));
</del><ins>+ RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, &cgRect, 1, mainFrameView.visibleContentRect(), DDHighlightStyleBubbleStandard | DDHighlightStyleStandardIconArrow, YES, NSWritingDirectionNatural, NO, YES));
</ins><span class="cx">
</span><span class="cx"> newPotentialHighlights.add(Highlight::createForTelephoneNumber(*this, ddHighlight, range));
</span><span class="cx"> }
</span><span class="lines">@@ -555,7 +542,7 @@
</span><span class="cx">
</span><span class="cx"> if (!cgRects.isEmpty()) {
</span><span class="cx"> CGRect visibleRect = mainFrameView->visibleContentRect();
</span><del>- RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, cgRects.begin(), cgRects.size(), visibleRect, DDHighlightNoOutlineWithArrow, YES, NSWritingDirectionNatural, NO, YES));
</del><ins>+ RetainPtr<DDHighlightRef> ddHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection(nullptr, cgRects.begin(), cgRects.size(), visibleRect, DDHighlightStyleBubbleNone | DDHighlightStyleStandardIconArrow | DDHighlightStyleButtonShowAlways, YES, NSWritingDirectionNatural, NO, YES));
</ins><span class="cx">
</span><span class="cx"> newPotentialHighlights.add(Highlight::createForSelection(*this, ddHighlight, selectionRange));
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebCoreplatformspimacDataDetectorsSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h (176807 => 176808)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-12-04 19:47:31 UTC (rev 176807)
+++ branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-12-04 19:54:16 UTC (rev 176808)
</span><span class="lines">@@ -26,9 +26,12 @@
</span><span class="cx"> #import "SoftLinking.h"
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx">
</span><ins>+// FIXME: This header should include various DataDetectors SPI headers if using the internal SDK.
+
</ins><span class="cx"> typedef struct __DDScanner DDScanner, *DDScannerRef;
</span><span class="cx"> typedef struct __DDScanQuery *DDScanQueryRef;
</span><span class="cx"> typedef struct __DDResult *DDResultRef;
</span><ins>+typedef struct __DDHighlight DDHighlight, *DDHighlightRef;
</ins><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> DDScannerTypeStandard = 0,
</span><span class="lines">@@ -72,6 +75,22 @@
</span><span class="cx"> - (DDActionContext *)contextForView:(NSView *)view altMode:(BOOL)altMode interactionStartedHandler:(void (^)(void))interactionStartedHandler interactionChangedHandler:(void (^)(void))interactionChangedHandler interactionStoppedHandler:(void (^)(void))interactionStoppedHandler;
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+enum {
+ DDHighlightStyleBubbleNone = 0,
+ DDHighlightStyleBubbleStandard = 1
+};
+
+enum {
+ DDHighlightStyleIconNone = (0 << 16),
+ DDHighlightStyleStandardIconArrow = (1 << 16)
+};
+
+enum {
+ DDHighlightStyleButtonShowAlways = (1 << 24),
+};
+
+typedef NSUInteger DDHighlightStyle;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_CLASS(DataDetectors, DDActionsManager)
</span></span></pre>
</div>
</div>
</body>
</html>