Attachment 359077 Details for Bug 193407 – ROLLOUT of r239901

[patch] ROLLOUT of r239901

bug-193407-20190114141252.patch (text/plain), 36.70 KB, created by WebKit Commit Bot on 2019-01-14 14:12:53 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-01-14 14:12:53 PST

Size: 36.70 KB

patch

obsolete

>Subversion Revision: 239946
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index efa5447f0a667f4a8065160cd0d253f7ed5bdb5d..57ac5de749f2fd4c322dc325a4f70f2937a72397 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -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  Jer Noble  <jer.noble@apple.com>
> 
>         https://bugs.webkit.org/show_bug.cgi?id=193403
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index a243e43b4784de46d9cf979d07a23a5533843e25..d6dfc46d12f2f23c2e651bcf35830761776c728f 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -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-13  Dan Bernstein  <mitz@apple.com>
> 
>         Tried to fix USE(APPLE_INTERNAL_SDK) 32-bit builds.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index fde389f0cc1257cfd869f404b5843bd2595eccf5..4a1f3303840d19b67d6a5cba5e70c6127d83dd02 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -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  Alex Christensen  <achristensen@webkit.org>
> 
>         Remove unused networking entitlement from iOS WebProcess entitlements
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 79c29be5c4cca5817a0d8621a9ecbdafc0da6743..c15f3f8cf6c7b3dc6512fb3855e967ede7378a75 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -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-13  Dan Bernstein  <mitz@apple.com>
> 
>         Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901.
>diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
>index 15e4ee3a2c2046f24c890a5678971e62d7ebff11..ab84e890de20b2ebcc6a823dc6de5e37ed126764 100644
>--- a/Source/WebCore/Configurations/WebCore.xcconfig
>+++ b/Source/WebCore/Configurations/WebCore.xcconfig
>@@ -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;
>diff --git a/Source/WebCore/PAL/Configurations/PAL.xcconfig b/Source/WebCore/PAL/Configurations/PAL.xcconfig
>index c3aa1aff15e817591842f68f91a3d08608383fa3..95fa0ccfc41831f800a1fba057005d251c971821 100644
>--- a/Source/WebCore/PAL/Configurations/PAL.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/PAL.xcconfig
>@@ -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);
>diff --git a/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h
>index 69ff8526c1bf66f1af2629159008bf07551a868b..6ccd58bb849ed46a4ed261fd828dc9bbbeb07e25 100644
>--- a/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h
>@@ -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
>diff --git a/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h b/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h
>index 4fc71edb6fc0728e38d2974a14f6ca5099baf638..45ed94eb1611892640110326fe2528cf17755940 100644
>--- a/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h
>@@ -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
> 
>diff --git a/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h b/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h
>index fb6000d73e91657998d8dfcf956a53c42dbd5fd8..af8fe630f5ccc7168bc3d7c9ae732d19329236fa 100644
>--- a/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h
>@@ -27,7 +27,7 @@
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>-#include <Carbon/CarbonPriv.h>
>+#include <HIToolbox/HIToolboxPriv.h>
> 
> #else
> 
>diff --git a/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h b/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h
>index 815547c6b8510e30618e2282ad5b784016ca3721..2e1912ef9f6c84c775abedd5091707515a24f92f 100644
>--- a/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h
>@@ -27,7 +27,7 @@
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>-#include <CoreServices/CoreServicesPriv.h>
>+#include <Metadata/MetadataPriv.h>
> 
> #endif
> 
>diff --git a/Source/WebCore/PAL/pal/spi/mac/QuickDrawSPI.h b/Source/WebCore/PAL/pal/spi/mac/QuickDrawSPI.h
>index 013b7ca57fdba0b1cd27a67e02a030f1fa528fe7..90d87a7d136389982a15edd9f1f571fef9994a22 100644
>--- a/Source/WebCore/PAL/pal/spi/mac/QuickDrawSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/mac/QuickDrawSPI.h
>@@ -29,7 +29,7 @@
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>-#include <ApplicationServices/ApplicationServicesPriv.h>
>+#include <QD/QuickdrawPriv.h>
> 
> #else
> 
>diff --git a/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h b/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h
>index c1c5265b4d3322952b50493e10143e583586b029..cc5f4154c20ab33a36ba69805bee7309d940a4f6 100644
>--- a/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h
>@@ -23,7 +23,7 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import <Quartz/Quartz.h>
>+#import <QuickLookUI/QLPreviewItem.h>
> 
> @protocol QLPreviewMenuItemDelegate <NSObject>
> @optional
>diff --git a/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h b/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h
>index c7b79e7a41e4a8ee04236cab9de2091738a8ac43..7b777d0a8d98fdafac6468657e2c20e9979c117e 100644
>--- a/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h
>@@ -27,7 +27,7 @@
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>-#include <ApplicationServices/ApplicationServicesPriv.h>
>+#include <SpeechSynthesis/SpeechSynthesisPriv.h>
> 
> #endif
> 
>diff --git a/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm b/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
>index f754976b4865a05c531f60fcd4545de715aabe77..d476e0ae734cc157cdbc8fad583bdc8a1fafae64 100644
>--- a/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
>+++ b/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
>@@ -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
>diff --git a/Source/WebCore/editing/cocoa/DictionaryLookup.mm b/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>index 7bbdbabf17b5ce5b9ed97dc6844d0f2fd38585bc..671ac9ab30a59fda8941f3845c3ea8bba9e54f21 100644
>--- a/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>+++ b/Source/WebCore/editing/cocoa/DictionaryLookup.mm
>@@ -50,11 +50,11 @@
> #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)
> 
>diff --git a/Source/WebCore/editing/mac/DictionaryLookupLegacy.mm b/Source/WebCore/editing/mac/DictionaryLookupLegacy.mm
>index 0fe3704b5d68d374de71818a3863c2a467833084..32551c12e79efe20f3ec36c1b040a53bd5722423 100644
>--- a/Source/WebCore/editing/mac/DictionaryLookupLegacy.mm
>+++ b/Source/WebCore/editing/mac/DictionaryLookupLegacy.mm
>@@ -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>
>diff --git a/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm b/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
>index 09d1d678d9e697c62432426673c4893b77be425d..1c7c49ca149d47735d0c6e43f92c3c0e25ec477f 100644
>--- a/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
>+++ b/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
>@@ -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>
>diff --git a/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm b/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm
>index 6324b5077e14b73b16ae40d95ec8804521e96627..93bd1d4001d075faa6968feb03ab473ed89f6112 100644
>--- a/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm
>+++ b/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm
>@@ -28,7 +28,7 @@
> 
> #if PLATFORM(MAC)
> 
>-#import <Carbon/Carbon.h>
>+#import <CarbonCore/CarbonCore.h>
> #import <wtf/spi/cf/CFStringSPI.h>
> 
> namespace WebCore {
>diff --git a/Source/WebKit/Configurations/BaseTarget.xcconfig b/Source/WebKit/Configurations/BaseTarget.xcconfig
>index 46b412403e3ba70a99630fa555e50ef858c2bcb5..405d63bbb012a39e65da8ba8b8908358a258bd6c 100644
>--- a/Source/WebKit/Configurations/BaseTarget.xcconfig
>+++ b/Source/WebKit/Configurations/BaseTarget.xcconfig
>@@ -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));
>diff --git a/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm b/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
>index 50416b84114ab930eb4e628a3951417825a89e12..94cc953b4e4acb22a0596673cf15b7255d88a434 100644
>--- a/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
>+++ b/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
>@@ -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,
>diff --git a/Source/WebKit/Shared/mac/ChildProcessMac.mm b/Source/WebKit/Shared/mac/ChildProcessMac.mm
>index e15d4dffc520c84a253e089e3c7925e67f467a11..20c4a9c1a42776e667110b6160a882593388f5a1 100644
>--- a/Source/WebKit/Shared/mac/ChildProcessMac.mm
>+++ b/Source/WebKit/Shared/mac/ChildProcessMac.mm
>@@ -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()
>diff --git a/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm b/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm
>index dfc909316e250d511c6537e6d994147985808af7..1937518dbf32b7b28e10686e28d583d6c3a97863 100644
>--- a/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm
>+++ b/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm
>@@ -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>
>diff --git a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>index 7f512db21beb632fbaf13c2844960bc0821c2acb..da2e32f2548f1d56a60b6560adbef569376661d5 100644
>--- a/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>+++ b/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>@@ -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>
>diff --git a/Source/WebKit/UIProcess/mac/WKPrintingView.mm b/Source/WebKit/UIProcess/mac/WKPrintingView.mm
>index f89d4eeb1d88bc70aff7ba0e4fbff23a579e6cc2..aa5374319e8c1f43658f0dd77373c373d8933065 100644
>--- a/Source/WebKit/UIProcess/mac/WKPrintingView.mm
>+++ b/Source/WebKit/UIProcess/mac/WKPrintingView.mm
>@@ -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>
>diff --git a/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm b/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm
>index f648f940735e65af997711c5ca5928267bf597cb..be96ca2800aa1504e5836827d7dcf06f774f66de 100644
>--- a/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm
>+++ b/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm
>@@ -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>
> 
>diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h b/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h
>index ea91a1f4510c9e333006270b822bcdf107f870ef..8656ff466d8bc5eac72a66ff5280a004510e66e0 100644
>--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h
>+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h
>@@ -23,7 +23,7 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import <Quartz/Quartz.h>
>+#import <PDFKit/PDFKit.h>
> 
> @interface PDFAnnotationTextWidget (Details)
> - (BOOL)isMultiline;
>diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h b/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h
>index 9a589b08c1d4ed7d542a0b2db9698d74983254ef..5bfc261e94b90686acadad9568f23cd981590f83 100644
>--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h
>+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h
>@@ -28,7 +28,7 @@
> 
> #if ENABLE(PDFKIT_PLUGIN)
> 
>-#import <Quartz/Quartz.h>
>+#import <PDFKit/PDFKit.h>
> 
> @class CPReadingModel;
> @class PDFViewLayout;
>diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
>index 3467b3fecf911c071655a2eccf6942b00397dcac..74ba537709cb6d7e05057f8fa1ba8601c969533c 100644
>--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
>+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
>@@ -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>
>diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm
>index 86ddbd9559913d1f3fc404948daafe656e3d682f..63f297037807eadeb0fb1057bbfe158ffe3c53c3 100644
>--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm
>+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm
>@@ -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>
>diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm
>index d344bcc3fc6603dd798e7648ae31b46f7598294d..100a0366af44f9a13d98961c16c137c61d0e96f3 100644
>--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm
>+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm
>@@ -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>
>diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm
>index 5365b97194613aa232efe744b0b9901bc569a0a4..e78689fc30d4bf861324b00ded56aea7598c2f37 100644
>--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm
>+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm
>@@ -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>
>diff --git a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm
>index 9b8314d544985ba3318e3e791aea21e2d58a0f3e..be0603f2c1da4a0c589f558c3f8ae4c4b2a3e719 100644
>--- a/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm
>+++ b/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm
>@@ -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>
>diff --git a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
>index daa53494f4766b74bbb246b4d51ac89ffb35f60d..e59b681e6a5b1ec2bb9b4cbad51e6f03f03e4d3a 100644
>--- a/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
>+++ b/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
>@@ -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>
>diff --git a/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h b/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h
>index 3f4ae1b0f3eb27b5d2f7948bb7e9eeff7013594b..407ee67556408b961745852b53df575a0e089900 100644
>--- a/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h
>+++ b/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h
>@@ -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 
> {
>diff --git a/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm b/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm
>index d9bd0a61a56c8c257e79ff53af7a41098eff2883..272e1ddaa11be10ccd1950183d6de4fd8390f103 100644
>--- a/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm
>+++ b/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm
>@@ -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>
>diff --git a/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m b/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m
>index 2a6fac056ff53a1a40438893a5db48a877bbd157..a7cbf3384885d50b2e4da29d927fd5d12de82b1e 100644
>--- a/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m
>+++ b/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m
>@@ -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"
> 
>diff --git a/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h b/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h
>index 2b69b01aa9a478304c31c451c8b44346a9ab2157..33677fc6031a07f9b75a61d706f7573bbc26a244 100644
>--- a/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h
>+++ b/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h
>@@ -27,7 +27,7 @@
>  */
> 
> #import <WebKitLegacy/WebKit.h>
>-#include <Carbon/Carbon.h>
>+#include <HIToolbox/HIView.h>
> 
> @interface HIViewAdapter : NSObject
> 
>diff --git a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>index 3e3ba368449360e5f0b9fc04abacd8d977016e2e..8fe026ebe6b1e28536b1d782eecd2fc02883d4e4 100644
>--- a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>@@ -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;
>diff --git a/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm b/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm
>index e17759309d3e916b05228613b6ab8b2d93e690fc..19328bb9b1a84566b13ce432602eaf5c531e027d 100644
>--- a/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm
>+++ b/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm
>@@ -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>
> 
>diff --git a/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h b/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h
>index f688dda30beef03f15fe418aaff907a56dcea56b..d396bb9cc755368384f883389a6aedee55461415 100644
>--- a/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h
>+++ b/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h
>@@ -25,7 +25,7 @@
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>-#import <Quartz/QuartzPrivate.h>
>+#import <PDFKit/PDFViewPriv.h>
> 
> #else
> 
>diff --git a/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm b/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm
>index c66ec662ef823fdb71c8c82a76453da44497d12e..1c8d415383b2f50dd6dc0f25ba4d733a9caf447b 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm
>@@ -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)
>diff --git a/Source/WebKitLegacy/mac/WebView/WebPDFView.h b/Source/WebKitLegacy/mac/WebView/WebPDFView.h
>index c5c8a01cf336c0ba4a3cd87b4c9bcc72a3f844d5..c9645a0b3aab62726185848e4b1a54b3febdf70d 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebPDFView.h
>+++ b/Source/WebKitLegacy/mac/WebView/WebPDFView.h
>@@ -28,7 +28,7 @@
> 
> #if !PLATFORM(IOS_FAMILY)
> 
>-#import <Quartz/Quartz.h>
>+#import <PDFKit/PDFKit.h>
> #import <WebKitLegacy/WebDocumentInternal.h>
> 
> @class WebDataSource;
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 11489d8da002a94649cd4f5946373ba3a4a0d876..39eee9917007b606990dc83e01531f5597e10b5f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -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  Jonathan Bedard  <jbedard@apple.com>
> 
>         webkitpy: Expose device_type from host-like objects
>diff --git a/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp b/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp
>index 7ec595c8d23158d9ad65efa511239c3f274e2b74..94c4fe58cfe9091b5aea66670d5e3091951608b4 100644
>--- a/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp
>+++ b/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp
>@@ -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
>diff --git a/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig b/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig
>index 3fe52423e5ca5153c14d772b331e3dc0833e1891..063c76642a8d46e216884bbb5aed34eb60cb624c 100644
>--- a/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig
>+++ b/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig
>@@ -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;
>diff --git a/Tools/DumpRenderTree/mac/LayoutTestHelper.m b/Tools/DumpRenderTree/mac/LayoutTestHelper.m
>index 84763221d113f50456607c20419210bf6a3c9eec..276a97a92f8ab38c9107eabf2bd6e64dc6d6bc87 100644
>--- a/Tools/DumpRenderTree/mac/LayoutTestHelper.m
>+++ b/Tools/DumpRenderTree/mac/LayoutTestHelper.m
>@@ -43,7 +43,7 @@
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>-#import <ColorSync/ColorSyncPriv.h>
>+#include <ColorSync/ColorSyncPriv.h>
> 
> #else
> 
>diff --git a/Tools/TestWebKitAPI/Configurations/Base.xcconfig b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>index 3eb168c49513b420a004d045f111c40b062807fa..f0c6a8ae65e6de9d20f4e621d5b67127ed8aa4d7 100644
>--- a/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>+++ b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
>@@ -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);
> 
>diff --git a/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig b/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig
>index 3b585397561e4fd952a5e83e01c8c97a520c4ab6..bcfe91951e65aeb7cbe77ba38030113c78e608cf 100644
>--- a/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig
>+++ b/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig
>@@ -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;
>diff --git a/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp b/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp
>index fc9cf7faedee0915355409c041b1bda853f50441..acf3843f95128017f2438efbbfb158ce0c884bef 100644
>--- a/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp
>+++ b/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp
>@@ -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)

Actions: View | Formatted Diff | Diff

Attachments on bug 193407: 359077