Reverted the changes made for https://webkit.org/b/186016
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 May 2018 05:31:57 +0000 (05:31 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 28 May 2018 05:31:57 +0000 (05:31 +0000)
They broke the USE(APPLE_INTERNAL_SDK) Sierra build.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232239 268f45cc-cd09-0410-ab3c-d52691b4dbfc

53 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Configurations/WebCore.xcconfig
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/PAL.xcconfig
Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h
Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h
Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h
Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h
Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h
Source/WebCore/PAL/pal/spi/mac/QuickDrawSPI.h
Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h
Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h
Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
Source/WebCore/editing/mac/DictionaryLookup.mm
Source/WebCore/html/HTMLKeygenElement.cpp
Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
Source/WebCore/platform/mac/PlatformScreenMac.mm
Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp
Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm
Source/WebKit/ChangeLog
Source/WebKit/Configurations/BaseTarget.xcconfig
Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
Source/WebKit/Shared/mac/ChildProcessMac.mm
Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm
Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
Source/WebKit/UIProcess/mac/WKPrintingView.mm
Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm
Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h
Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h
Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm
Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm
Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm
Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm
Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h
Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm
Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m
Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm
Source/WebKitLegacy/mac/WebView/PDFViewSPI.h
Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm
Source/WebKitLegacy/mac/WebView/WebPDFView.h
Tools/ChangeLog
Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp
Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig
Tools/DumpRenderTree/mac/LayoutTestHelper.m
Tools/TestWebKitAPI/Configurations/Base.xcconfig
Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm
Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig
Tools/WebKitTestRunner/cg/TestInvocationCG.cpp

index 5e86525..c9252d6 100644 (file)
@@ -1,3 +1,9 @@
+2018-05-27  Dan Bernstein  <mitz@apple.com>
+
+        Reverted the changes made for https://webkit.org/b/186016
+
+        They broke the USE(APPLE_INTERNAL_SDK) Sierra build.
+
 2018-05-27  David Kilzer  <ddkilzer@apple.com>
 
         [iOS] Fix warnings about leaks found by clang static analyzer
index ad59537..8eb91d9 100644 (file)
@@ -40,6 +40,9 @@ FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR);
 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;
index 25f0265..cc191de 100644 (file)
@@ -1,28 +1,8 @@
 2018-05-27  Dan Bernstein  <mitz@apple.com>
 
-        Tried to fix the pre-High Sierra USE(APPLE_INTERNAL_SDK) build
+        Reverted the changes made for https://webkit.org/b/186016
 
-        * pal/spi/cg/CoreGraphicsSPI.h: #undef confirm, which is defined by ApplicationServicesPriv.h.
-
-2018-05-27  Dan Bernstein  <mitz@apple.com>
-
-        Tried to fix the 32-bit USE(APPLE_INTERNAL_SDK) build.
-
-        * pal/spi/mac/QuickDrawSPI.h: Import ApplicationServicesPriv.h instead of QuickDrawPriv.h.
-
-2018-05-27  Dan Bernstein  <mitz@apple.com>
-
-        [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.
+        They broke the USE(APPLE_INTERNAL_SDK) Sierra build.
 
 2018-05-25  Chris Dumez  <cdumez@apple.com>
 
index e2b0cae..7b19144 100644 (file)
@@ -38,7 +38,7 @@ FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR);
 
 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);
index 01f416c..c0fa823 100644 (file)
 #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>
-#ifdef confirm
-#undef confirm
-#endif
-#endif
 #endif
 #include <CoreGraphics/CGFontCache.h>
 #include <CoreGraphics/CoreGraphicsPrivate.h>
index 7d3719c..1475782 100644 (file)
@@ -30,7 +30,7 @@
 #if USE(APPLE_INTERNAL_SDK)
 
 #if PLATFORM(MAC)
-#import <ApplicationServices/ApplicationServicesPriv.h>
+#import <LaunchServices/LaunchServicesPriv.h>
 #elif PLATFORM(IOS)
 #import <MobileCoreServices/LSAppLinkPriv.h>
 #endif
index 8c291a8..aad4349 100644 (file)
@@ -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
 
index fb6000d..af8fe63 100644 (file)
@@ -27,7 +27,7 @@
 
 #if USE(APPLE_INTERNAL_SDK)
 
-#include <Carbon/CarbonPriv.h>
+#include <HIToolbox/HIToolboxPriv.h>
 
 #else
 
index 815547c..2e1912e 100644 (file)
@@ -27,7 +27,7 @@
 
 #if USE(APPLE_INTERNAL_SDK)
 
-#include <CoreServices/CoreServicesPriv.h>
+#include <Metadata/MetadataPriv.h>
 
 #endif
 
index 013b7ca..90d87a7 100644 (file)
@@ -29,7 +29,7 @@
 
 #if USE(APPLE_INTERNAL_SDK)
 
-#include <ApplicationServices/ApplicationServicesPriv.h>
+#include <QD/QuickdrawPriv.h>
 
 #else
 
index c1c5265..cc5f415 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Quartz/Quartz.h>
+#import <QuickLookUI/QLPreviewItem.h>
 
 @protocol QLPreviewMenuItemDelegate <NSObject>
 @optional
index c7b79e7..7b777d0 100644 (file)
@@ -27,7 +27,7 @@
 
 #if USE(APPLE_INTERNAL_SDK)
 
-#include <ApplicationServices/ApplicationServicesPriv.h>
+#include <SpeechSynthesis/SpeechSynthesisPriv.h>
 
 #endif
 
index 431868d..399177f 100644 (file)
@@ -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
index a434fbb..93e74c8 100644 (file)
@@ -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>
index 8cdd4af..60ac275 100644 (file)
@@ -39,6 +39,8 @@
 #include <wtf/NeverDestroyed.h>
 #include <wtf/StdLibExtras.h>
 
+using namespace WebCore;
+
 namespace WebCore {
 
 WTF_MAKE_ISO_ALLOCATED_IMPL(HTMLKeygenElement);
index 8f1e8a4..8de9fbb 100644 (file)
@@ -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>
index e50fdab..c31add9 100644 (file)
 #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);
index 4eff211..cd147a0 100644 (file)
@@ -36,7 +36,7 @@
 #include <wtf/MainThread.h>
 #include <wtf/text/StringHash.h>
 
-namespace WebCore {
+using namespace WebCore;
 
 CaptureDeviceManager::~CaptureDeviceManager() = default;
 
@@ -69,6 +69,5 @@ void CaptureDeviceManager::removeCaptureDeviceChangedObserver(ObserverToken toke
     m_observers.remove(token);
 }
 
-} // namespace WebCore
 
 #endif // ENABLE(MEDIA_STREAM)
index 6324b50..93bd1d4 100644 (file)
@@ -28,7 +28,7 @@
 
 #if PLATFORM(MAC)
 
-#import <Carbon/Carbon.h>
+#import <CarbonCore/CarbonCore.h>
 #import <wtf/spi/cf/CFStringSPI.h>
 
 namespace WebCore {
index 9bb8515..8fcf687 100644 (file)
@@ -1,3 +1,9 @@
+2018-05-27  Dan Bernstein  <mitz@apple.com>
+
+        Reverted the changes made for https://webkit.org/b/186016
+
+        They broke the USE(APPLE_INTERNAL_SDK) Sierra build.
+
 2018-05-27  David Kilzer  <ddkilzer@apple.com>
 
         [iOS] Fix warnings about leaks found by clang static analyzer
index fd3cb76..0b91c17 100644 (file)
@@ -42,7 +42,7 @@ LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $
 
 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)/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));
index 41fb1bc..1f7b7b7 100644 (file)
@@ -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,
index 4bb4244..aed5b9f 100644 (file)
 #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>
 #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(LSSessionID sessionID, CFDictionaryRef applicationInfo);
+extern "C" CFDictionaryRef _LSApplicationCheckIn(int sessionID, CFDictionaryRef applicationInfo);
 
 extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
 
@@ -75,7 +78,7 @@ void ChildProcess::setApplicationIsDaemon()
 void ChildProcess::launchServicesCheckIn()
 {
     _LSSetApplicationLaunchServicesServerConnectionStatus(0, 0);
-    RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(kLSDefaultSessionID, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
+    RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(-2, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
 }
 
 void ChildProcess::platformInitialize()
index 0aa8426..f460a38 100644 (file)
@@ -32,7 +32,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>
index 671b10a..96b889b 100644 (file)
@@ -67,7 +67,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>
index 317098a..934297f 100644 (file)
@@ -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/WebCoreObjCExtras.h>
 #import <wtf/RunLoop.h>
index 92433af..f6f1511 100644 (file)
@@ -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>
 
index ea91a1f..8656ff4 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
 
 @interface PDFAnnotationTextWidget (Details)
 - (BOOL)isMultiline;
index bd9cf54..aadfa7a 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(PDFKIT_PLUGIN)
 
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
 
 @class CPReadingModel;
 @class PDFViewLayout;
index 299342a..c1ac4d5 100644 (file)
@@ -50,7 +50,7 @@
 #import <JavaScriptCore/JSObjectRef.h>
 #import <JavaScriptCore/JSStringRef.h>
 #import <JavaScriptCore/JSStringRefCF.h>
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
 #import <QuartzCore/QuartzCore.h>
 #import <WebCore/AXObjectCache.h>
 #import <WebCore/ArchiveResource.h>
index 03e5103..3363e1c 100644 (file)
@@ -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>
index 062a4e8..dbe5ae9 100644 (file)
@@ -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>
index 1bc3595..f481bf7 100644 (file)
@@ -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>
index 302c787..1839f7c 100644 (file)
@@ -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>
index 7f5a604..c9a4081 100644 (file)
@@ -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>
index 3f4ae1b..407ee67 100644 (file)
@@ -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 
 {
index e14d422..d1522f3 100644 (file)
@@ -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 <JavaScriptCore/InitializeThreading.h>
index 4013ce4..ac2a5f7 100644 (file)
@@ -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"
 
index 2b69b01..33677fc 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #import <WebKitLegacy/WebKit.h>
-#include <Carbon/Carbon.h>
+#include <HIToolbox/HIView.h>
 
 @interface HIViewAdapter : NSObject
 
index 9352a20..e778550 100644 (file)
@@ -1,3 +1,10 @@
+2018-05-27  Dan Bernstein  <mitz@apple.com>
+
+        Reverted the changes made for https://webkit.org/b/186016
+
+        They broke the USE(APPLE_INTERNAL_SDK) Sierra build.
+
+
 2018-05-27  David Kilzer  <ddkilzer@apple.com>
 
         [iOS] Fix warnings about leaks found by clang static analyzer
index b020117..a1a076e 100644 (file)
@@ -48,7 +48,7 @@ SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Pri
 
 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;
index e177593..19328bb 100644 (file)
@@ -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>
 
index f688dda..d396bb9 100644 (file)
@@ -25,7 +25,7 @@
 
 #if USE(APPLE_INTERNAL_SDK)
 
-#import <Quartz/QuartzPrivate.h>
+#import <PDFKit/PDFViewPriv.h>
 
 #else
 
index 7f1ddcc..5a43f38 100644 (file)
@@ -30,7 +30,7 @@
 #import <wtf/RetainPtr.h>
 
 #if !PLATFORM(IOS)
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFDocument.h>
 #endif
 
 static void appendValuesInPDFNameSubtreeToVector(CGPDFDictionaryRef subtree, Vector<CGPDFObjectRef>& values)
index 2ce5075..633b4ff 100644 (file)
@@ -28,7 +28,7 @@
 
 #if !PLATFORM(IOS)
 
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
 #import <WebKitLegacy/WebDocumentInternal.h>
 
 @class WebDataSource;
index 2ada8a5..3c46efb 100644 (file)
@@ -1,5 +1,11 @@
 2018-05-27  Dan Bernstein  <mitz@apple.com>
 
+        Reverted the changes made for https://webkit.org/b/186016
+
+        They broke the USE(APPLE_INTERNAL_SDK) Sierra build.
+
+2018-05-27  Dan Bernstein  <mitz@apple.com>
+
         [Cocoa] Avoid importing directly from subumbrella frameworks
         https://bugs.webkit.org/show_bug.cgi?id=186016
 
index 791ff9d..abf7f89 100644 (file)
@@ -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
index 3fe5242..063c766 100644 (file)
@@ -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;
index 9887aaa..88aa86f 100644 (file)
 
 #if USE(APPLE_INTERNAL_SDK)
 
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
-#import <ColorSync/ColorSyncPriv.h>
-#else
-#import <ApplicationServices/ApplicationServicesPriv.h>
-#endif
+#include <ColorSync/ColorSyncPriv.h>
 
 #else
 
index 0b52b4b..d6a8442 100644 (file)
@@ -97,7 +97,7 @@ EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm;
 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)/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);
 
index a0ad6ef..fccfbad 100644 (file)
@@ -29,7 +29,7 @@
 
 #import "PlatformUtilities.h"
 #import "WebCoreTestSupport.h"
-#import <Carbon/Carbon.h>
+#import <HIToolbox/CarbonEvents.h>
 #import <IOKit/pwr_mgt/IOPMLib.h>
 #import <JavaScriptCore/JSContext.h>
 #import <WebCore/Settings.h>
index 3b58539..bcfe919 100644 (file)
@@ -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;
index 682dac5..7603d37 100644 (file)
@@ -35,7 +35,7 @@
 #include <wtf/RetainPtr.h>
 
 #if PLATFORM(MAC) && !PLATFORM(IOS)
-#include <CoreServices/CoreServices.h>
+#include <LaunchServices/UTCoreTypes.h>
 #endif
 
 #if PLATFORM(IOS)