Unreviewed, rolling out r239901, r239909, r239910, r239912,
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Jan 2019 22:19:50 +0000 (22:19 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Jan 2019 22:19:50 +0000 (22:19 +0000)
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

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

49 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/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/cocoa/DictionaryLookup.mm
Source/WebCore/editing/mac/DictionaryLookupLegacy.mm
Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
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/WebKitTestRunner/Configurations/BaseTarget.xcconfig
Tools/WebKitTestRunner/cg/TestInvocationCG.cpp

index 95996f0..5a29d0c 100644 (file)
@@ -1,3 +1,33 @@
+2019-01-14  Commit Queue  <commit-queue@webkit.org>
+
+        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  <mark.lam@apple.com>
 
         Re-enable ability to build --cloop builds.
index 15e4ee3..ab84e89 100644 (file)
@@ -38,6 +38,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 c9cbcf0..7877390 100644 (file)
@@ -1,3 +1,33 @@
+2019-01-14  Commit Queue  <commit-queue@webkit.org>
+
+        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  <mark.lam@apple.com>
 
         Re-enable ability to build --cloop builds.
index c3aa1af..95fa0cc 100644 (file)
@@ -33,7 +33,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 69ff852..6ccd58b 100644 (file)
@@ -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
index 4fc71ed..45ed94e 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 f754976..d476e0a 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 7bbdbab..671ac9a 100644 (file)
 #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)
 
index 0fe3704..32551c1 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 09d1d67..1c7c49c 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 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 23be8fd..f23905d 100644 (file)
@@ -1,3 +1,33 @@
+2019-01-14  Commit Queue  <commit-queue@webkit.org>
+
+        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  <mark.lam@apple.com>
 
         Re-enable ability to build --cloop builds.
index 46b4124..405d63b 100644 (file)
@@ -40,7 +40,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) $(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));
index 50416b8..94cc953 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 e15d4df..20c4a9c 100644 (file)
@@ -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::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 dfc9093..1937518 100644 (file)
@@ -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>
index 7f512db..da2e32f 100644 (file)
@@ -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>
index f89d4ee..aa53743 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/LocalDefaultSystemAppearance.h>
 #import <WebCore/WebCoreObjCExtras.h>
index f648f94..be96ca2 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 9a589b0..5bfc261 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(PDFKIT_PLUGIN)
 
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
 
 @class CPReadingModel;
 @class PDFViewLayout;
index 3467b3f..74ba537 100644 (file)
@@ -48,7 +48,7 @@
 #import "WebProcess.h"
 #import <JavaScriptCore/JSContextRef.h>
 #import <JavaScriptCore/JSObjectRef.h>
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
 #import <QuartzCore/QuartzCore.h>
 #import <WebCore/AXObjectCache.h>
 #import <WebCore/ArchiveResource.h>
index 86ddbd9..63f2970 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 d344bcc..100a036 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 5365b97..e78689f 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 9b8314d..be0603f 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 daa5349..e59b681 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 d9bd0a6..272e1dd 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 2a6fac0..a7cbf33 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 6a86cf6..41e0d31 100644 (file)
@@ -1,3 +1,33 @@
+2019-01-14  Commit Queue  <commit-queue@webkit.org>
+
+        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  <mark.lam@apple.com>
 
         Re-enable ability to build --cloop builds.
index 3e3ba36..8fe026e 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 c66ec66..1c8d415 100644 (file)
@@ -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)
index c5c8a01..c9645a0 100644 (file)
@@ -28,7 +28,7 @@
 
 #if !PLATFORM(IOS_FAMILY)
 
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
 #import <WebKitLegacy/WebDocumentInternal.h>
 
 @class WebDataSource;
index 09f522b..9b4d5e2 100644 (file)
@@ -1,3 +1,33 @@
+2019-01-14  Commit Queue  <commit-queue@webkit.org>
+
+        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  <mark.lam@apple.com>
 
         Re-enable ability to build --cloop builds.
index 7ec595c..94c4fe5 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 8476322..276a97a 100644 (file)
@@ -43,7 +43,7 @@
 
 #if USE(APPLE_INTERNAL_SDK)
 
-#import <ColorSync/ColorSyncPriv.h>
+#include <ColorSync/ColorSyncPriv.h>
 
 #else
 
index 3eb168c..f0c6a8a 100644 (file)
@@ -101,7 +101,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) --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);
 
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 fc9cf7f..acf3843 100644 (file)
@@ -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)