[Cocoa] Don't soft link DataDetectorsCore
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 May 2015 18:29:59 +0000 (18:29 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 May 2015 18:29:59 +0000 (18:29 +0000)
commit3608ed97fb3a9abbf1716c0dcbec0496408e4d1c
treefd0b4430eef9bead4cc2592bd5690d36c965f90c
parent2c5a0c752ea90c263d6519f455e70627b5617027
[Cocoa] Don't soft link DataDetectorsCore
https://bugs.webkit.org/show_bug.cgi?id=144837

Reviewed by Dan Bernstein.

Source/WebCore:

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.

Source/WebKit2:

* 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@184047 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.xcconfig
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/editing/mac/DataDetection.mm
Source/WebCore/page/mac/ServicesOverlayController.h
Source/WebCore/page/mac/ServicesOverlayController.mm
Source/WebCore/platform/spi/cocoa/DataDetectorsCoreSPI.h [new file with mode: 0644]
Source/WebCore/platform/spi/mac/DataDetectorsSPI.h
Source/WebKit2/ChangeLog
Source/WebKit2/Platform/mac/MenuUtilities.mm
Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm