Diff
Modified: trunk/Source/WebCore/ChangeLog (232234 => 232235)
--- trunk/Source/WebCore/ChangeLog 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/ChangeLog 2018-05-28 04:17:47 UTC (rev 232235)
@@ -1,3 +1,22 @@
+2018-05-27 Dan Bernstein <[email protected]>
+
+ [Cocoa] Avoid importing directly from subumbrella frameworks
+ https://bugs.webkit.org/show_bug.cgi?id=186016
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/WebCore.xcconfig: Removed -iframework options from OTHER_CFLAGS and
+ OTHER_CPLUSPLUSFLAGS.
+ * editing/mac/DictionaryLookup.mm: Import Quartz.h instead of a PDFKit header.
+ * html/HTMLKeygenElement.cpp: Removed "using namespace WebCore" from this WebCore
+ implementation file.
+ * platform/mac/PlatformEventFactoryMac.mm: Import Carbon.h instead of HIToolbox headers.
+ * platform/mac/PlatformScreenMac.mm: Import ApplicationServices.h instead of ColorSync.h
+ when using SDKs earlier than 10.13.
+ * platform/mediastream/CaptureDeviceManager.cpp: Enclosed the definitions in the WebCore
+ namespace and removed "using namespace WebCore" from this WebCore implementation file.
+ * platform/text/mac/TextEncodingRegistryMac.mm: Import Carbon.h instead of CarbonCore.h.
+
2018-05-27 Fujii Hironori <[email protected]>
REGRESSION(r232198) [WinCairo] cannot convert from 'WTF::StringView' to 'const WTF::String'
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (232234 => 232235)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-05-28 04:17:47 UTC (rev 232235)
@@ -40,9 +40,6 @@
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 (232234 => 232235)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-05-28 04:17:47 UTC (rev 232235)
@@ -1,3 +1,17 @@
+2018-05-27 Dan Bernstein <[email protected]>
+
+ [Cocoa] Avoid importing directly from subumbrella frameworks
+ https://bugs.webkit.org/show_bug.cgi?id=186016
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/PAL.xcconfig: Removed -iframework options from OTHER_CFLAGS and
+ OTHER_CPLUSPLUSFLAGS.
+ * pal/spi/cg/CoreGraphicsSPI.h: Import ApplicationServices.h instead of ColorSync.h
+ when using SDKs earlier than 10.13.
+ * pal/spi/mac/HIToolboxSPI.h: Import CarbonPriv.h instead of HIToolboxPriv.h.
+ * pal/spi/mac/QuickLookMacSPI.h: Import Quartz.h instead of a QuickLookUI header.
+
2018-05-25 Chris Dumez <[email protected]>
Drop support for NSURLCache in WebKit2
Modified: trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig (232234 => 232235)
--- trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2018-05-28 04:17:47 UTC (rev 232235)
@@ -38,7 +38,7 @@
SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
-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_CFLAGS = $(inherited) -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/cg/CoreGraphicsSPI.h (232234 => 232235)
--- trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -33,14 +33,22 @@
#endif
#if PLATFORM(MAC)
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
#include <ColorSync/ColorSync.h>
+#else
+#include <ApplicationServices/ApplicationServices.h>
#endif
+#endif
#if USE(APPLE_INTERNAL_SDK)
#if PLATFORM(MAC)
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
#include <ColorSync/ColorSyncPriv.h>
+#else
+#include <ApplicationServices/ApplicationServicesPriv.h>
#endif
+#endif
#include <CoreGraphics/CGFontCache.h>
#include <CoreGraphics/CoreGraphicsPrivate.h>
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h (232234 => 232235)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -30,7 +30,7 @@
#if USE(APPLE_INTERNAL_SDK)
#if PLATFORM(MAC)
-#import <LaunchServices/LaunchServicesPriv.h>
+#import <ApplicationServices/ApplicationServicesPriv.h>
#elif PLATFORM(IOS)
#import <MobileCoreServices/LSAppLinkPriv.h>
#endif
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h (232234 => 232235)
--- trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -29,9 +29,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <HIServices/AXTextMarker.h>
-#include <HIServices/CoreCursor.h>
-#include <HIServices/CoreDrag.h>
+#include <ApplicationServices/ApplicationServicesPriv.h>
#else
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h (232234 => 232235)
--- trunk/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -27,7 +27,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <HIToolbox/HIToolboxPriv.h>
+#include <Carbon/CarbonPriv.h>
#else
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h (232234 => 232235)
--- trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -27,7 +27,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <Metadata/MetadataPriv.h>
+#include <CoreServices/CoreServicesPriv.h>
#endif
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h (232234 => 232235)
--- trunk/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <QuickLookUI/QLPreviewItem.h>
+#import <Quartz/Quartz.h>
@protocol QLPreviewMenuItemDelegate <NSObject>
@optional
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h (232234 => 232235)
--- trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -27,7 +27,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <SpeechSynthesis/SpeechSynthesisPriv.h>
+#include <ApplicationServices/ApplicationServicesPriv.h>
#endif
Modified: trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (232234 => 232235)
--- trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -35,7 +35,7 @@
#import <pal/spi/mac/NSAccessibilitySPI.h>
#if USE(APPLE_INTERNAL_SDK)
-#include <HIServices/AccessibilityPriv.h>
+#include <ApplicationServices/ApplicationServicesPriv.h>
#endif
#ifndef NSAccessibilityLiveRegionChangedNotification
Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.mm (232234 => 232235)
--- trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -42,7 +42,7 @@
#import "VisiblePosition.h"
#import "VisibleSelection.h"
#import "VisibleUnits.h"
-#import <PDFKit/PDFKit.h>
+#import <Quartz/Quartz.h>
#import <pal/spi/mac/LookupSPI.h>
#import <pal/spi/mac/NSImmediateActionGestureRecognizerSPI.h>
#import <wtf/BlockObjCExceptions.h>
Modified: trunk/Source/WebCore/html/HTMLKeygenElement.cpp (232234 => 232235)
--- trunk/Source/WebCore/html/HTMLKeygenElement.cpp 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/html/HTMLKeygenElement.cpp 2018-05-28 04:17:47 UTC (rev 232235)
@@ -39,8 +39,6 @@
#include <wtf/NeverDestroyed.h>
#include <wtf/StdLibExtras.h>
-using namespace WebCore;
-
namespace WebCore {
WTF_MAKE_ISO_ALLOCATED_IMPL(HTMLKeygenElement);
Modified: trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm (232234 => 232235)
--- trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -33,8 +33,7 @@
#import "PlatformScreen.h"
#import "Scrollbar.h"
#import "WindowsKeyboardCodes.h"
-#import <HIToolbox/CarbonEvents.h>
-#import <HIToolbox/Events.h>
+#import <Carbon/Carbon.h>
#import <mach/mach_time.h>
#import <pal/spi/mac/HIToolboxSPI.h>
#import <pal/spi/mac/NSEventSPI.h>
Modified: trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm (232234 => 232235)
--- trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -32,10 +32,15 @@
#import "FrameView.h"
#import "HostWindow.h"
#import "ScreenProperties.h"
-#import <ColorSync/ColorSync.h>
#import <pal/spi/cg/CoreGraphicsSPI.h>
#import <wtf/ProcessPrivilege.h>
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
+#import <ColorSync/ColorSync.h>
+#else
+#import <ApplicationServices/ApplicationServices.h>
+#endif
+
extern "C" {
bool CGDisplayUsesInvertedPolarity(void);
bool CGDisplayUsesForceToGray(void);
Modified: trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp (232234 => 232235)
--- trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp 2018-05-28 04:17:47 UTC (rev 232235)
@@ -36,7 +36,7 @@
#include <wtf/MainThread.h>
#include <wtf/text/StringHash.h>
-using namespace WebCore;
+namespace WebCore {
CaptureDeviceManager::~CaptureDeviceManager() = default;
@@ -69,5 +69,6 @@
m_observers.remove(token);
}
+} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm (232234 => 232235)
--- trunk/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -28,7 +28,7 @@
#if PLATFORM(MAC)
-#import <CarbonCore/CarbonCore.h>
+#import <Carbon/Carbon.h>
#import <wtf/spi/cf/CFStringSPI.h>
namespace WebCore {
Modified: trunk/Source/WebKit/ChangeLog (232234 => 232235)
--- trunk/Source/WebKit/ChangeLog 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/ChangeLog 2018-05-28 04:17:47 UTC (rev 232235)
@@ -1,3 +1,28 @@
+2018-05-27 Dan Bernstein <[email protected]>
+
+ [Cocoa] Avoid importing directly from subumbrella frameworks
+ https://bugs.webkit.org/show_bug.cgi?id=186016
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/BaseTarget.xcconfig: Removed -iframework options from OTHER_CFLAGS and
+ OTHER_CPLUSPLUSFLAGS.
+ * UIProcess/Automation/mac/WebAutomationSessionMac.mm: Import Carbon.h instead of an
+ HIToolbox header.
+ * UIProcess/Cocoa/WebViewImpl.mm: Ditto.
+ * UIProcess/mac/WKPrintingView.mm: Import Quartz.h instead of a PDFKit header.
+ * UIProcess/mac/WKTextInputWindowController.mm: Import Carbon.h instead of an HIToolbox
+ header.
+ * WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h: Import Quartz.h instead of a
+ PDFKit header.
+ * WebProcess/Plugins/PDF/PDFLayerControllerSPI.h: Ditto.
+ * WebProcess/Plugins/PDF/PDFPlugin.mm: Ditto.
+ * WebProcess/Plugins/PDF/PDFPluginAnnotation.mm: Ditto.
+ * WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm: Ditto.
+ * WebProcess/Plugins/PDF/PDFPluginPasswordField.mm: Ditto.
+ * WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm: Ditto.
+ * WebProcess/WebPage/mac/WebPageMac.mm: Ditto.
+
2018-05-25 Timothy Hatcher <[email protected]>
Setting drawsBackground to YES on a WKView doesn't take effect immediately
Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (232234 => 232235)
--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig 2018-05-28 04:17:47 UTC (rev 232235)
@@ -42,7 +42,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) $(HEADER_SEARCH_PATHS);
-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_CFLAGS = $(inherited) -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 (232234 => 232235)
--- trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -56,7 +56,7 @@
#if PLATFORM(MAC)
#if USE(APPLE_INTERNAL_SDK)
-#import <HIServices/AccessibilityPriv.h>
+#import <ApplicationServices/ApplicationServicesPriv.h>
#else
typedef enum {
AXSuspendStatusRunning = 0,
Modified: trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm (232234 => 232235)
--- trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -37,6 +37,7 @@
#import <WebCore/SystemVersion.h>
#import <mach/mach.h>
#import <mach/task.h>
+#import <pal/spi/cocoa/LaunchServicesSPI.h>
#import <pwd.h>
#import <stdlib.h>
#import <sysexits.h>
@@ -43,13 +44,9 @@
#import <wtf/Scope.h>
#import <wtf/spi/darwin/SandboxSPI.h>
-#if USE(APPLE_INTERNAL_SDK)
-#include <HIServices/ProcessesPriv.h>
-#endif
-
typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef );
extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
-extern "C" CFDictionaryRef _LSApplicationCheckIn(int sessionID, CFDictionaryRef applicationInfo);
+extern "C" CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo);
extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
@@ -78,7 +75,7 @@
void ChildProcess::launchServicesCheckIn()
{
_LSSetApplicationLaunchServicesServerConnectionStatus(0, 0);
- RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(-2, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
+ RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(kLSDefaultSessionID, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
}
void ChildProcess::platformInitialize()
Modified: trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm (232234 => 232235)
--- trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -32,7 +32,7 @@
#import "WebInspectorProxy.h"
#import "WebPageProxy.h"
#import "_WKAutomationSession.h"
-#import <HIToolbox/Events.h>
+#import <Carbon/Carbon.h>
#import <WebCore/IntPoint.h>
#import <WebCore/IntSize.h>
#import <WebCore/PlatformMouseEvent.h>
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (232234 => 232235)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -67,7 +67,7 @@
#import "WebProcessProxy.h"
#import "_WKRemoteObjectRegistryInternal.h"
#import "_WKThumbnailViewInternal.h"
-#import <HIToolbox/CarbonEventsCore.h>
+#import <Carbon/Carbon.h>
#import <WebCore/AXObjectCache.h>
#import <WebCore/ActivityState.h>
#import <WebCore/ColorMac.h>
Modified: trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm (232234 => 232235)
--- trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -34,7 +34,7 @@
#import "PrintInfo.h"
#import "ShareableBitmap.h"
#import "WebPageProxy.h"
-#import <PDFKit/PDFKit.h>
+#import <Quartz/Quartz.h>
#import <WebCore/GraphicsContext.h>
#import <WebCore/WebCoreObjCExtras.h>
#import <wtf/RunLoop.h>
Modified: trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm (232234 => 232235)
--- trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -28,7 +28,7 @@
#if USE(APPKIT)
-#import <HIToolbox/CarbonEventsCore.h>
+#import <Carbon/Carbon.h>
#import <pal/spi/mac/HIToolboxSPI.h>
#import <pal/system/mac/WebPanel.h>
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h (232234 => 232235)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <PDFKit/PDFKit.h>
+#import <Quartz/Quartz.h>
@interface PDFAnnotationTextWidget (Details)
- (BOOL)isMultiline;
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h (232234 => 232235)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -28,7 +28,7 @@
#if ENABLE(PDFKIT_PLUGIN)
-#import <PDFKit/PDFKit.h>
+#import <Quartz/Quartz.h>
@class CPReadingModel;
@class PDFViewLayout;
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm (232234 => 232235)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -50,7 +50,7 @@
#import <_javascript_Core/JSObjectRef.h>
#import <_javascript_Core/JSStringRef.h>
#import <_javascript_Core/JSStringRefCF.h>
-#import <PDFKit/PDFKit.h>
+#import <Quartz/Quartz.h>
#import <QuartzCore/QuartzCore.h>
#import <WebCore/AXObjectCache.h>
#import <WebCore/ArchiveResource.h>
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm (232234 => 232235)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -33,7 +33,7 @@
#import "PDFPlugin.h"
#import "PDFPluginChoiceAnnotation.h"
#import "PDFPluginTextAnnotation.h"
-#import <PDFKit/PDFKit.h>
+#import <Quartz/Quartz.h>
#import <WebCore/CSSPrimitiveValue.h>
#import <WebCore/CSSPropertyNames.h>
#import <WebCore/ColorMac.h>
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm (232234 => 232235)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -30,7 +30,7 @@
#import "PDFKitImports.h"
#import "PDFLayerControllerSPI.h"
-#import <PDFKit/PDFKit.h>
+#import <Quartz/Quartz.h>
#import <WebCore/CSSPrimitiveValue.h>
#import <WebCore/CSSPropertyNames.h>
#import <WebCore/ColorMac.h>
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm (232234 => 232235)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -31,7 +31,7 @@
#import "PDFKitImports.h"
#import "PDFLayerControllerSPI.h"
#import "PDFPlugin.h"
-#import <PDFKit/PDFKit.h>
+#import <Quartz/Quartz.h>
#import <WebCore/Event.h>
#import <WebCore/EventNames.h>
#import <WebCore/HTMLElement.h>
Modified: trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm (232234 => 232235)
--- trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -32,7 +32,7 @@
#import "PDFKitImports.h"
#import "PDFLayerControllerSPI.h"
#import "PDFPlugin.h"
-#import <PDFKit/PDFKit.h>
+#import <Quartz/Quartz.h>
#import <WebCore/CSSPrimitiveValue.h>
#import <WebCore/CSSPropertyNames.h>
#import <WebCore/ColorMac.h>
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm (232234 => 232235)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -53,7 +53,7 @@
#import "WebPasteboardOverrides.h"
#import "WebPreferencesStore.h"
#import "WebProcess.h"
-#import <PDFKit/PDFKit.h>
+#import <Quartz/Quartz.h>
#import <QuartzCore/QuartzCore.h>
#import <WebCore/AXObjectCache.h>
#import <WebCore/BackForwardController.h>
Modified: trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h (232234 => 232235)
--- trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -28,8 +28,7 @@
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
-#import <HIToolbox/CarbonEvents.h>
-#import <HIToolbox/MacWindows.h>
+#import <Carbon/Carbon.h>
@interface CarbonWindowAdapter : NSWindow
{
Modified: trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm (232234 => 232235)
--- trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -65,9 +65,7 @@
#import <AppKit/AppKit.h>
//#import <CoreGraphics/CGSWindow.h>
-#import <HIToolbox/CarbonEvents.h>
-#import <HIToolbox/Controls.h>
-#import <HIToolbox/HIView.h>
+#import <Carbon/Carbon.h>
#import <assert.h>
#import <_javascript_Core/InitializeThreading.h>
Modified: trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m (232234 => 232235)
--- trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m 2018-05-28 04:17:47 UTC (rev 232235)
@@ -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 (232234 => 232235)
--- trunk/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -27,7 +27,7 @@
*/
#import <WebKitLegacy/WebKit.h>
-#include <HIToolbox/HIView.h>
+#include <Carbon/Carbon.h>
@interface HIViewAdapter : NSObject
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (232234 => 232235)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-05-28 04:17:47 UTC (rev 232235)
@@ -1,3 +1,20 @@
+2018-05-27 Dan Bernstein <[email protected]>
+
+ [Cocoa] Avoid importing directly from subumbrella frameworks
+ https://bugs.webkit.org/show_bug.cgi?id=186016
+
+ Reviewed by Sam Weinig.
+
+ * Carbon/CarbonWindowAdapter.h: Import Carbon.h instead of HIToolbox headers.
+ * Carbon/CarbonWindowAdapter.mm: Ditto.
+ * Carbon/CarbonWindowFrame.m: Ditto.
+ * Carbon/HIViewAdapter.h: Ditto.
+ * Configurations/WebKitLegacy.xcconfig: Removed -iframework options from OTHER_CFLAGS and
+ OTHER_CPLUSPLUSFLAGS.
+ * Plugins/WebNetscapePluginEventHandlerCarbon.mm: Import Carbon.h instead of CarbonEvents.h.
+ * WebView/WebPDFDocumentExtras.mm: Import Quartz.h instead of a PDFKit header.
+ * WebView/WebPDFView.h: Ditto.
+
2018-05-27 Sam Weinig <[email protected]>
Modernize RenderStyleConstants.h - Part 3
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (232234 => 232235)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2018-05-28 04:17:47 UTC (rev 232235)
@@ -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 -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_CFLAGS_COCOA_TOUCH_NO = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm (232234 => 232235)
--- trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -29,7 +29,7 @@
#import "WebNetscapePluginView.h"
#import "WebKitLogging.h"
-#import <HIToolbox/CarbonEvents.h>
+#import <Carbon/Carbon.h>
#import <pal/spi/mac/HIToolboxSPI.h>
#import <pal/spi/mac/NSEventSPI.h>
Modified: trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h (232234 => 232235)
--- trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -25,7 +25,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#import <PDFKit/PDFViewPriv.h>
+#import <Quartz/QuartzPrivate.h>
#else
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm (232234 => 232235)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -30,7 +30,7 @@
#import <wtf/RetainPtr.h>
#if !PLATFORM(IOS)
-#import <PDFKit/PDFDocument.h>
+#import <Quartz/Quartz.h>
#endif
static void appendValuesInPDFNameSubtreeToVector(CGPDFDictionaryRef subtree, Vector<CGPDFObjectRef>& values)
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h (232234 => 232235)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h 2018-05-28 04:17:47 UTC (rev 232235)
@@ -28,7 +28,7 @@
#if !PLATFORM(IOS)
-#import <PDFKit/PDFKit.h>
+#import <Quartz/Quartz.h>
#import <WebKitLegacy/WebDocumentInternal.h>
@class WebDataSource;
Modified: trunk/Tools/ChangeLog (232234 => 232235)
--- trunk/Tools/ChangeLog 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Tools/ChangeLog 2018-05-28 04:17:47 UTC (rev 232235)
@@ -1,3 +1,25 @@
+2018-05-27 Dan Bernstein <[email protected]>
+
+ [Cocoa] Avoid importing directly from subumbrella frameworks
+ https://bugs.webkit.org/show_bug.cgi?id=186016
+
+ Reviewed by Sam Weinig.
+
+ * DumpRenderTree/cg/PixelDumpSupportCG.cpp: Include CoreServices.h instead of a
+ LaunchServices header.
+ * DumpRenderTree/mac/Configurations/BaseTarget.xcconfig: Removed -iframework options from
+ OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
+ * DumpRenderTree/mac/LayoutTestHelper.m: Import ApplicationServices.h instead of ColorSync.h
+ when using SDKs earlier than 10.13.
+ * TestWebKitAPI/Configurations/Base.xcconfig: Removed -iframework options from OTHER_CFLAGS
+ and OTHER_CPLUSPLUSFLAGS.
+ * TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm: Import Carbon.h instead of an
+ HIToolbox header.
+ * WebKitTestRunner/Configurations/BaseTarget.xcconfig: Removed -iframework options from
+ OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
+ * WebKitTestRunner/cg/TestInvocationCG.cpp: Include CoreServices.h instead of a
+ LaunchServices header.
+
2018-05-27 Fujii Hironori <[email protected]>
[Win][MiniBrowser] Add MainWindow class
Modified: trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp (232234 => 232235)
--- trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp 2018-05-28 04:17:47 UTC (rev 232235)
@@ -47,7 +47,7 @@
#define COMMON_DIGEST_FOR_OPENSSL
#include <CommonCrypto/CommonDigest.h>
#elif PLATFORM(MAC)
-#include <LaunchServices/UTCoreTypes.h>
+#include <CoreServices/CoreServices.h>
#define COMMON_DIGEST_FOR_OPENSSL
#include <CommonCrypto/CommonDigest.h>
#endif
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig (232234 => 232235)
--- trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig 2018-05-28 04:17:47 UTC (rev 232235)
@@ -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/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_CFLAGS = $(inherited) -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 (232234 => 232235)
--- trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2018-05-28 04:17:47 UTC (rev 232235)
@@ -43,7 +43,11 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <ColorSync/ColorSyncPriv.h>
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
+#import <ColorSync/ColorSyncPriv.h>
+#else
+#import <ApplicationServices/ApplicationServicesPriv.h>
+#endif
#else
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (232234 => 232235)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2018-05-28 04:17:47 UTC (rev 232235)
@@ -97,7 +97,7 @@
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *Mac.h *Mac.cpp *Mac.mm */mac/*;
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
-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_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
Modified: trunk/Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm (232234 => 232235)
--- trunk/Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm 2018-05-28 04:17:47 UTC (rev 232235)
@@ -29,7 +29,7 @@
#import "PlatformUtilities.h"
#import "WebCoreTestSupport.h"
-#import <HIToolbox/CarbonEvents.h>
+#import <Carbon/Carbon.h>
#import <IOKit/pwr_mgt/IOPMLib.h>
#import <_javascript_Core/JSContext.h>
#import <WebCore/Settings.h>
Modified: trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig (232234 => 232235)
--- trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2018-05-28 04:17:47 UTC (rev 232235)
@@ -21,6 +21,4 @@
// (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 (232234 => 232235)
--- trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2018-05-28 03:49:08 UTC (rev 232234)
+++ trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp 2018-05-28 04:17:47 UTC (rev 232235)
@@ -35,7 +35,7 @@
#include <wtf/RetainPtr.h>
#if PLATFORM(MAC) && !PLATFORM(IOS)
-#include <LaunchServices/UTCoreTypes.h>
+#include <CoreServices/CoreServices.h>
#endif
#if PLATFORM(IOS)
