<!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>[184478] branches/safari-601.1.32-branch/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/184478">184478</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-18 07:22:43 -0700 (Mon, 18 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/184047">r184047</a>. rdar://problem/20890647</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchSourceWebCoreChangeLog">branches/safari-601.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreConfigurationsWebCorexcconfig">branches/safari-601.1.32-branch/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreWebCorexcodeprojprojectpbxproj">branches/safari-601.1.32-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreeditingmacDataDetectionmm">branches/safari-601.1.32-branch/Source/WebCore/editing/mac/DataDetection.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebCorepagemacServicesOverlayControllerh">branches/safari-601.1.32-branch/Source/WebCore/page/mac/ServicesOverlayController.h</a></li>
<li><a href="#branchessafari601132branchSourceWebCorepagemacServicesOverlayControllermm">branches/safari-601.1.32-branch/Source/WebCore/page/mac/ServicesOverlayController.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreplatformspimacDataDetectorsSPIh">branches/safari-601.1.32-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2ChangeLog">branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2PlatformmacMenuUtilitiesmm">branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/MenuUtilities.mm</a></li>
<li><a href="#branchessafari601132branchSourceWebKit2WebProcessWebPagemacWebPageMacmm">branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601132branchSourceWebCoreplatformspicocoaDataDetectorsCoreSPIh">branches/safari-601.1.32-branch/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184477 => 184478)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-18 14:22:23 UTC (rev 184477)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-18 14:22:43 UTC (rev 184478)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r184047. rdar://problem/20890647
+
+ 2015-05-10 Darin Adler <darin@apple.com>
+
+ [Cocoa] Don't soft link DataDetectorsCore
+ https://bugs.webkit.org/show_bug.cgi?id=144837
+
+ Reviewed by Dan Bernstein.
+
+ Linking this in the normal way should slightly speed up the web process
+ startup time. We don't need to soft link it: It's present in the
+ OS X base system and there is no reference cycle with WebKit.
+
+ * Configurations/WebCore.xcconfig: Added PrivateFrameworks to
+ FRAMEWORK_SEARCH_PATHS for Mac and added DataDetectorsCore to
+ OTHER_LDFLAGS_PLATFORM for Mac. We may want to do this later for iOS too.
+
+ * WebCore.xcodeproj/project.pbxproj: Added DataDetectorsCoreSPI.h.
+
+ * editing/mac/DataDetection.mm:
+ (WebCore::DataDetection::detectItemAroundHitTestResult): Removed check to see
+ if DataDetectorsCore is available.
+
+ * page/mac/ServicesOverlayController.h: Simplified a forward declaration to
+ only declare what we actually use.
+ * page/mac/ServicesOverlayController.mm: Moved SOFT_LINK from here to the
+ DataDetectorsSPI.h header.
+
+ * platform/spi/cocoa/DataDetectorsCoreSPI.h: Added. This is the low level
+ DataDetectorsCore framework, which has no reference cycle with WebKit, and
+ which we can link to normally. Moved the content here from DataDetectorsSPI.h,
+ added a USE(APPLE_INTERNAL_SDK) path that uses the system headers, and fixed
+ the incorrect return type on DDScannerScanQuery, which was detected when
+ using the system headers in conjunction with this file.
+
+ * platform/spi/mac/DataDetectorsSPI.h: Removed the content of this file that
+ was actually about DataDetectorsCore. Also added a USE(APPLE_INTERNAL_SDK)
+ path that uses the system headers and moved a few stray DataDetectors SPI
+ definitions from elsewhere into this header.
+
</ins><span class="cx"> 2015-05-13 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r183976.
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/Configurations/WebCore.xcconfig (184477 => 184478)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/Configurations/WebCore.xcconfig 2015-05-18 14:22:23 UTC (rev 184477)
+++ branches/safari-601.1.32-branch/Source/WebCore/Configurations/WebCore.xcconfig 2015-05-18 14:22:43 UTC (rev 184478)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_ios_Production = $(PRODUCTION_FRAMEWORKS_DIR);
</span><del>-FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(FRAMEWORK_SEARCH_PATHS);
</del><ins>+FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(FRAMEWORK_SEARCH_PATHS) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx">
</span><span class="cx"> OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -lMobileGestalt;
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface;
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = $(OTHER_LDFLAGS_BASE_ios);
</span><del>-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework IOSurface -framework OpenGL;
</del><ins>+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework DataDetectorsCore -framework IOSurface -framework OpenGL;
</ins><span class="cx">
</span><span class="cx"> SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
</span><span class="cx"> SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebCore.order;
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (184477 => 184478)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-05-18 14:22:23 UTC (rev 184477)
+++ branches/safari-601.1.32-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-05-18 14:22:43 UTC (rev 184478)
</span><span class="lines">@@ -3380,6 +3380,7 @@
</span><span class="cx"> 935C476B09AC4D4F00A6AAB4 /* PlatformWheelEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */; };
</span><span class="cx"> 935C477509AC4D8E00A6AAB4 /* GapRects.h in Headers */ = {isa = PBXBuildFile; fileRef = 935C477409AC4D8D00A6AAB4 /* GapRects.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 935E2B4E1AFF06CA00976F9F /* DataDetectorsCoreSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 935E2B4D1AFF06CA00976F9F /* DataDetectorsCoreSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 935F45420F7C3B5F00D7C1FB /* JSLazyEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 935F45400F7C3B5F00D7C1FB /* JSLazyEventListener.cpp */; };
</span><span class="cx"> 935F45430F7C3B5F00D7C1FB /* JSLazyEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 935F45410F7C3B5F00D7C1FB /* JSLazyEventListener.h */; };
</span><span class="cx"> 935FBC4509BA00B900E230B1 /* EventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 935FBC4409BA00B900E230B1 /* EventListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -10647,6 +10648,7 @@
</span><span class="cx"> 935C476A09AC4D4F00A6AAB4 /* PlatformWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformWheelEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> 935C476E09AC4D7300A6AAB4 /* KeyEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KeyEventMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 935C477409AC4D8D00A6AAB4 /* GapRects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GapRects.h; sourceTree = "<group>"; };
</span><ins>+ 935E2B4D1AFF06CA00976F9F /* DataDetectorsCoreSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataDetectorsCoreSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> 935F45400F7C3B5F00D7C1FB /* JSLazyEventListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSLazyEventListener.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 935F45410F7C3B5F00D7C1FB /* JSLazyEventListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSLazyEventListener.h; sourceTree = "<group>"; };
</span><span class="cx"> 935FBC4409BA00B900E230B1 /* EventListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventListener.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16536,6 +16538,7 @@
</span><span class="cx"> 07F0B9791AC5DB3300E535D9 /* AVKitSPI.h */,
</span><span class="cx"> CD4097FF1A8C855F004C65E9 /* CFNSURLConnectionSPI.h */,
</span><span class="cx"> 1C5E980F1A02CEFA002DB55F /* CoreTextSPI.h */,
</span><ins>+ 935E2B4D1AFF06CA00976F9F /* DataDetectorsCoreSPI.h */,
</ins><span class="cx"> CE12524A1A16C79B00864480 /* DispatchSPI.h */,
</span><span class="cx"> CE1252441A16C22500864480 /* DynamicLinkerSPI.h */,
</span><span class="cx"> CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */,
</span><span class="lines">@@ -24225,6 +24228,7 @@
</span><span class="cx"> AD6E71AD1668899D00320C13 /* DocumentSharedObjectPool.h in Headers */,
</span><span class="cx"> E47E276516036ED200EE2AFB /* DocumentStyleSheetCollection.h in Headers */,
</span><span class="cx"> 0B90561A0F2578BF0095FF6A /* DocumentThreadableLoader.h in Headers */,
</span><ins>+ 935E2B4E1AFF06CA00976F9F /* DataDetectorsCoreSPI.h in Headers */,
</ins><span class="cx"> 86D982F7125C154000AD9E3D /* DocumentTiming.h in Headers */,
</span><span class="cx"> A8185F3909765766005826D9 /* DocumentType.h in Headers */,
</span><span class="cx"> 973889A1116EA9DC00ADF313 /* DocumentWriter.h in Headers */,
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreeditingmacDataDetectionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/editing/mac/DataDetection.mm (184477 => 184478)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/editing/mac/DataDetection.mm 2015-05-18 14:22:23 UTC (rev 184477)
+++ branches/safari-601.1.32-branch/Source/WebCore/editing/mac/DataDetection.mm 2015-05-18 14:22:43 UTC (rev 184478)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<DDActionContext> DataDetection::detectItemAroundHitTestResult(const HitTestResult& hitTestResult, FloatRect& detectedDataBoundingBox, RefPtr<Range>& detectedDataRange)
</span><span class="cx"> {
</span><del>- if (!DataDetectorsLibrary() || !DataDetectorsCoreLibrary())
</del><ins>+ if (!DataDetectorsLibrary())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> Node* node = hitTestResult.innerNonSharedNode();
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCorepagemacServicesOverlayControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/page/mac/ServicesOverlayController.h (184477 => 184478)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/page/mac/ServicesOverlayController.h 2015-05-18 14:22:23 UTC (rev 184477)
+++ branches/safari-601.1.32-branch/Source/WebCore/page/mac/ServicesOverlayController.h 2015-05-18 14:22:43 UTC (rev 184478)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><del>-typedef struct __DDHighlight DDHighlight, *DDHighlightRef;
</del><ins>+typedef struct __DDHighlight *DDHighlightRef;
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class LayoutRect;
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCorepagemacServicesOverlayControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/page/mac/ServicesOverlayController.mm (184477 => 184478)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/page/mac/ServicesOverlayController.mm 2015-05-18 14:22:23 UTC (rev 184477)
+++ branches/safari-601.1.32-branch/Source/WebCore/page/mac/ServicesOverlayController.mm 2015-05-18 14:22:43 UTC (rev 184478)
</span><span class="lines">@@ -53,12 +53,6 @@
</span><span class="cx">
</span><span class="cx"> const float highlightFadeAnimationDuration = 0.3;
</span><span class="cx">
</span><del>-// FIXME: Move more of this to DataDetectorsSPI.h.
-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))
-SOFT_LINK(DataDetectors, DDHighlightGetLayerWithContext, CGLayerRef, (DDHighlightRef highlight, CGContextRef context), (highlight, context))
-SOFT_LINK(DataDetectors, DDHighlightGetBoundingRect, CGRect, (DDHighlightRef highlight), (highlight))
-SOFT_LINK(DataDetectors, DDHighlightPointIsOnHighlight, Boolean, (DDHighlightRef highlight, CGPoint point, Boolean* onButton), (highlight, point, onButton))
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ServicesOverlayController::Highlight> ServicesOverlayController::Highlight::createForSelection(ServicesOverlayController& controller, RetainPtr<DDHighlightRef> ddHighlight, PassRefPtr<Range> range)
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreplatformspicocoaDataDetectorsCoreSPIh"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.32-branch/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h (0 => 184478)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h (rev 0)
+++ branches/safari-601.1.32-branch/Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h 2015-05-18 14:22:43 UTC (rev 184478)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+/*
+ * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <DataDetectorsCore/DataDetectorsCore.h>
+
+#else // !USE(APPLE_INTERNAL_SDK)
+
+typedef enum {
+ DDScannerTypeStandard = 0,
+ DDScannerType1 = 1,
+ DDScannerType2 = 2,
+} DDScannerType;
+
+enum {
+ DDScannerCopyResultsOptionsNone = 0,
+ DDScannerCopyResultsOptionsNoOverlap = 1 << 0,
+};
+
+#endif // !USE(APPLE_INTERNAL_SDK)
+
+typedef struct __DDResult *DDResultRef;
+typedef struct __DDScanQuery *DDScanQueryRef;
+typedef struct __DDScanner *DDScannerRef;
+
+typedef CFIndex DDScannerCopyResultsOptions;
+typedef CFIndex DDScannerOptions;
+
+extern "C" {
+
+DDScannerRef DDScannerCreate(DDScannerType, DDScannerOptions, CFErrorRef*);
+DDScanQueryRef DDScanQueryCreateFromString(CFAllocatorRef, CFStringRef, CFRange);
+Boolean DDScannerScanQuery(DDScannerRef, DDScanQueryRef);
+CFArrayRef DDScannerCopyResultsWithOptions(DDScannerRef, DDScannerCopyResultsOptions);
+CFRange DDResultGetRange(DDResultRef);
+
+}
</ins></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreplatformspimacDataDetectorsSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h (184477 => 184478)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2015-05-18 14:22:23 UTC (rev 184477)
+++ branches/safari-601.1.32-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2015-05-18 14:22:43 UTC (rev 184478)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -23,48 +23,18 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import "SoftLinking.h"
-#import <objc/runtime.h>
</del><ins>+#import <WebCore/DataDetectorsCoreSPI.h>
+#import <WebCore/SoftLinking.h>
</ins><span class="cx">
</span><del>-// FIXME: This header should include various DataDetectors SPI headers if using the internal SDK.
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx">
</span><del>-typedef struct __DDScanner DDScanner, *DDScannerRef;
-typedef struct __DDScanQuery *DDScanQueryRef;
-typedef struct __DDResult *DDResultRef;
-typedef struct __DDHighlight DDHighlight, *DDHighlightRef;
</del><ins>+// Can't include DDAction.h because as of this writing it is a private header that includes a non-private header with an "" include.
+#import <DataDetectors/DDActionContext.h>
+#import <DataDetectors/DDActionsManager.h>
+#import <DataDetectors/DDHighlightDrawing.h>
</ins><span class="cx">
</span><del>-typedef enum {
- DDScannerTypeStandard = 0,
-} DDScannerType;
</del><ins>+#else // !USE(APPLE_INTERNAL_SDK)
</ins><span class="cx">
</span><del>-enum {
- DDScannerOptionStopAtFirstMatch = 1,
-};
-typedef CFIndex DDScannerOptions;
-
-enum {
- DDScannerCopyResultsOptionsNone = 0,
- DDScannerCopyResultsOptionsNoOverlap = 1 << 0,
-};
-typedef CFIndex DDScannerCopyResultsOptions;
-
-SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(DataDetectors)
-SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(DataDetectorsCore)
-
-extern "C" {
-
-SOFT_LINK(DataDetectorsCore, DDScannerCreate, DDScannerRef, (DDScannerType type, DDScannerOptions options, CFErrorRef* errorRef), (type, options, errorRef))
-SOFT_LINK(DataDetectorsCore, DDScanQueryCreateFromString, DDScanQueryRef, (CFAllocatorRef allocator, CFStringRef string, CFRange range), (allocator, string, range))
-SOFT_LINK(DataDetectorsCore, DDScannerScanQuery, DDScanQueryRef, (DDScannerRef scanner, DDScanQueryRef query), (scanner, query))
-SOFT_LINK(DataDetectorsCore, DDScannerCopyResultsWithOptions, CFArrayRef, (DDScannerRef scanner, DDScannerCopyResultsOptions options), (scanner, options))
-SOFT_LINK(DataDetectorsCore, DDResultGetRange, CFRange, (DDResultRef result), (result))
-SOFT_LINK(DataDetectorsCore, DDResultGetType, CFStringRef, (DDResultRef result), (result))
-
-}
-
-#if PLATFORM(MAC)
-SOFT_LINK_CLASS(DataDetectors, DDActionContext)
-
</del><span class="cx"> @interface DDActionContext : NSObject <NSCopying, NSSecureCoding>
</span><span class="cx">
</span><span class="cx"> @property NSRect highlightFrame;
</span><span class="lines">@@ -77,6 +47,22 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface DDActionsManager : NSObject
+
++ (DDActionsManager *)sharedManager;
+- (NSArray *)menuItemsForResult:(DDResultRef)result actionContext:(DDActionContext *)context;
+- (NSArray *)menuItemsForTargetURL:(NSString *)targetURL actionContext:(DDActionContext *)context;
+- (void)requestBubbleClosureUnanchorOnFailure:(BOOL)unanchorOnFailure;
+
++ (BOOL)shouldUseActionsWithContext:(DDActionContext *)context;
++ (void)didUseActions;
+
+- (BOOL)hasActionsForResult:(DDResultRef)result actionContext:(DDActionContext *)actionContext;
+
+- (NSArray *)menuItemsForValue:(NSString *)value type:(CFStringRef)type service:(NSString *)service context:(DDActionContext *)context;
+
+@end
+
</ins><span class="cx"> enum {
</span><span class="cx"> DDHighlightStyleBubbleNone = 0,
</span><span class="cx"> DDHighlightStyleBubbleStandard = 1
</span><span class="lines">@@ -88,24 +74,29 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum {
</span><del>- DDHighlightStyleButtonShowAlways = (1 << 24),
</del><ins>+ DDHighlightStyleButtonShowAlways = (1 << 24),
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+#endif // !USE(APPLE_INTERNAL_SDK)
+
+typedef struct __DDHighlight *DDHighlightRef;
</ins><span class="cx"> typedef NSUInteger DDHighlightStyle;
</span><del>-#endif
</del><span class="cx">
</span><del>-SOFT_LINK_CLASS(DataDetectors, DDActionsManager)
</del><ins>+@interface DDAction : NSObject
</ins><span class="cx">
</span><del>-@interface DDActionsManager : NSObject
</del><ins>+@property (readonly) NSString *actionUTI;
</ins><span class="cx">
</span><del>-+ (DDActionsManager *)sharedManager;
-- (NSArray *)menuItemsForResult:(DDResultRef)result actionContext:(DDActionContext *)context;
-- (NSArray *)menuItemsForTargetURL:(NSString *)targetURL actionContext:(DDActionContext *)context;
-- (void)requestBubbleClosureUnanchorOnFailure:(BOOL)unanchorOnFailure;
</del><ins>+@end
</ins><span class="cx">
</span><del>-+ (BOOL)shouldUseActionsWithContext:(DDActionContext *)context;
-+ (void)didUseActions;
</del><ins>+SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(DataDetectors)
</ins><span class="cx">
</span><del>-- (BOOL)hasActionsForResult:(DDResultRef)result actionContext:(DDActionContext *)actionContext;
</del><ins>+SOFT_LINK_CLASS(DataDetectors, DDAction)
+SOFT_LINK_CLASS(DataDetectors, DDActionContext)
+SOFT_LINK_CLASS(DataDetectors, DDActionsManager)
</ins><span class="cx">
</span><del>-@end
</del><ins>+SOFT_LINK_CONSTANT(DataDetectors, DDBinderPhoneNumberKey, CFStringRef)
+
+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))
+SOFT_LINK(DataDetectors, DDHighlightGetLayerWithContext, CGLayerRef, (DDHighlightRef highlight, CGContextRef context), (highlight, context))
+SOFT_LINK(DataDetectors, DDHighlightGetBoundingRect, CGRect, (DDHighlightRef highlight), (highlight))
+SOFT_LINK(DataDetectors, DDHighlightPointIsOnHighlight, Boolean, (DDHighlightRef highlight, CGPoint point, Boolean* onButton), (highlight, point, onButton))
</ins></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog (184477 => 184478)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:22:23 UTC (rev 184477)
+++ branches/safari-601.1.32-branch/Source/WebKit2/ChangeLog 2015-05-18 14:22:43 UTC (rev 184478)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184047. rdar://problem/20890647
+
+ 2015-05-10 Darin Adler <darin@apple.com>
+
+ [Cocoa] Don't soft link DataDetectorsCore
+ https://bugs.webkit.org/show_bug.cgi?id=144837
+
+ Reviewed by Dan Bernstein.
+
+ * Platform/mac/MenuUtilities.mm: Use DataDetectorsSPI.h instead of doing it here.
+
+ * WebProcess/WebPage/mac/WebPageMac.mm: Removed unneeded include of unused header,
+ DataDetectorsSPI.h.
+
+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r184024. rdar://problem/19790341
</span><span class="cx">
</span><span class="cx"> 2015-05-08 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2PlatformmacMenuUtilitiesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/MenuUtilities.mm (184477 => 184478)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/MenuUtilities.mm 2015-05-18 14:22:23 UTC (rev 184477)
+++ branches/safari-601.1.32-branch/Source/WebKit2/Platform/mac/MenuUtilities.mm 2015-05-18 14:22:43 UTC (rev 184478)
</span><span class="lines">@@ -32,24 +32,7 @@
</span><span class="cx"> #import <objc/runtime.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><del>-
</del><span class="cx"> #import <WebCore/TUCallSPI.h>
</span><del>-
-SOFT_LINK_PRIVATE_FRAMEWORK(DataDetectors)
-SOFT_LINK_CLASS(DataDetectors, DDAction)
-SOFT_LINK_CLASS(DataDetectors, DDActionsManager)
-SOFT_LINK_CONSTANT(DataDetectors, DDBinderPhoneNumberKey, CFStringRef)
-
-@interface DDAction : NSObject
-@property (readonly) NSString *actionUTI;
-@end
-
-typedef void* DDActionContext;
-
-@interface DDActionsManager : NSObject
-+ (DDActionsManager *)sharedManager;
-- (NSArray *)menuItemsForValue:(NSString *)value type:(CFStringRef)type service:(NSString *)service context:(DDActionContext *)context;
-@end
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (184477 => 184478)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-05-18 14:22:23 UTC (rev 184477)
+++ branches/safari-601.1.32-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-05-18 14:22:43 UTC (rev 184478)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> #import <WebCore/AXObjectCache.h>
</span><span class="cx"> #import <WebCore/BackForwardController.h>
</span><span class="cx"> #import <WebCore/DataDetection.h>
</span><del>-#import <WebCore/DataDetectorsSPI.h>
</del><span class="cx"> #import <WebCore/DictionaryLookup.h>
</span><span class="cx"> #import <WebCore/EventHandler.h>
</span><span class="cx"> #import <WebCore/FocusController.h>
</span></span></pre>
</div>
</div>
</body>
</html>