Changeset 232239 in webkit


Ignore:
Timestamp:
May 27, 2018, 10:31:57 PM (8 years ago)
Author:
mitz@apple.com
Message:

Reverted the changes made for ​https://webkit.org/b/186016

They broke the USE(APPLE_INTERNAL_SDK) Sierra build.

Location:
trunk
Files:
53 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r232236 r232239  
     12018-05-27  Dan Bernstein  <mitz@apple.com>
     2
     3        Reverted the changes made for https://webkit.org/b/186016
     4
     5        They broke the USE(APPLE_INTERNAL_SDK) Sierra build.
     6
    172018-05-27  David Kilzer  <ddkilzer@apple.com>
    28

  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r232235 r232239  
    4141
    4242LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_LIBWEBRTC_LIBRARY_DIR)";
     43ADDITIONAL_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;
     44OTHER_CFLAGS = $(inherited) $(ADDITIONAL_CFLAGS);
     45OTHER_CPLUSPLUSFLAGS = $(inherited) $(ADDITIONAL_CFLAGS);
    4346
    4447WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;

  • trunk/Source/WebCore/PAL/ChangeLog

    r232238 r232239  
    112018-05-27  Dan Bernstein  <mitz@apple.com>
    22
    3         Tried to fix the pre-High Sierra USE(APPLE_INTERNAL_SDK) build
    4 
    5         * pal/spi/cg/CoreGraphicsSPI.h: #undef confirm, which is defined by ApplicationServicesPriv.h.
    6 
    7 2018-05-27  Dan Bernstein  <mitz@apple.com>
    8 
    9         Tried to fix the 32-bit USE(APPLE_INTERNAL_SDK) build.
    10 
    11         * pal/spi/mac/QuickDrawSPI.h: Import ApplicationServicesPriv.h instead of QuickDrawPriv.h.
    12 
    13 2018-05-27  Dan Bernstein  <mitz@apple.com>
    14 
    15         [Cocoa] Avoid importing directly from subumbrella frameworks
    16         https://bugs.webkit.org/show_bug.cgi?id=186016
    17 
    18         Reviewed by Sam Weinig.
    19 
    20         * Configurations/PAL.xcconfig: Removed -iframework options from OTHER_CFLAGS and
    21           OTHER_CPLUSPLUSFLAGS.
    22         * pal/spi/cg/CoreGraphicsSPI.h: Import ApplicationServices.h instead of ColorSync.h
    23           when using SDKs earlier than 10.13.
    24         * pal/spi/mac/HIToolboxSPI.h: Import CarbonPriv.h instead of HIToolboxPriv.h.
    25         * pal/spi/mac/QuickLookMacSPI.h: Import Quartz.h instead of a QuickLookUI header.
     3        Reverted the changes made for https://webkit.org/b/186016
     4
     5        They broke the USE(APPLE_INTERNAL_SDK) Sierra build.
    266
    2772018-05-25  Chris Dumez  <cdumez@apple.com>

  • trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig

    r232235 r232239  
    3939SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
    4040
    41 OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     41OTHER_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;
    4242OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    4343

  • trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h

    r232238 r232239  
    3434
    3535#if PLATFORM(MAC)
    36 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
    3736#include <ColorSync/ColorSync.h>
    38 #else
    39 #include <ApplicationServices/ApplicationServices.h>
    40 #endif
    4137#endif
    4238
    … …  
    4440
    4541#if PLATFORM(MAC)
    46 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
    4742#include <ColorSync/ColorSyncPriv.h>
    48 #else
    49 #include <ApplicationServices/ApplicationServicesPriv.h>
    50 #ifdef confirm
    51 #undef confirm
    52 #endif
    53 #endif
    5443#endif
    5544#include <CoreGraphics/CGFontCache.h>

  • trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h

    r232235 r232239  
    3131
    3232#if PLATFORM(MAC)
    33 #import <ApplicationServices/ApplicationServicesPriv.h>
     33#import <LaunchServices/LaunchServicesPriv.h>
    3434#elif PLATFORM(IOS)
    3535#import <MobileCoreServices/LSAppLinkPriv.h>

  • trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h

    r232235 r232239  
    3030#if USE(APPLE_INTERNAL_SDK)
    3131
    32 #include <ApplicationServices/ApplicationServicesPriv.h>
     32#include <HIServices/AXTextMarker.h>
     33#include <HIServices/CoreCursor.h>
     34#include <HIServices/CoreDrag.h>
    3335
    3436#else

  • trunk/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h

    r232235 r232239  
    2828#if USE(APPLE_INTERNAL_SDK)
    2929
    30 #include <Carbon/CarbonPriv.h>
     30#include <HIToolbox/HIToolboxPriv.h>
    3131
    3232#else

  • trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h

    r232235 r232239  
    2828#if USE(APPLE_INTERNAL_SDK)
    2929
    30 #include <CoreServices/CoreServicesPriv.h>
     30#include <Metadata/MetadataPriv.h>
    3131
    3232#endif

  • trunk/Source/WebCore/PAL/pal/spi/mac/QuickDrawSPI.h

    r232237 r232239  
    3030#if USE(APPLE_INTERNAL_SDK)
    3131
    32 #include <ApplicationServices/ApplicationServicesPriv.h>
     32#include <QD/QuickdrawPriv.h>
    3333
    3434#else

  • trunk/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h

    r232235 r232239  
    2424 */
    2525
    26 #import <Quartz/Quartz.h>
     26#import <QuickLookUI/QLPreviewItem.h>
    2727
    2828@protocol QLPreviewMenuItemDelegate <NSObject>

  • trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h

    r232235 r232239  
    2828#if USE(APPLE_INTERNAL_SDK)
    2929
    30 #include <ApplicationServices/ApplicationServicesPriv.h>
     30#include <SpeechSynthesis/SpeechSynthesisPriv.h>
    3131
    3232#endif

  • trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm

    r232235 r232239  
    3636
    3737#if USE(APPLE_INTERNAL_SDK)
    38 #include <ApplicationServices/ApplicationServicesPriv.h>
     38#include <HIServices/AccessibilityPriv.h>
    3939#endif
    4040

  • trunk/Source/WebCore/editing/mac/DictionaryLookup.mm

    r232235 r232239  
    4343#import "VisibleSelection.h"
    4444#import "VisibleUnits.h"
    45 #import <Quartz/Quartz.h>
     45#import <PDFKit/PDFKit.h>
    4646#import <pal/spi/mac/LookupSPI.h>
    4747#import <pal/spi/mac/NSImmediateActionGestureRecognizerSPI.h>

  • trunk/Source/WebCore/html/HTMLKeygenElement.cpp

    r232235 r232239  
    3939#include <wtf/NeverDestroyed.h>
    4040#include <wtf/StdLibExtras.h>
     41
     42using namespace WebCore;
    4143
    4244namespace WebCore {

  • trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm

    r232235 r232239  
    3434#import "Scrollbar.h"
    3535#import "WindowsKeyboardCodes.h"
    36 #import <Carbon/Carbon.h>
     36#import <HIToolbox/CarbonEvents.h>
     37#import <HIToolbox/Events.h>
    3738#import <mach/mach_time.h>
    3839#import <pal/spi/mac/HIToolboxSPI.h>

  • trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm

    r232235 r232239  
    3333#import "HostWindow.h"
    3434#import "ScreenProperties.h"
     35#import <ColorSync/ColorSync.h>
    3536#import <pal/spi/cg/CoreGraphicsSPI.h>
    3637#import <wtf/ProcessPrivilege.h>
    37 
    38 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
    39 #import <ColorSync/ColorSync.h>
    40 #else
    41 #import <ApplicationServices/ApplicationServices.h>
    42 #endif
    4338
    4439extern "C" {

  • trunk/Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp

    r232235 r232239  
    3737#include <wtf/text/StringHash.h>
    3838
    39 namespace WebCore {
     39using namespace WebCore;
    4040
    4141CaptureDeviceManager::~CaptureDeviceManager() = default;
    … …  
    7070}
    7171
    72 } // namespace WebCore
    7372
    7473#endif // ENABLE(MEDIA_STREAM)

  • trunk/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm

    r232235 r232239  
    2929#if PLATFORM(MAC)
    3030
    31 #import <Carbon/Carbon.h>
     31#import <CarbonCore/CarbonCore.h>
    3232#import <wtf/spi/cf/CFStringSPI.h>
    3333

  • trunk/Source/WebKit/ChangeLog

    r232236 r232239  
     12018-05-27  Dan Bernstein  <mitz@apple.com>
     2
     3        Reverted the changes made for https://webkit.org/b/186016
     4
     5        They broke the USE(APPLE_INTERNAL_SDK) Sierra build.
     6
    172018-05-27  David Kilzer  <ddkilzer@apple.com>
    28

  • trunk/Source/WebKit/Configurations/BaseTarget.xcconfig

    r232235 r232239  
    4343HEADER_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);
    4444
    45 OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     45OTHER_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;
    4646OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
    4747

  • trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm

    r232235 r232239  
    5757
    5858#if USE(APPLE_INTERNAL_SDK)
    59 #import <ApplicationServices/ApplicationServicesPriv.h>
     59#import <HIServices/AccessibilityPriv.h>
    6060#else
    6161typedef enum {

  • trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm

    r232235 r232239  
    3838#import <mach/mach.h>
    3939#import <mach/task.h>
    40 #import <pal/spi/cocoa/LaunchServicesSPI.h>
    4140#import <pwd.h>
    4241#import <stdlib.h>
    … …  
    4544#import <wtf/spi/darwin/SandboxSPI.h>
    4645
     46#if USE(APPLE_INTERNAL_SDK)
     47#include <HIServices/ProcessesPriv.h>
     48#endif
     49
    4750typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef );
    4851extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
    49 extern "C" CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo);
     52extern "C" CFDictionaryRef _LSApplicationCheckIn(int sessionID, CFDictionaryRef applicationInfo);
    5053
    5154extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
    … …  
    7679{
    7780    _LSSetApplicationLaunchServicesServerConnectionStatus(0, 0);
    78     RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(kLSDefaultSessionID, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
     81    RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(-2, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
    7982}
    8083

  • trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm

    r232235 r232239  
    3333#import "WebPageProxy.h"
    3434#import "_WKAutomationSession.h"
    35 #import <Carbon/Carbon.h>
     35#import <HIToolbox/Events.h>
    3636#import <WebCore/IntPoint.h>
    3737#import <WebCore/IntSize.h>

  • trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

    r232235 r232239  
    6868#import "_WKRemoteObjectRegistryInternal.h"
    6969#import "_WKThumbnailViewInternal.h"
    70 #import <Carbon/Carbon.h>
     70#import <HIToolbox/CarbonEventsCore.h>
    7171#import <WebCore/AXObjectCache.h>
    7272#import <WebCore/ActivityState.h>

  • trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm

    r232235 r232239  
    3535#import "ShareableBitmap.h"
    3636#import "WebPageProxy.h"
    37 #import <Quartz/Quartz.h>
     37#import <PDFKit/PDFKit.h>
    3838#import <WebCore/GraphicsContext.h>
    3939#import <WebCore/WebCoreObjCExtras.h>

  • trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm

    r232235 r232239  
    2929#if USE(APPKIT)
    3030
    31 #import <Carbon/Carbon.h>
     31#import <HIToolbox/CarbonEventsCore.h>
    3232#import <pal/spi/mac/HIToolboxSPI.h>
    3333#import <pal/system/mac/WebPanel.h>

  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h

    r232235 r232239  
    2424 */
    2525
    26 #import <Quartz/Quartz.h>
     26#import <PDFKit/PDFKit.h>
    2727
    2828@interface PDFAnnotationTextWidget (Details)

  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h

    r232235 r232239  
    2929#if ENABLE(PDFKIT_PLUGIN)
    3030
    31 #import <Quartz/Quartz.h>
     31#import <PDFKit/PDFKit.h>
    3232
    3333@class CPReadingModel;

  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm

    r232235 r232239  
    5151#import <JavaScriptCore/JSStringRef.h>
    5252#import <JavaScriptCore/JSStringRefCF.h>
    53 #import <Quartz/Quartz.h>
     53#import <PDFKit/PDFKit.h>
    5454#import <QuartzCore/QuartzCore.h>
    5555#import <WebCore/AXObjectCache.h>

  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm

    r232235 r232239  
    3434#import "PDFPluginChoiceAnnotation.h"
    3535#import "PDFPluginTextAnnotation.h"
    36 #import <Quartz/Quartz.h>
     36#import <PDFKit/PDFKit.h>
    3737#import <WebCore/CSSPrimitiveValue.h>
    3838#import <WebCore/CSSPropertyNames.h>

  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm

    r232235 r232239  
    3131#import "PDFKitImports.h"
    3232#import "PDFLayerControllerSPI.h"
    33 #import <Quartz/Quartz.h>
     33#import <PDFKit/PDFKit.h>
    3434#import <WebCore/CSSPrimitiveValue.h>
    3535#import <WebCore/CSSPropertyNames.h>

  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm

    r232235 r232239  
    3232#import "PDFLayerControllerSPI.h"
    3333#import "PDFPlugin.h"
    34 #import <Quartz/Quartz.h>
     34#import <PDFKit/PDFKit.h>
    3535#import <WebCore/Event.h>
    3636#import <WebCore/EventNames.h>

  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm

    r232235 r232239  
    3333#import "PDFLayerControllerSPI.h"
    3434#import "PDFPlugin.h"
    35 #import <Quartz/Quartz.h>
     35#import <PDFKit/PDFKit.h>
    3636#import <WebCore/CSSPrimitiveValue.h>
    3737#import <WebCore/CSSPropertyNames.h>

  • trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm

    r232235 r232239  
    5454#import "WebPreferencesStore.h"
    5555#import "WebProcess.h"
    56 #import <Quartz/Quartz.h>
     56#import <PDFKit/PDFKit.h>
    5757#import <QuartzCore/QuartzCore.h>
    5858#import <WebCore/AXObjectCache.h>

  • trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h

    r232235 r232239  
    2929#import <Foundation/Foundation.h>
    3030#import <AppKit/AppKit.h>
    31 #import <Carbon/Carbon.h>
     31#import <HIToolbox/CarbonEvents.h>
     32#import <HIToolbox/MacWindows.h>
    3233
    3334@interface CarbonWindowAdapter : NSWindow

  • trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm

    r232235 r232239  
    6666#import <AppKit/AppKit.h>
    6767//#import <CoreGraphics/CGSWindow.h>
    68 #import <Carbon/Carbon.h>
     68#import <HIToolbox/CarbonEvents.h>
     69#import <HIToolbox/Controls.h>
     70#import <HIToolbox/HIView.h>
    6971#import <assert.h>
    7072

  • trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m

    r232235 r232239  
    3232#import "CarbonWindowAdapter.h"
    3333#import "CarbonWindowContentView.h"
    34 #import <Carbon/Carbon.h>
    3534#import <Foundation/NSGeometry.h>
    3635#import <Foundation/NSString.h>
     36#import <HIToolbox/MacWindows.h>
    3737
    3838#import "WebTypesInternal.h"

  • trunk/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h

    r232235 r232239  
    2828
    2929#import <WebKitLegacy/WebKit.h>
    30 #include <Carbon/Carbon.h>
     30#include <HIToolbox/HIView.h>
    3131
    3232@interface HIViewAdapter : NSObject

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r232236 r232239  
     12018-05-27  Dan Bernstein  <mitz@apple.com>
     2
     3        Reverted the changes made for https://webkit.org/b/186016
     4
     5        They broke the USE(APPLE_INTERNAL_SDK) Sierra build.
     6
     7
    182018-05-27  David Kilzer  <ddkilzer@apple.com>
    29

  • trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig

    r232235 r232239  
    4949OTHER_CFLAGS = $(OTHER_CFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
    5050OTHER_CFLAGS_COCOA_TOUCH_YES = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
    51 OTHER_CFLAGS_COCOA_TOUCH_NO = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
     51OTHER_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;
    5252OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    5353

  • trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm

    r232235 r232239  
    3030#import "WebNetscapePluginView.h"
    3131#import "WebKitLogging.h"
    32 #import <Carbon/Carbon.h>
     32#import <HIToolbox/CarbonEvents.h>
    3333#import <pal/spi/mac/HIToolboxSPI.h>
    3434#import <pal/spi/mac/NSEventSPI.h>

  • trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h

    r232235 r232239  
    2626#if USE(APPLE_INTERNAL_SDK)
    2727
    28 #import <Quartz/QuartzPrivate.h>
     28#import <PDFKit/PDFViewPriv.h>
    2929
    3030#else

  • trunk/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm

    r232235 r232239  
    3131
    3232#if !PLATFORM(IOS)
    33 #import <Quartz/Quartz.h>
     33#import <PDFKit/PDFDocument.h>
    3434#endif
    3535

  • trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h

    r232235 r232239  
    2929#if !PLATFORM(IOS)
    3030
    31 #import <Quartz/Quartz.h>
     31#import <PDFKit/PDFKit.h>
    3232#import <WebKitLegacy/WebDocumentInternal.h>
    3333

  • trunk/Tools/ChangeLog

    r232235 r232239  
     12018-05-27  Dan Bernstein  <mitz@apple.com>
     2
     3        Reverted the changes made for https://webkit.org/b/186016
     4
     5        They broke the USE(APPLE_INTERNAL_SDK) Sierra build.
     6
    172018-05-27  Dan Bernstein  <mitz@apple.com>
    28

  • trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp

    r232235 r232239  
    4848#include <CommonCrypto/CommonDigest.h>
    4949#elif PLATFORM(MAC)
    50 #include <CoreServices/CoreServices.h>
     50#include <LaunchServices/UTCoreTypes.h>
    5151#define COMMON_DIGEST_FOR_OPENSSL
    5252#include <CommonCrypto/CommonDigest.h>

  • trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig

    r232235 r232239  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
    24 OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
     24OTHER_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;
    2525OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    2626GCC_ENABLE_OBJC_EXCEPTIONS = YES;

  • trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m

    r232235 r232239  
    4444#if USE(APPLE_INTERNAL_SDK)
    4545
    46 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
    47 #import <ColorSync/ColorSyncPriv.h>
    48 #else
    49 #import <ApplicationServices/ApplicationServicesPriv.h>
    50 #endif
     46#include <ColorSync/ColorSyncPriv.h>
    5147
    5248#else

  • trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig

    r232235 r232239  
    9898
    9999OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
    100 OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
     100OTHER_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;
    101101OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
    102102OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);

  • trunk/Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm

    r232235 r232239  
    3030#import "PlatformUtilities.h"
    3131#import "WebCoreTestSupport.h"
    32 #import <Carbon/Carbon.h>
     32#import <HIToolbox/CarbonEvents.h>
    3333#import <IOKit/pwr_mgt/IOPMLib.h>
    3434#import <JavaScriptCore/JSContext.h>

  • trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig

    r232235 r232239  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
     24OTHER_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;
     25OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    2426INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;

  • trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp

    r232235 r232239  
    3636
    3737#if PLATFORM(MAC) && !PLATFORM(IOS)
    38 #include <CoreServices/CoreServices.h>
     38#include <LaunchServices/UTCoreTypes.h>
    3939#endif
    4040
Note: See TracChangeset for help on using the changeset viewer.