Diff
Modified: trunk/Source/WebCore/ChangeLog (239947 => 239948)
--- trunk/Source/WebCore/ChangeLog 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/ChangeLog 2019-01-14 22:19:50 UTC (rev 239948)
@@ -1,3 +1,33 @@
+2019-01-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r239901, r239909, r239910, r239912,
+ r239913, and r239914.
+ https://bugs.webkit.org/show_bug.cgi?id=193407
+
+ These revisions caused an internal failure (Requested by
+ Truitt on #webkit).
+
+ Reverted changesets:
+
+ "[Cocoa] Avoid importing directly from subumbrella frameworks"
+ https://bugs.webkit.org/show_bug.cgi?id=186016
+ https://trac.webkit.org/changeset/239901
+
+ "Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901."
+ https://trac.webkit.org/changeset/239909
+
+ "Tried to fix the build."
+ https://trac.webkit.org/changeset/239910
+
+ "Fixed iOS builds after r239910."
+ https://trac.webkit.org/changeset/239912
+
+ "More build fixing."
+ https://trac.webkit.org/changeset/239913
+
+ "Tried to fix USE(APPLE_INTERNAL_SDK) 32-bit builds."
+ https://trac.webkit.org/changeset/239914
+
2019-01-14 Mark Lam <[email protected]>
Re-enable ability to build --cloop builds.
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (239947 => 239948)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2019-01-14 22:19:50 UTC (rev 239948)
@@ -38,6 +38,9 @@
SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks
LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_LIBWEBRTC_LIBRARY_DIR)";
+ADDITIONAL_CFLAGS = -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;
+OTHER_CFLAGS = $(inherited) $(ADDITIONAL_CFLAGS);
+OTHER_CPLUSPLUSFLAGS = $(inherited) $(ADDITIONAL_CFLAGS);
WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc/sdk/objc/Framework/Headers $(SDKROOT)/usr/local/include/webrtc/sdk/objc/Framework/Headers;
Modified: trunk/Source/WebCore/PAL/ChangeLog (239947 => 239948)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-01-14 22:19:50 UTC (rev 239948)
@@ -1,3 +1,33 @@
+2019-01-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r239901, r239909, r239910, r239912,
+ r239913, and r239914.
+ https://bugs.webkit.org/show_bug.cgi?id=193407
+
+ These revisions caused an internal failure (Requested by
+ Truitt on #webkit).
+
+ Reverted changesets:
+
+ "[Cocoa] Avoid importing directly from subumbrella frameworks"
+ https://bugs.webkit.org/show_bug.cgi?id=186016
+ https://trac.webkit.org/changeset/239901
+
+ "Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901."
+ https://trac.webkit.org/changeset/239909
+
+ "Tried to fix the build."
+ https://trac.webkit.org/changeset/239910
+
+ "Fixed iOS builds after r239910."
+ https://trac.webkit.org/changeset/239912
+
+ "More build fixing."
+ https://trac.webkit.org/changeset/239913
+
+ "Tried to fix USE(APPLE_INTERNAL_SDK) 32-bit builds."
+ https://trac.webkit.org/changeset/239914
+
2019-01-14 Mark Lam <[email protected]>
Re-enable ability to build --cloop builds.
Modified: trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig (239947 => 239948)
--- trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2019-01-14 22:19:50 UTC (rev 239948)
@@ -33,7 +33,7 @@
SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+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;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h (239947 => 239948)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -30,7 +30,7 @@
#if USE(APPLE_INTERNAL_SDK)
#if PLATFORM(MAC)
-#import <CoreServices/CoreServicesPriv.h>
+#import <LaunchServices/LaunchServicesPriv.h>
#elif PLATFORM(IOS_FAMILY)
#import <MobileCoreServices/LSAppLinkPriv.h>
#endif
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h (239947 => 239948)
--- trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -29,7 +29,9 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <ApplicationServices/ApplicationServicesPriv.h>
+#include <HIServices/AXTextMarker.h>
+#include <HIServices/CoreCursor.h>
+#include <HIServices/CoreDrag.h>
#else
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h (239947 => 239948)
--- trunk/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -27,7 +27,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <Carbon/CarbonPriv.h>
+#include <HIToolbox/HIToolboxPriv.h>
#else
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h (239947 => 239948)
--- trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -27,7 +27,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <CoreServices/CoreServicesPriv.h>
+#include <Metadata/MetadataPriv.h>
#endif
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/QuickDrawSPI.h (239947 => 239948)
--- trunk/Source/WebCore/PAL/pal/spi/mac/QuickDrawSPI.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/QuickDrawSPI.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -29,7 +29,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <ApplicationServices/ApplicationServicesPriv.h>
+#include <QD/QuickdrawPriv.h>
#else
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h (239947 => 239948)
--- trunk/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <Quartz/Quartz.h>
+#import <QuickLookUI/QLPreviewItem.h>
@protocol QLPreviewMenuItemDelegate <NSObject>
@optional
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h (239947 => 239948)
--- trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -27,7 +27,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <ApplicationServices/ApplicationServicesPriv.h>
+#include <SpeechSynthesis/SpeechSynthesisPriv.h>
#endif
Modified: trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (239947 => 239948)
--- trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -35,7 +35,7 @@
#import <pal/spi/mac/NSAccessibilitySPI.h>
#if USE(APPLE_INTERNAL_SDK)
-#include <ApplicationServices/ApplicationServicesPriv.h>
+#include <HIServices/AccessibilityPriv.h>
#endif
#ifndef NSAccessibilityLiveRegionChangedNotification
Modified: trunk/Source/WebCore/editing/cocoa/DictionaryLookup.mm (239947 => 239948)
--- trunk/Source/WebCore/editing/cocoa/DictionaryLookup.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/editing/cocoa/DictionaryLookup.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -50,12 +50,12 @@
#import <wtf/BlockObjCExceptions.h>
#import <wtf/RefPtr.h>
-#if PLATFORM(MAC)
-#import <Quartz/Quartz.h>
-#elif !PLATFORM(WATCH)
+#if !PLATFORM(WATCH)
+
#import <PDFKit/PDFKit.h>
-#endif
+#endif // !PLATFORM(WATCH)
+
#if PLATFORM(MAC)
@interface WebRevealHighlight <RVPresenterHighlightDelegate> : NSObject {
Modified: trunk/Source/WebCore/editing/mac/DictionaryLookupLegacy.mm (239947 => 239948)
--- trunk/Source/WebCore/editing/mac/DictionaryLookupLegacy.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookupLegacy.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -42,7 +42,7 @@
#import "VisiblePosition.h"
#import "VisibleSelection.h"
#import "VisibleUnits.h"
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#import <pal/spi/mac/LookupSPI.h>
#import <pal/spi/mac/NSImmediateActionGestureRecognizerSPI.h>
#import <wtf/BlockObjCExceptions.h>
Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (239947 => 239948)
--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -33,7 +33,8 @@
#import "PlatformScreen.h"
#import "Scrollbar.h"
#import "WindowsKeyboardCodes.h"
-#import <Carbon/Carbon.h>
+#import <HIToolbox/CarbonEvents.h>
+#import <HIToolbox/Events.h>
#import <mach/mach_time.h>
#import <pal/spi/mac/HIToolboxSPI.h>
#import <pal/spi/mac/NSEventSPI.h>
Modified: trunk/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm (239947 => 239948)
--- trunk/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -28,7 +28,7 @@
#if PLATFORM(MAC)
-#import <Carbon/Carbon.h>
+#import <CarbonCore/CarbonCore.h>
#import <wtf/spi/cf/CFStringSPI.h>
namespace WebCore {
Modified: trunk/Source/WebKit/ChangeLog (239947 => 239948)
--- trunk/Source/WebKit/ChangeLog 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/ChangeLog 2019-01-14 22:19:50 UTC (rev 239948)
@@ -1,3 +1,33 @@
+2019-01-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r239901, r239909, r239910, r239912,
+ r239913, and r239914.
+ https://bugs.webkit.org/show_bug.cgi?id=193407
+
+ These revisions caused an internal failure (Requested by
+ Truitt on #webkit).
+
+ Reverted changesets:
+
+ "[Cocoa] Avoid importing directly from subumbrella frameworks"
+ https://bugs.webkit.org/show_bug.cgi?id=186016
+ https://trac.webkit.org/changeset/239901
+
+ "Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901."
+ https://trac.webkit.org/changeset/239909
+
+ "Tried to fix the build."
+ https://trac.webkit.org/changeset/239910
+
+ "Fixed iOS builds after r239910."
+ https://trac.webkit.org/changeset/239912
+
+ "More build fixing."
+ https://trac.webkit.org/changeset/239913
+
+ "Tried to fix USE(APPLE_INTERNAL_SDK) 32-bit builds."
+ https://trac.webkit.org/changeset/239914
+
2019-01-14 Mark Lam <[email protected]>
Re-enable ability to build --cloop builds.
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (239947 => 239948)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2019-01-14 22:19:50 UTC (rev 239948)
@@ -40,7 +40,7 @@
HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(SRCROOT) $(HEADER_SEARCH_PATHS);
-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
Modified: trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm (239947 => 239948)
--- trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -56,7 +56,7 @@
#if PLATFORM(MAC)
#if USE(APPLE_INTERNAL_SDK)
-#import <ApplicationServices/ApplicationServicesPriv.h>
+#import <HIServices/AccessibilityPriv.h>
#else
typedef enum {
AXSuspendStatusRunning = 0,
Modified: trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm (239947 => 239948)
--- trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -41,7 +41,6 @@
#import <mach/mach.h>
#import <mach/task.h>
#import <pal/crypto/CryptoDigest.h>
-#import <pal/spi/cocoa/LaunchServicesSPI.h>
#import <pwd.h>
#import <stdlib.h>
#import <sys/sysctl.h>
@@ -56,7 +55,7 @@
#import <wtf/text/StringBuilder.h>
#if USE(APPLE_INTERNAL_SDK)
-#import <ApplicationServices/ApplicationServicesPriv.h>
+#import <HIServices/ProcessesPriv.h>
#import <rootless.h>
#endif
@@ -68,7 +67,7 @@
typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef );
extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
-extern "C" CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo);
+extern "C" CFDictionaryRef _LSApplicationCheckIn(int sessionID, CFDictionaryRef applicationInfo);
extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
@@ -159,7 +158,7 @@
void ChildProcess::launchServicesCheckIn()
{
_LSSetApplicationLaunchServicesServerConnectionStatus(0, 0);
- RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(kLSDefaultSessionID, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
+ RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(-2, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
}
void ChildProcess::platformInitialize()
Modified: trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm (239947 => 239948)
--- trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -33,7 +33,7 @@
#import "WebInspectorProxy.h"
#import "WebPageProxy.h"
#import "_WKAutomationSession.h"
-#import <Carbon/Carbon.h>
+#import <HIToolbox/Events.h>
#import <WebCore/IntPoint.h>
#import <WebCore/IntSize.h>
#import <WebCore/PlatformMouseEvent.h>
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (239947 => 239948)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -76,7 +76,7 @@
#import "WebProcessProxy.h"
#import "_WKRemoteObjectRegistryInternal.h"
#import "_WKThumbnailViewInternal.h"
-#import <Carbon/Carbon.h>
+#import <HIToolbox/CarbonEventsCore.h>
#import <WebCore/AXObjectCache.h>
#import <WebCore/ActivityState.h>
#import <WebCore/ColorMac.h>
Modified: trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm (239947 => 239948)
--- trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -34,7 +34,7 @@
#import "PrintInfo.h"
#import "ShareableBitmap.h"
#import "WebPageProxy.h"
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#import <WebCore/GraphicsContext.h>
#import <WebCore/LocalDefaultSystemAppearance.h>
#import <WebCore/WebCoreObjCExtras.h>
Modified: trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm (239947 => 239948)
--- trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -28,7 +28,7 @@
#if USE(APPKIT)
-#import <Carbon/Carbon.h>
+#import <HIToolbox/CarbonEventsCore.h>
#import <pal/spi/mac/HIToolboxSPI.h>
#import <pal/system/mac/WebPanel.h>
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h (239947 => 239948)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
@interface PDFAnnotationTextWidget (Details)
- (BOOL)isMultiline;
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h (239947 => 239948)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -28,7 +28,7 @@
#if ENABLE(PDFKIT_PLUGIN)
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
@class CPReadingModel;
@class PDFViewLayout;
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm (239947 => 239948)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -48,7 +48,7 @@
#import "WebProcess.h"
#import <_javascript_Core/JSContextRef.h>
#import <_javascript_Core/JSObjectRef.h>
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#import <QuartzCore/QuartzCore.h>
#import <WebCore/AXObjectCache.h>
#import <WebCore/ArchiveResource.h>
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm (239947 => 239948)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -33,7 +33,7 @@
#import "PDFPlugin.h"
#import "PDFPluginChoiceAnnotation.h"
#import "PDFPluginTextAnnotation.h"
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#import <WebCore/CSSPrimitiveValue.h>
#import <WebCore/CSSPropertyNames.h>
#import <WebCore/ColorMac.h>
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm (239947 => 239948)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -30,7 +30,7 @@
#import "PDFKitImports.h"
#import "PDFLayerControllerSPI.h"
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#import <WebCore/CSSPrimitiveValue.h>
#import <WebCore/CSSPropertyNames.h>
#import <WebCore/ColorMac.h>
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm (239947 => 239948)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -31,7 +31,7 @@
#import "PDFKitImports.h"
#import "PDFLayerControllerSPI.h"
#import "PDFPlugin.h"
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#import <WebCore/Event.h>
#import <WebCore/EventNames.h>
#import <WebCore/HTMLElement.h>
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm (239947 => 239948)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -32,7 +32,7 @@
#import "PDFKitImports.h"
#import "PDFLayerControllerSPI.h"
#import "PDFPlugin.h"
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#import <WebCore/CSSPrimitiveValue.h>
#import <WebCore/CSSPropertyNames.h>
#import <WebCore/ColorMac.h>
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm (239947 => 239948)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -53,7 +53,7 @@
#import "WebPasteboardOverrides.h"
#import "WebPreferencesStore.h"
#import "WebProcess.h"
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#import <QuartzCore/QuartzCore.h>
#import <WebCore/AXObjectCache.h>
#import <WebCore/BackForwardController.h>
Modified: trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h (239947 => 239948)
--- trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -28,7 +28,8 @@
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
-#import <Carbon/Carbon.h>
+#import <HIToolbox/CarbonEvents.h>
+#import <HIToolbox/MacWindows.h>
@interface CarbonWindowAdapter : NSWindow
{
Modified: trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm (239947 => 239948)
--- trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -65,7 +65,9 @@
#import <AppKit/AppKit.h>
//#import <CoreGraphics/CGSWindow.h>
-#import <Carbon/Carbon.h>
+#import <HIToolbox/CarbonEvents.h>
+#import <HIToolbox/Controls.h>
+#import <HIToolbox/HIView.h>
#import <assert.h>
#import <_javascript_Core/InitializeThreading.h>
Modified: trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m (239947 => 239948)
--- trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m 2019-01-14 22:19:50 UTC (rev 239948)
@@ -31,9 +31,9 @@
#import "CarbonWindowFrame.h"
#import "CarbonWindowAdapter.h"
#import "CarbonWindowContentView.h"
-#import <Carbon/Carbon.h>
#import <Foundation/NSGeometry.h>
#import <Foundation/NSString.h>
+#import <HIToolbox/MacWindows.h>
#import "WebTypesInternal.h"
Modified: trunk/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h (239947 => 239948)
--- trunk/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -27,7 +27,7 @@
*/
#import <WebKitLegacy/WebKit.h>
-#include <Carbon/Carbon.h>
+#include <HIToolbox/HIView.h>
@interface HIViewAdapter : NSObject
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (239947 => 239948)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-01-14 22:19:50 UTC (rev 239948)
@@ -1,3 +1,33 @@
+2019-01-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r239901, r239909, r239910, r239912,
+ r239913, and r239914.
+ https://bugs.webkit.org/show_bug.cgi?id=193407
+
+ These revisions caused an internal failure (Requested by
+ Truitt on #webkit).
+
+ Reverted changesets:
+
+ "[Cocoa] Avoid importing directly from subumbrella frameworks"
+ https://bugs.webkit.org/show_bug.cgi?id=186016
+ https://trac.webkit.org/changeset/239901
+
+ "Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901."
+ https://trac.webkit.org/changeset/239909
+
+ "Tried to fix the build."
+ https://trac.webkit.org/changeset/239910
+
+ "Fixed iOS builds after r239910."
+ https://trac.webkit.org/changeset/239912
+
+ "More build fixing."
+ https://trac.webkit.org/changeset/239913
+
+ "Tried to fix USE(APPLE_INTERNAL_SDK) 32-bit builds."
+ https://trac.webkit.org/changeset/239914
+
2019-01-14 Mark Lam <[email protected]>
Re-enable ability to build --cloop builds.
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (239947 => 239948)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2019-01-14 22:19:50 UTC (rev 239948)
@@ -48,7 +48,7 @@
OTHER_CFLAGS = $(OTHER_CFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
OTHER_CFLAGS_COCOA_TOUCH_YES = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
-OTHER_CFLAGS_COCOA_TOUCH_NO = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
+OTHER_CFLAGS_COCOA_TOUCH_NO = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm (239947 => 239948)
--- trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -29,7 +29,7 @@
#import "WebNetscapePluginView.h"
#import "WebKitLogging.h"
-#import <Carbon/Carbon.h>
+#import <HIToolbox/CarbonEvents.h>
#import <pal/spi/mac/HIToolboxSPI.h>
#import <pal/spi/mac/NSEventSPI.h>
Modified: trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h (239947 => 239948)
--- trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -25,7 +25,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#import <Quartz/QuartzPrivate.h>
+#import <PDFKit/PDFViewPriv.h>
#else
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm (239947 => 239948)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm 2019-01-14 22:19:50 UTC (rev 239948)
@@ -30,7 +30,7 @@
#import <wtf/RetainPtr.h>
#if !PLATFORM(IOS_FAMILY)
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFDocument.h>
#endif
static void appendValuesInPDFNameSubtreeToVector(CGPDFDictionaryRef subtree, Vector<CGPDFObjectRef>& values)
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h (239947 => 239948)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h 2019-01-14 22:19:50 UTC (rev 239948)
@@ -28,7 +28,7 @@
#if !PLATFORM(IOS_FAMILY)
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#import <WebKitLegacy/WebDocumentInternal.h>
@class WebDataSource;
Modified: trunk/Tools/ChangeLog (239947 => 239948)
--- trunk/Tools/ChangeLog 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Tools/ChangeLog 2019-01-14 22:19:50 UTC (rev 239948)
@@ -1,3 +1,33 @@
+2019-01-14 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r239901, r239909, r239910, r239912,
+ r239913, and r239914.
+ https://bugs.webkit.org/show_bug.cgi?id=193407
+
+ These revisions caused an internal failure (Requested by
+ Truitt on #webkit).
+
+ Reverted changesets:
+
+ "[Cocoa] Avoid importing directly from subumbrella frameworks"
+ https://bugs.webkit.org/show_bug.cgi?id=186016
+ https://trac.webkit.org/changeset/239901
+
+ "Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901."
+ https://trac.webkit.org/changeset/239909
+
+ "Tried to fix the build."
+ https://trac.webkit.org/changeset/239910
+
+ "Fixed iOS builds after r239910."
+ https://trac.webkit.org/changeset/239912
+
+ "More build fixing."
+ https://trac.webkit.org/changeset/239913
+
+ "Tried to fix USE(APPLE_INTERNAL_SDK) 32-bit builds."
+ https://trac.webkit.org/changeset/239914
+
2019-01-14 Mark Lam <[email protected]>
Re-enable ability to build --cloop builds.
Modified: trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp (239947 => 239948)
--- trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2019-01-14 22:19:50 UTC (rev 239948)
@@ -47,7 +47,7 @@
#define COMMON_DIGEST_FOR_OPENSSL
#include <CommonCrypto/CommonDigest.h>
#elif PLATFORM(MAC)
-#include <CoreServices/CoreServices.h>
+#include <LaunchServices/UTCoreTypes.h>
#define COMMON_DIGEST_FOR_OPENSSL
#include <CommonCrypto/CommonDigest.h>
#endif
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig (239947 => 239948)
--- trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig 2019-01-14 22:19:50 UTC (rev 239948)
@@ -21,7 +21,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
+OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.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/WebKit.framework/Frameworks;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREFIX_HEADER = DumpRenderTreePrefix.h;
Modified: trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m (239947 => 239948)
--- trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2019-01-14 22:19:50 UTC (rev 239948)
@@ -43,7 +43,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#import <ColorSync/ColorSyncPriv.h>
+#include <ColorSync/ColorSyncPriv.h>
#else
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (239947 => 239948)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2019-01-14 22:19:50 UTC (rev 239948)
@@ -101,7 +101,7 @@
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *Mac.h *Mac.cpp *Mac.mm */mac/*;
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS) --system-header-prefix=WebKit/;
-OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig (239947 => 239948)
--- trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2019-01-14 22:19:50 UTC (rev 239948)
@@ -21,4 +21,6 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
+OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
Modified: trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp (239947 => 239948)
--- trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2019-01-14 22:16:50 UTC (rev 239947)
+++ trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2019-01-14 22:19:50 UTC (rev 239948)
@@ -35,7 +35,7 @@
#include <wtf/RetainPtr.h>
#if PLATFORM(MAC) && !PLATFORM(IOS_FAMILY)
-#include <CoreServices/CoreServices.h>
+#include <LaunchServices/UTCoreTypes.h>
#endif
#if PLATFORM(IOS_FAMILY)
