Changeset 232235 in webkit


Ignore:
Timestamp:
May 27, 2018 9:17:47 PM (6 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] Avoid importing directly from subumbrella frameworks
​https://bugs.webkit.org/show_bug.cgi?id=186016

Reviewed by Sam Weinig.

Source/WebCore:

  • Configurations/WebCore.xcconfig: Removed -iframework options from OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
  • editing/mac/DictionaryLookup.mm: Import Quartz.h instead of a PDFKit header.
  • html/HTMLKeygenElement.cpp: Removed "using namespace WebCore" from this WebCore implementation file.
  • platform/mac/PlatformEventFactoryMac.mm: Import Carbon.h instead of HIToolbox headers.
  • platform/mac/PlatformScreenMac.mm: Import ApplicationServices.h instead of ColorSync.h when using SDKs earlier than 10.13.
  • platform/mediastream/CaptureDeviceManager.cpp: Enclosed the definitions in the WebCore namespace and removed "using namespace WebCore" from this WebCore implementation file.
  • 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 and OTHER_CPLUSPLUSFLAGS.
  • 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.
  • TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm: Import Carbon.h instead of an HIToolbox header.
  • 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:
52 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r232233 r232235  
     12018-05-27  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
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/WebCore.xcconfig: Removed -iframework options from OTHER_CFLAGS and
     9          OTHER_CPLUSPLUSFLAGS.
     10        * editing/mac/DictionaryLookup.mm: Import Quartz.h instead of a PDFKit header.
     11        * html/HTMLKeygenElement.cpp: Removed "using namespace WebCore" from this WebCore
     12          implementation file.
     13        * platform/mac/PlatformEventFactoryMac.mm: Import Carbon.h instead of HIToolbox headers.
     14        * platform/mac/PlatformScreenMac.mm: Import ApplicationServices.h instead of ColorSync.h
     15          when using SDKs earlier than 10.13.
     16        * platform/mediastream/CaptureDeviceManager.cpp: Enclosed the definitions in the WebCore
     17          namespace and removed "using namespace WebCore" from this WebCore implementation file.
     18        * platform/text/mac/TextEncodingRegistryMac.mm: Import Carbon.h instead of CarbonCore.h.
     19
    1202018-05-27  Fujii Hironori  <Hironori.Fujii@sony.com>
    221

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

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

  • trunk/Source/WebCore/PAL/ChangeLog

    r232201 r232235  
     12018-05-27  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
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/PAL.xcconfig: Removed -iframework options from OTHER_CFLAGS and
     9          OTHER_CPLUSPLUSFLAGS.
     10        * pal/spi/cg/CoreGraphicsSPI.h: Import ApplicationServices.h instead of ColorSync.h
     11          when using SDKs earlier than 10.13.
     12        * pal/spi/mac/HIToolboxSPI.h: Import CarbonPriv.h instead of HIToolboxPriv.h.
     13        * pal/spi/mac/QuickLookMacSPI.h: Import Quartz.h instead of a QuickLookUI header.
     14
    1152018-05-25  Chris Dumez  <cdumez@apple.com>
    216

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

    r231063 r232235  
    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)/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;
     41OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    4242OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    4343

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

    r230278 r232235  
    3434
    3535#if PLATFORM(MAC)
     36#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
    3637#include <ColorSync/ColorSync.h>
     38#else
     39#include <ApplicationServices/ApplicationServices.h>
     40#endif
    3741#endif
    3842
    … …  
    4044
    4145#if PLATFORM(MAC)
     46#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
    4247#include <ColorSync/ColorSyncPriv.h>
     48#else
     49#include <ApplicationServices/ApplicationServicesPriv.h>
     50#endif
    4351#endif
    4452#include <CoreGraphics/CGFontCache.h>

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

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

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

    r222150 r232235  
    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

    r221473 r232235  
    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

    r221291 r232235  
    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/QuickLookMacSPI.h

    r220979 r232235  
    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

    r222053 r232235  
    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

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

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

    r231691 r232235  
    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/html/HTMLKeygenElement.cpp

    r231024 r232235  
    3939#include <wtf/NeverDestroyed.h>
    4040#include <wtf/StdLibExtras.h>
    41 
    42 using namespace WebCore;
    4341
    4442namespace WebCore {

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

    r228531 r232235  
    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/mac/PlatformScreenMac.mm

    r231980 r232235  
    3333#import "HostWindow.h"
    3434#import "ScreenProperties.h"
    35 #import <ColorSync/ColorSync.h>
    3635#import <pal/spi/cg/CoreGraphicsSPI.h>
    3736#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
    3843
    3944extern "C" {

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

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

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

    r221286 r232235  
    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

    r232218 r232235  
     12018-05-27  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
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/BaseTarget.xcconfig: Removed -iframework options from OTHER_CFLAGS and
     9          OTHER_CPLUSPLUSFLAGS.
     10        * UIProcess/Automation/mac/WebAutomationSessionMac.mm: Import Carbon.h instead of an
     11          HIToolbox header.
     12        * UIProcess/Cocoa/WebViewImpl.mm: Ditto.
     13        * UIProcess/mac/WKPrintingView.mm: Import Quartz.h instead of a PDFKit header.
     14        * UIProcess/mac/WKTextInputWindowController.mm: Import Carbon.h instead of an HIToolbox
     15          header.
     16        * WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h: Import Quartz.h instead of a
     17          PDFKit header.
     18        * WebProcess/Plugins/PDF/PDFLayerControllerSPI.h: Ditto.
     19        * WebProcess/Plugins/PDF/PDFPlugin.mm: Ditto.
     20        * WebProcess/Plugins/PDF/PDFPluginAnnotation.mm: Ditto.
     21        * WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm: Ditto.
     22        * WebProcess/Plugins/PDF/PDFPluginPasswordField.mm: Ditto.
     23        * WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm: Ditto.
     24        * WebProcess/WebPage/mac/WebPageMac.mm: Ditto.
     25
    1262018-05-25  Timothy Hatcher  <timothy@apple.com>
    227

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

    r231215 r232235  
    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)/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;
     45OTHER_CFLAGS = $(inherited) -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

    r230314 r232235  
    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

    r231239 r232235  
    3838#import <mach/mach.h>
    3939#import <mach/task.h>
     40#import <pal/spi/cocoa/LaunchServicesSPI.h>
    4041#import <pwd.h>
    4142#import <stdlib.h>
    … …  
    4445#import <wtf/spi/darwin/SandboxSPI.h>
    4546
    46 #if USE(APPLE_INTERNAL_SDK)
    47 #include <HIServices/ProcessesPriv.h>
    48 #endif
    49 
    5047typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef );
    5148extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
    52 extern "C" CFDictionaryRef _LSApplicationCheckIn(int sessionID, CFDictionaryRef applicationInfo);
     49extern "C" CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo);
    5350
    5451extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
    … …  
    7976{
    8077    _LSSetApplicationLaunchServicesServerConnectionStatus(0, 0);
    81     RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(-2, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
     78    RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(kLSDefaultSessionID, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
    8279}
    8380

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

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

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

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

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

    r226454 r232235  
    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/WebCoreObjCExtras.h>

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

    r222896 r232235  
    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

    r135958 r232235  
    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

    r231535 r232235  
    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

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

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

    r219743 r232235  
    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

    r216810 r232235  
    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

    r219743 r232235  
    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

    r219743 r232235  
    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

    r232201 r232235  
    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

    r165676 r232235  
    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

    r228218 r232235  
    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

    r226499 r232235  
    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

    r168047 r232235  
    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

    r232229 r232235  
     12018-05-27  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
     6        Reviewed by Sam Weinig.
     7
     8        * Carbon/CarbonWindowAdapter.h: Import Carbon.h instead of HIToolbox headers.
     9        * Carbon/CarbonWindowAdapter.mm: Ditto.
     10        * Carbon/CarbonWindowFrame.m: Ditto.
     11        * Carbon/HIViewAdapter.h: Ditto.
     12        * Configurations/WebKitLegacy.xcconfig: Removed -iframework options from OTHER_CFLAGS and
     13          OTHER_CPLUSPLUSFLAGS.
     14        * Plugins/WebNetscapePluginEventHandlerCarbon.mm: Import Carbon.h instead of CarbonEvents.h.
     15        * WebView/WebPDFDocumentExtras.mm: Import Quartz.h instead of a PDFKit header.
     16        * WebView/WebPDFView.h: Ditto.
     17
    1182018-05-27  Sam Weinig  <sam@webkit.org>
    219

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

    r232069 r232235  
    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

    r222896 r232235  
    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

    r201758 r232235  
    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

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

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

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

  • trunk/Tools/ChangeLog

    r232234 r232235  
     12018-05-27  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
     6        Reviewed by Sam Weinig.
     7
     8        * DumpRenderTree/cg/PixelDumpSupportCG.cpp: Include CoreServices.h instead of a
     9          LaunchServices header.
     10        * DumpRenderTree/mac/Configurations/BaseTarget.xcconfig: Removed -iframework options from
     11          OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
     12        * DumpRenderTree/mac/LayoutTestHelper.m: Import ApplicationServices.h instead of ColorSync.h
     13          when using SDKs earlier than 10.13.
     14        * TestWebKitAPI/Configurations/Base.xcconfig: Removed -iframework options from OTHER_CFLAGS
     15          and OTHER_CPLUSPLUSFLAGS.
     16        * TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm: Import Carbon.h instead of an
     17          HIToolbox header.
     18        * WebKitTestRunner/Configurations/BaseTarget.xcconfig: Removed -iframework options from
     19          OTHER_CFLAGS and OTHER_CPLUSPLUSFLAGS.
     20        * WebKitTestRunner/cg/TestInvocationCG.cpp: Include CoreServices.h instead of a
     21          LaunchServices header.
     22
    1232018-05-27  Fujii Hironori  <Hironori.Fujii@sony.com>
    224

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

    r225618 r232235  
    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

    r162573 r232235  
    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

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

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

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

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

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

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

    r189455 r232235  
    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

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