Changeset 240211 in webkit


Ignore:
Timestamp:
Jan 20, 2019 10:02:36 AM (5 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] Avoid importing directly from subumbrella frameworks
https://bugs.webkit.org/show_bug.cgi?id=186016
<rdar://problem/40591038>

Reviewed by Sam Weinig.

Source/WebCore:

  • Configurations/WebCore.xcconfig: Removed -iframework options from OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
  • editing/mac/DictionaryLookupLegacy.mm: Import Quartz.h instead of a PDFKit header.
  • platform/mac/PlatformEventFactoryMac.mm: Import Carbon.h instead of HIToolbox headers.
  • platform/text/mac/TextEncodingRegistryMac.mm: Import Carbon.h instead of CarbonCore.h.

Source/WebCore/PAL:

  • 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.

Source/WebKit:

  • Configurations/BaseTarget.xcconfig: Removed -iframework options from OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
  • UIProcess/Automation/mac/WebAutomationSessionMac.mm: Import Carbon.h instead of an HIToolbox header.
  • UIProcess/Cocoa/WebViewImpl.mm: Ditto.
  • UIProcess/mac/WKPrintingView.mm: Import Quartz.h instead of a PDFKit header.
  • UIProcess/mac/WKTextInputWindowController.mm: Import Carbon.h instead of an HIToolbox header.
  • WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h: Import Quartz.h instead of a PDFKit header.
  • WebProcess/Plugins/PDF/PDFLayerControllerSPI.h: Ditto.
  • WebProcess/Plugins/PDF/PDFPlugin.mm: Ditto.
  • WebProcess/Plugins/PDF/PDFPluginAnnotation.mm: Ditto.
  • WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm: Ditto.
  • WebProcess/Plugins/PDF/PDFPluginPasswordField.mm: Ditto.
  • WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm: Ditto.
  • WebProcess/WebPage/mac/WebPageMac.mm: Ditto.

Source/WebKitLegacy/mac:

  • Carbon/CarbonWindowAdapter.h: Import Carbon.h instead of HIToolbox headers.
  • Carbon/CarbonWindowAdapter.mm: Ditto.
  • Carbon/CarbonWindowFrame.m: Ditto.
  • Carbon/HIViewAdapter.h: Ditto.
  • Configurations/WebKitLegacy.xcconfig: Removed -iframework options from OTHER_CFLAGS_COCOA_TOUCH_NO.
  • Plugins/WebNetscapePluginEventHandlerCarbon.mm: Import Carbon.h instead of CarbonEvents.h.
  • WebView/WebPDFDocumentExtras.mm: Import Quartz.h instead of a PDFKit header.
  • WebView/WebPDFView.h: Ditto.

Tools:

  • DumpRenderTree/cg/PixelDumpSupportCG.cpp: Include CoreServices.h instead of a LaunchServices header.
  • DumpRenderTree/mac/Configurations/BaseTarget.xcconfig: Removed -iframework options from OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
  • DumpRenderTree/mac/LayoutTestHelper.m: Import ApplicationServices.h instead of ColorSync.h when using SDKs earlier than 10.13.
  • TestWebKitAPI/Configurations/Base.xcconfig: Removed -iframework options from OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
  • WebKitTestRunner/Configurations/BaseTarget.xcconfig: Removed -iframework options from OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
  • WebKitTestRunner/cg/TestInvocationCG.cpp: Include CoreServices.h instead of a LaunchServices header.
Location:
trunk
Files:
49 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r240209 r240211  
     12019-01-12  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Avoid importing directly from subumbrella frameworks
     4        https://bugs.webkit.org/show_bug.cgi?id=186016
     5        <rdar://problem/40591038>
     6
     7        Reviewed by Sam Weinig.
     8
     9        * Configurations/WebCore.xcconfig: Removed -iframework options from OTHER_CFLAGS and
     10          OTHER_CPLUSPLUSFLAGS.
     11        * editing/mac/DictionaryLookupLegacy.mm: Import Quartz.h instead of a PDFKit header.
     12        * platform/mac/PlatformEventFactoryMac.mm: Import Carbon.h instead of HIToolbox headers.
     13        * platform/text/mac/TextEncodingRegistryMac.mm: Import Carbon.h instead of CarbonCore.h.
     14
    1152019-01-20  chris fleizach  <cfleizach@apple.com>
    216
  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r240176 r240211  
    3939
    4040LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_LIBWEBRTC_LIBRARY_DIR)";
    41 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;
    42 OTHER_CFLAGS = $(inherited) $(ADDITIONAL_CFLAGS);
    43 OTHER_CPLUSPLUSFLAGS = $(inherited) $(ADDITIONAL_CFLAGS);
    4441
    4542WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
  • trunk/Source/WebCore/PAL/ChangeLog

    r240208 r240211  
     12019-01-12  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Avoid importing directly from subumbrella frameworks
     4        https://bugs.webkit.org/show_bug.cgi?id=186016
     5        <rdar://problem/40591038>
     6
     7        Reviewed by Sam Weinig.
     8
     9        * Configurations/PAL.xcconfig: Removed -iframework options from OTHER_CFLAGS and
     10          OTHER_CPLUSPLUSFLAGS.
     11        * pal/spi/cg/CoreGraphicsSPI.h: Import ApplicationServices.h instead of ColorSync.h
     12          when using SDKs earlier than 10.13.
     13        * pal/spi/mac/HIToolboxSPI.h: Import CarbonPriv.h instead of HIToolboxPriv.h.
     14        * pal/spi/mac/QuickLookMacSPI.h: Import Quartz.h instead of a QuickLookUI header.
     15
    1162019-01-20  Antoine Quint  <graouts@apple.com>
    217
  • trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig

    r240176 r240211  
    3434SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
    3535
    36 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;
     36OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    3737OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    3838
  • trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h

    r239948 r240211  
    3131
    3232#if PLATFORM(MAC)
    33 #import <LaunchServices/LaunchServicesPriv.h>
     33#import <CoreServices/CoreServicesPriv.h>
    3434#elif PLATFORM(IOS_FAMILY)
    3535#import <MobileCoreServices/LSAppLinkPriv.h>
  • trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h

    r239948 r240211  
    3030#if USE(APPLE_INTERNAL_SDK)
    3131
    32 #include <HIServices/AXTextMarker.h>
    33 #include <HIServices/CoreCursor.h>
    34 #include <HIServices/CoreDrag.h>
     32#include <ApplicationServices/ApplicationServicesPriv.h>
    3533
    3634#else
  • trunk/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h

    r239948 r240211  
    2828#if USE(APPLE_INTERNAL_SDK)
    2929
    30 #include <HIToolbox/HIToolboxPriv.h>
     30#include <Carbon/CarbonPriv.h>
    3131
    3232#else
  • trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h

    r239948 r240211  
    2828#if USE(APPLE_INTERNAL_SDK)
    2929
    30 #include <Metadata/MetadataPriv.h>
     30#include <CoreServices/CoreServicesPriv.h>
    3131
    3232#endif
  • trunk/Source/WebCore/PAL/pal/spi/mac/QuickDrawSPI.h

    r239948 r240211  
    3030#if USE(APPLE_INTERNAL_SDK)
    3131
    32 #include <QD/QuickdrawPriv.h>
     32#include <ApplicationServices/ApplicationServicesPriv.h>
    3333
    3434#else
  • trunk/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h

    r239948 r240211  
    2424 */
    2525
    26 #import <QuickLookUI/QLPreviewItem.h>
     26#import <Quartz/Quartz.h>
    2727
    2828@protocol QLPreviewMenuItemDelegate <NSObject>
  • trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h

    r239948 r240211  
    2828#if USE(APPLE_INTERNAL_SDK)
    2929
    30 #include <SpeechSynthesis/SpeechSynthesisPriv.h>
     30#include <ApplicationServices/ApplicationServicesPriv.h>
    3131
    3232#endif
  • trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm

    r239948 r240211  
    3636
    3737#if USE(APPLE_INTERNAL_SDK)
    38 #include <HIServices/AccessibilityPriv.h>
     38#include <ApplicationServices/ApplicationServicesPriv.h>
    3939#endif
    4040
  • trunk/Source/WebCore/editing/cocoa/DictionaryLookup.mm

    r240169 r240211  
    5555#import <wtf/RefPtr.h>
    5656
    57 #if !PLATFORM(WATCH)
     57#if PLATFORM(MAC)
     58#import <Quartz/Quartz.h>
     59#elif !PLATFORM(WATCH)
    5860#import <PDFKit/PDFKit.h>
    59 #endif // !PLATFORM(WATCH)
     61#endif
    6062
    6163#if PLATFORM(IOSMAC)
  • trunk/Source/WebCore/editing/mac/DictionaryLookupLegacy.mm

    r239948 r240211  
    4343#import "VisibleSelection.h"
    4444#import "VisibleUnits.h"
    45 #import <PDFKit/PDFKit.h>
     45#import <Quartz/Quartz.h>
    4646#import <pal/spi/mac/LookupSPI.h>
    4747#import <pal/spi/mac/NSImmediateActionGestureRecognizerSPI.h>
  • trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm

    r239948 r240211  
    3434#import "Scrollbar.h"
    3535#import "WindowsKeyboardCodes.h"
    36 #import <HIToolbox/CarbonEvents.h>
    37 #import <HIToolbox/Events.h>
     36#import <Carbon/Carbon.h>
    3837#import <mach/mach_time.h>
    3938#import <pal/spi/mac/HIToolboxSPI.h>
  • trunk/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm

    r239948 r240211  
    2929#if PLATFORM(MAC)
    3030
    31 #import <CarbonCore/CarbonCore.h>
     31#import <Carbon/Carbon.h>
    3232#import <wtf/spi/cf/CFStringSPI.h>
    3333
  • trunk/Source/WebKit/ChangeLog

    r240209 r240211  
     12019-01-12  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Avoid importing directly from subumbrella frameworks
     4        https://bugs.webkit.org/show_bug.cgi?id=186016
     5        <rdar://problem/40591038>
     6
     7        Reviewed by Sam Weinig.
     8
     9        * Configurations/BaseTarget.xcconfig: Removed -iframework options from OTHER_CFLAGS and
     10          OTHER_CPLUSPLUSFLAGS.
     11        * UIProcess/Automation/mac/WebAutomationSessionMac.mm: Import Carbon.h instead of an
     12          HIToolbox header.
     13        * UIProcess/Cocoa/WebViewImpl.mm: Ditto.
     14        * UIProcess/mac/WKPrintingView.mm: Import Quartz.h instead of a PDFKit header.
     15        * UIProcess/mac/WKTextInputWindowController.mm: Import Carbon.h instead of an HIToolbox
     16          header.
     17        * WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h: Import Quartz.h instead of a
     18          PDFKit header.
     19        * WebProcess/Plugins/PDF/PDFLayerControllerSPI.h: Ditto.
     20        * WebProcess/Plugins/PDF/PDFPlugin.mm: Ditto.
     21        * WebProcess/Plugins/PDF/PDFPluginAnnotation.mm: Ditto.
     22        * WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm: Ditto.
     23        * WebProcess/Plugins/PDF/PDFPluginPasswordField.mm: Ditto.
     24        * WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm: Ditto.
     25        * WebProcess/WebPage/mac/WebPageMac.mm: Ditto.
     26
    1272019-01-20  chris fleizach  <cfleizach@apple.com>
    228
  • trunk/Source/WebKit/Configurations/BaseTarget.xcconfig

    r240176 r240211  
    4141HEADER_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);
    4242
    43 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;
     43OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    4444OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
    4545
  • trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm

    r239948 r240211  
    5757
    5858#if USE(APPLE_INTERNAL_SDK)
    59 #import <HIServices/AccessibilityPriv.h>
     59#import <ApplicationServices/ApplicationServicesPriv.h>
    6060#else
    6161typedef enum {
  • trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm

    r239948 r240211  
    4242#import <mach/task.h>
    4343#import <pal/crypto/CryptoDigest.h>
     44#import <pal/spi/cocoa/LaunchServicesSPI.h>
    4445#import <pwd.h>
    4546#import <stdlib.h>
     
    5657
    5758#if USE(APPLE_INTERNAL_SDK)
    58 #import <HIServices/ProcessesPriv.h>
     59#import <ApplicationServices/ApplicationServicesPriv.h>
    5960#import <rootless.h>
    6061#endif
     
    6667#endif
    6768
     69#if PLATFORM(IOSMAC) && USE(APPLE_INTERNAL_SDK)
     70enum LSSessionID {
     71    kLSDefaultSessionID = -2,
     72};
     73#endif
     74
    6875typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef );
    6976extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
    70 extern "C" CFDictionaryRef _LSApplicationCheckIn(int sessionID, CFDictionaryRef applicationInfo);
     77extern "C" CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo);
    7178
    7279extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
     
    153160#endif
    154161
     162    // FIXME: Is this needed in iOSMac?
    155163    launchServicesCheckIn();
    156164}
     
    159167{
    160168    _LSSetApplicationLaunchServicesServerConnectionStatus(0, 0);
    161     RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(-2, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
     169    RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(kLSDefaultSessionID, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
    162170}
    163171
  • trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm

    r239948 r240211  
    3434#import "WebPageProxy.h"
    3535#import "_WKAutomationSession.h"
    36 #import <HIToolbox/Events.h>
     36#import <Carbon/Carbon.h>
    3737#import <WebCore/IntPoint.h>
    3838#import <WebCore/IntSize.h>
  • trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm

    r240209 r240211  
    7777#import "_WKRemoteObjectRegistryInternal.h"
    7878#import "_WKThumbnailViewInternal.h"
    79 #import <HIToolbox/CarbonEventsCore.h>
     79#import <Carbon/Carbon.h>
    8080#import <WebCore/AXObjectCache.h>
    8181#import <WebCore/ActivityState.h>
  • trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm

    r239948 r240211  
    3535#import "ShareableBitmap.h"
    3636#import "WebPageProxy.h"
    37 #import <PDFKit/PDFKit.h>
     37#import <Quartz/Quartz.h>
    3838#import <WebCore/GraphicsContext.h>
    3939#import <WebCore/LocalDefaultSystemAppearance.h>
  • trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm

    r239948 r240211  
    2929#if USE(APPKIT)
    3030
    31 #import <HIToolbox/CarbonEventsCore.h>
     31#import <Carbon/Carbon.h>
    3232#import <pal/spi/mac/HIToolboxSPI.h>
    3333#import <pal/system/mac/WebPanel.h>
  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h

    r239948 r240211  
    2424 */
    2525
    26 #import <PDFKit/PDFKit.h>
     26#import <Quartz/Quartz.h>
    2727
    2828@interface PDFAnnotationTextWidget (Details)
  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h

    r239948 r240211  
    2929#if ENABLE(PDFKIT_PLUGIN)
    3030
    31 #import <PDFKit/PDFKit.h>
     31#import <Quartz/Quartz.h>
    3232
    3333@class CPReadingModel;
  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm

    r239948 r240211  
    4949#import <JavaScriptCore/JSContextRef.h>
    5050#import <JavaScriptCore/JSObjectRef.h>
    51 #import <PDFKit/PDFKit.h>
     51#import <Quartz/Quartz.h>
    5252#import <QuartzCore/QuartzCore.h>
    5353#import <WebCore/AXObjectCache.h>
  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm

    r239948 r240211  
    3434#import "PDFPluginChoiceAnnotation.h"
    3535#import "PDFPluginTextAnnotation.h"
    36 #import <PDFKit/PDFKit.h>
     36#import <Quartz/Quartz.h>
    3737#import <WebCore/CSSPrimitiveValue.h>
    3838#import <WebCore/CSSPropertyNames.h>
  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm

    r239948 r240211  
    3131#import "PDFKitImports.h"
    3232#import "PDFLayerControllerSPI.h"
    33 #import <PDFKit/PDFKit.h>
     33#import <Quartz/Quartz.h>
    3434#import <WebCore/CSSPrimitiveValue.h>
    3535#import <WebCore/CSSPropertyNames.h>
  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm

    r239948 r240211  
    3232#import "PDFLayerControllerSPI.h"
    3333#import "PDFPlugin.h"
    34 #import <PDFKit/PDFKit.h>
     34#import <Quartz/Quartz.h>
    3535#import <WebCore/Event.h>
    3636#import <WebCore/EventNames.h>
  • trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm

    r239948 r240211  
    3333#import "PDFLayerControllerSPI.h"
    3434#import "PDFPlugin.h"
    35 #import <PDFKit/PDFKit.h>
     35#import <Quartz/Quartz.h>
    3636#import <WebCore/CSSPrimitiveValue.h>
    3737#import <WebCore/CSSPropertyNames.h>
  • trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm

    r239948 r240211  
    5454#import "WebPreferencesStore.h"
    5555#import "WebProcess.h"
    56 #import <PDFKit/PDFKit.h>
     56#import <Quartz/Quartz.h>
    5757#import <QuartzCore/QuartzCore.h>
    5858#import <WebCore/AXObjectCache.h>
  • trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h

    r239948 r240211  
    2929#import <Foundation/Foundation.h>
    3030#import <AppKit/AppKit.h>
    31 #import <HIToolbox/CarbonEvents.h>
    32 #import <HIToolbox/MacWindows.h>
     31#import <Carbon/Carbon.h>
    3332
    3433@interface CarbonWindowAdapter : NSWindow
  • trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm

    r239948 r240211  
    6666#import <AppKit/AppKit.h>
    6767//#import <CoreGraphics/CGSWindow.h>
    68 #import <HIToolbox/CarbonEvents.h>
    69 #import <HIToolbox/Controls.h>
    70 #import <HIToolbox/HIView.h>
     68#import <Carbon/Carbon.h>
    7169#import <assert.h>
    7270
  • trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m

    r239948 r240211  
    3232#import "CarbonWindowAdapter.h"
    3333#import "CarbonWindowContentView.h"
     34#import <Carbon/Carbon.h>
    3435#import <Foundation/NSGeometry.h>
    3536#import <Foundation/NSString.h>
    36 #import <HIToolbox/MacWindows.h>
    3737
    3838#import "WebTypesInternal.h"
  • trunk/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h

    r239948 r240211  
    2828
    2929#import <WebKitLegacy/WebKit.h>
    30 #include <HIToolbox/HIView.h>
     30#include <Carbon/Carbon.h>
    3131
    3232@interface HIViewAdapter : NSObject
  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r240208 r240211  
     12019-01-12  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Avoid importing directly from subumbrella frameworks
     4        https://bugs.webkit.org/show_bug.cgi?id=186016
     5        <rdar://problem/40591038>
     6
     7        Reviewed by Sam Weinig.
     8
     9        * Carbon/CarbonWindowAdapter.h: Import Carbon.h instead of HIToolbox headers.
     10        * Carbon/CarbonWindowAdapter.mm: Ditto.
     11        * Carbon/CarbonWindowFrame.m: Ditto.
     12        * Carbon/HIViewAdapter.h: Ditto.
     13        * Configurations/WebKitLegacy.xcconfig: Removed -iframework options from
     14          OTHER_CFLAGS_COCOA_TOUCH_NO.
     15        * Plugins/WebNetscapePluginEventHandlerCarbon.mm: Import Carbon.h instead of CarbonEvents.h.
     16        * WebView/WebPDFDocumentExtras.mm: Import Quartz.h instead of a PDFKit header.
     17        * WebView/WebPDFView.h: Ditto.
     18
    1192019-01-20  Antoine Quint  <graouts@apple.com>
    220
  • trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig

    r240176 r240211  
    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 -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;
     51OTHER_CFLAGS_COCOA_TOUCH_NO = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
    5252OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    5353
  • trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm

    r239948 r240211  
    3030#import "WebNetscapePluginView.h"
    3131#import "WebKitLogging.h"
    32 #import <HIToolbox/CarbonEvents.h>
     32#import <Carbon/Carbon.h>
    3333#import <pal/spi/mac/HIToolboxSPI.h>
    3434#import <pal/spi/mac/NSEventSPI.h>
  • trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h

    r239948 r240211  
    2626#if USE(APPLE_INTERNAL_SDK)
    2727
    28 #import <PDFKit/PDFViewPriv.h>
     28#import <Quartz/QuartzPrivate.h>
    2929
    3030#else
  • trunk/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm

    r239948 r240211  
    3131
    3232#if !PLATFORM(IOS_FAMILY)
    33 #import <PDFKit/PDFDocument.h>
     33#import <Quartz/Quartz.h>
    3434#endif
    3535
  • trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h

    r239948 r240211  
    2929#if !PLATFORM(IOS_FAMILY)
    3030
    31 #import <PDFKit/PDFKit.h>
     31#import <Quartz/Quartz.h>
    3232#import <WebKitLegacy/WebDocumentInternal.h>
    3333
  • trunk/Tools/ChangeLog

    r240210 r240211  
     12019-01-12  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Avoid importing directly from subumbrella frameworks
     4        https://bugs.webkit.org/show_bug.cgi?id=186016
     5        <rdar://problem/40591038>
     6
     7        Reviewed by Sam Weinig.
     8
     9        * DumpRenderTree/cg/PixelDumpSupportCG.cpp: Include CoreServices.h instead of a
     10          LaunchServices header.
     11        * DumpRenderTree/mac/Configurations/BaseTarget.xcconfig: Removed -iframework options from
     12          OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
     13        * DumpRenderTree/mac/LayoutTestHelper.m: Import ApplicationServices.h instead of ColorSync.h
     14          when using SDKs earlier than 10.13.
     15        * TestWebKitAPI/Configurations/Base.xcconfig: Removed -iframework options from OTHER_CFLAGS
     16          and OTHER_CPLUSPLUSFLAGS.
     17        * WebKitTestRunner/Configurations/BaseTarget.xcconfig: Removed -iframework options from
     18          OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
     19        * WebKitTestRunner/cg/TestInvocationCG.cpp: Include CoreServices.h instead of a
     20          LaunchServices header.
     21
    1222019-01-20  Tadeu Zagallo  <tzagallo@apple.com>
    223
  • trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp

    r239948 r240211  
    4848#include <CommonCrypto/CommonDigest.h>
    4949#elif PLATFORM(MAC)
    50 #include <LaunchServices/UTCoreTypes.h>
     50#include <CoreServices/CoreServices.h>
    5151#define COMMON_DIGEST_FOR_OPENSSL
    5252#include <CommonCrypto/CommonDigest.h>
  • trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig

    r239948 r240211  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
    24 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;
     24OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
    2525OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    2626GCC_ENABLE_OBJC_EXCEPTIONS = YES;
  • trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m

    r239948 r240211  
    4444#if USE(APPLE_INTERNAL_SDK)
    4545
    46 #include <ColorSync/ColorSyncPriv.h>
     46#import <ColorSync/ColorSyncPriv.h>
    4747
    4848#else
  • trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig

    r240176 r240211  
    103103
    104104OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS) --system-header-prefix=WebKit/;
    105 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;
     105OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    106106OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
    107107OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
  • trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig

    r239948 r240211  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
    24 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;
    25 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    2624INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
  • trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp

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