Changeset 240211 in webkit
- Timestamp:
- Jan 20, 2019 10:02:36 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 49 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r240209 r240211 1 2019-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 1 15 2019-01-20 chris fleizach <cfleizach@apple.com> 2 16 -
trunk/Source/WebCore/Configurations/WebCore.xcconfig
r240176 r240211 39 39 40 40 LIBRARY_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);44 41 45 42 WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions; -
trunk/Source/WebCore/PAL/ChangeLog
r240208 r240211 1 2019-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 1 16 2019-01-20 Antoine Quint <graouts@apple.com> 2 17 -
trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig
r240176 r240211 34 34 SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks; 35 35 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;36 OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; 37 37 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS); 38 38 -
trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h
r239948 r240211 31 31 32 32 #if PLATFORM(MAC) 33 #import < LaunchServices/LaunchServicesPriv.h>33 #import <CoreServices/CoreServicesPriv.h> 34 34 #elif PLATFORM(IOS_FAMILY) 35 35 #import <MobileCoreServices/LSAppLinkPriv.h> -
trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h
r239948 r240211 30 30 #if USE(APPLE_INTERNAL_SDK) 31 31 32 #include <HIServices/AXTextMarker.h> 33 #include <HIServices/CoreCursor.h> 34 #include <HIServices/CoreDrag.h> 32 #include <ApplicationServices/ApplicationServicesPriv.h> 35 33 36 34 #else -
trunk/Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h
r239948 r240211 28 28 #if USE(APPLE_INTERNAL_SDK) 29 29 30 #include < HIToolbox/HIToolboxPriv.h>30 #include <Carbon/CarbonPriv.h> 31 31 32 32 #else -
trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h
r239948 r240211 28 28 #if USE(APPLE_INTERNAL_SDK) 29 29 30 #include < Metadata/MetadataPriv.h>30 #include <CoreServices/CoreServicesPriv.h> 31 31 32 32 #endif -
trunk/Source/WebCore/PAL/pal/spi/mac/QuickDrawSPI.h
r239948 r240211 30 30 #if USE(APPLE_INTERNAL_SDK) 31 31 32 #include < QD/QuickdrawPriv.h>32 #include <ApplicationServices/ApplicationServicesPriv.h> 33 33 34 34 #else -
trunk/Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h
r239948 r240211 24 24 */ 25 25 26 #import <Qu ickLookUI/QLPreviewItem.h>26 #import <Quartz/Quartz.h> 27 27 28 28 @protocol QLPreviewMenuItemDelegate <NSObject> -
trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h
r239948 r240211 28 28 #if USE(APPLE_INTERNAL_SDK) 29 29 30 #include < SpeechSynthesis/SpeechSynthesisPriv.h>30 #include <ApplicationServices/ApplicationServicesPriv.h> 31 31 32 32 #endif -
trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm
r239948 r240211 36 36 37 37 #if USE(APPLE_INTERNAL_SDK) 38 #include < HIServices/AccessibilityPriv.h>38 #include <ApplicationServices/ApplicationServicesPriv.h> 39 39 #endif 40 40 -
trunk/Source/WebCore/editing/cocoa/DictionaryLookup.mm
r240169 r240211 55 55 #import <wtf/RefPtr.h> 56 56 57 #if !PLATFORM(WATCH) 57 #if PLATFORM(MAC) 58 #import <Quartz/Quartz.h> 59 #elif !PLATFORM(WATCH) 58 60 #import <PDFKit/PDFKit.h> 59 #endif // !PLATFORM(WATCH)61 #endif 60 62 61 63 #if PLATFORM(IOSMAC) -
trunk/Source/WebCore/editing/mac/DictionaryLookupLegacy.mm
r239948 r240211 43 43 #import "VisibleSelection.h" 44 44 #import "VisibleUnits.h" 45 #import < PDFKit/PDFKit.h>45 #import <Quartz/Quartz.h> 46 46 #import <pal/spi/mac/LookupSPI.h> 47 47 #import <pal/spi/mac/NSImmediateActionGestureRecognizerSPI.h> -
trunk/Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
r239948 r240211 34 34 #import "Scrollbar.h" 35 35 #import "WindowsKeyboardCodes.h" 36 #import <HIToolbox/CarbonEvents.h> 37 #import <HIToolbox/Events.h> 36 #import <Carbon/Carbon.h> 38 37 #import <mach/mach_time.h> 39 38 #import <pal/spi/mac/HIToolboxSPI.h> -
trunk/Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm
r239948 r240211 29 29 #if PLATFORM(MAC) 30 30 31 #import <Carbon Core/CarbonCore.h>31 #import <Carbon/Carbon.h> 32 32 #import <wtf/spi/cf/CFStringSPI.h> 33 33 -
trunk/Source/WebKit/ChangeLog
r240209 r240211 1 2019-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 1 27 2019-01-20 chris fleizach <cfleizach@apple.com> 2 28 -
trunk/Source/WebKit/Configurations/BaseTarget.xcconfig
r240176 r240211 41 41 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); 42 42 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;43 OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; 44 44 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders; 45 45 -
trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm
r239948 r240211 57 57 58 58 #if USE(APPLE_INTERNAL_SDK) 59 #import < HIServices/AccessibilityPriv.h>59 #import <ApplicationServices/ApplicationServicesPriv.h> 60 60 #else 61 61 typedef enum { -
trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm
r239948 r240211 42 42 #import <mach/task.h> 43 43 #import <pal/crypto/CryptoDigest.h> 44 #import <pal/spi/cocoa/LaunchServicesSPI.h> 44 45 #import <pwd.h> 45 46 #import <stdlib.h> … … 56 57 57 58 #if USE(APPLE_INTERNAL_SDK) 58 #import < HIServices/ProcessesPriv.h>59 #import <ApplicationServices/ApplicationServicesPriv.h> 59 60 #import <rootless.h> 60 61 #endif … … 66 67 #endif 67 68 69 #if PLATFORM(IOSMAC) && USE(APPLE_INTERNAL_SDK) 70 enum LSSessionID { 71 kLSDefaultSessionID = -2, 72 }; 73 #endif 74 68 75 typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef ); 69 76 extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block); 70 extern "C" CFDictionaryRef _LSApplicationCheckIn( intsessionID, CFDictionaryRef applicationInfo);77 extern "C" CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo); 71 78 72 79 extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon); … … 153 160 #endif 154 161 162 // FIXME: Is this needed in iOSMac? 155 163 launchServicesCheckIn(); 156 164 } … … 159 167 { 160 168 _LSSetApplicationLaunchServicesServerConnectionStatus(0, 0); 161 RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn( -2, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));169 RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(kLSDefaultSessionID, CFBundleGetInfoDictionary(CFBundleGetMainBundle())); 162 170 } 163 171 -
trunk/Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm
r239948 r240211 34 34 #import "WebPageProxy.h" 35 35 #import "_WKAutomationSession.h" 36 #import < HIToolbox/Events.h>36 #import <Carbon/Carbon.h> 37 37 #import <WebCore/IntPoint.h> 38 38 #import <WebCore/IntSize.h> -
trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
r240209 r240211 77 77 #import "_WKRemoteObjectRegistryInternal.h" 78 78 #import "_WKThumbnailViewInternal.h" 79 #import < HIToolbox/CarbonEventsCore.h>79 #import <Carbon/Carbon.h> 80 80 #import <WebCore/AXObjectCache.h> 81 81 #import <WebCore/ActivityState.h> -
trunk/Source/WebKit/UIProcess/mac/WKPrintingView.mm
r239948 r240211 35 35 #import "ShareableBitmap.h" 36 36 #import "WebPageProxy.h" 37 #import < PDFKit/PDFKit.h>37 #import <Quartz/Quartz.h> 38 38 #import <WebCore/GraphicsContext.h> 39 39 #import <WebCore/LocalDefaultSystemAppearance.h> -
trunk/Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm
r239948 r240211 29 29 #if USE(APPKIT) 30 30 31 #import < HIToolbox/CarbonEventsCore.h>31 #import <Carbon/Carbon.h> 32 32 #import <pal/spi/mac/HIToolboxSPI.h> 33 33 #import <pal/system/mac/WebPanel.h> -
trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h
r239948 r240211 24 24 */ 25 25 26 #import < PDFKit/PDFKit.h>26 #import <Quartz/Quartz.h> 27 27 28 28 @interface PDFAnnotationTextWidget (Details) -
trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h
r239948 r240211 29 29 #if ENABLE(PDFKIT_PLUGIN) 30 30 31 #import < PDFKit/PDFKit.h>31 #import <Quartz/Quartz.h> 32 32 33 33 @class CPReadingModel; -
trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
r239948 r240211 49 49 #import <JavaScriptCore/JSContextRef.h> 50 50 #import <JavaScriptCore/JSObjectRef.h> 51 #import < PDFKit/PDFKit.h>51 #import <Quartz/Quartz.h> 52 52 #import <QuartzCore/QuartzCore.h> 53 53 #import <WebCore/AXObjectCache.h> -
trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm
r239948 r240211 34 34 #import "PDFPluginChoiceAnnotation.h" 35 35 #import "PDFPluginTextAnnotation.h" 36 #import < PDFKit/PDFKit.h>36 #import <Quartz/Quartz.h> 37 37 #import <WebCore/CSSPrimitiveValue.h> 38 38 #import <WebCore/CSSPropertyNames.h> -
trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm
r239948 r240211 31 31 #import "PDFKitImports.h" 32 32 #import "PDFLayerControllerSPI.h" 33 #import < PDFKit/PDFKit.h>33 #import <Quartz/Quartz.h> 34 34 #import <WebCore/CSSPrimitiveValue.h> 35 35 #import <WebCore/CSSPropertyNames.h> -
trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm
r239948 r240211 32 32 #import "PDFLayerControllerSPI.h" 33 33 #import "PDFPlugin.h" 34 #import < PDFKit/PDFKit.h>34 #import <Quartz/Quartz.h> 35 35 #import <WebCore/Event.h> 36 36 #import <WebCore/EventNames.h> -
trunk/Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm
r239948 r240211 33 33 #import "PDFLayerControllerSPI.h" 34 34 #import "PDFPlugin.h" 35 #import < PDFKit/PDFKit.h>35 #import <Quartz/Quartz.h> 36 36 #import <WebCore/CSSPrimitiveValue.h> 37 37 #import <WebCore/CSSPropertyNames.h> -
trunk/Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
r239948 r240211 54 54 #import "WebPreferencesStore.h" 55 55 #import "WebProcess.h" 56 #import < PDFKit/PDFKit.h>56 #import <Quartz/Quartz.h> 57 57 #import <QuartzCore/QuartzCore.h> 58 58 #import <WebCore/AXObjectCache.h> -
trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h
r239948 r240211 29 29 #import <Foundation/Foundation.h> 30 30 #import <AppKit/AppKit.h> 31 #import <HIToolbox/CarbonEvents.h> 32 #import <HIToolbox/MacWindows.h> 31 #import <Carbon/Carbon.h> 33 32 34 33 @interface CarbonWindowAdapter : NSWindow -
trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm
r239948 r240211 66 66 #import <AppKit/AppKit.h> 67 67 //#import <CoreGraphics/CGSWindow.h> 68 #import <HIToolbox/CarbonEvents.h> 69 #import <HIToolbox/Controls.h> 70 #import <HIToolbox/HIView.h> 68 #import <Carbon/Carbon.h> 71 69 #import <assert.h> 72 70 -
trunk/Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m
r239948 r240211 32 32 #import "CarbonWindowAdapter.h" 33 33 #import "CarbonWindowContentView.h" 34 #import <Carbon/Carbon.h> 34 35 #import <Foundation/NSGeometry.h> 35 36 #import <Foundation/NSString.h> 36 #import <HIToolbox/MacWindows.h>37 37 38 38 #import "WebTypesInternal.h" -
trunk/Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h
r239948 r240211 28 28 29 29 #import <WebKitLegacy/WebKit.h> 30 #include < HIToolbox/HIView.h>30 #include <Carbon/Carbon.h> 31 31 32 32 @interface HIViewAdapter : NSObject -
trunk/Source/WebKitLegacy/mac/ChangeLog
r240208 r240211 1 2019-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 1 19 2019-01-20 Antoine Quint <graouts@apple.com> 2 20 -
trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
r240176 r240211 49 49 OTHER_CFLAGS = $(OTHER_CFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH)); 50 50 OTHER_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;51 OTHER_CFLAGS_COCOA_TOUCH_NO = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks; 52 52 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS); 53 53 -
trunk/Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm
r239948 r240211 30 30 #import "WebNetscapePluginView.h" 31 31 #import "WebKitLogging.h" 32 #import < HIToolbox/CarbonEvents.h>32 #import <Carbon/Carbon.h> 33 33 #import <pal/spi/mac/HIToolboxSPI.h> 34 34 #import <pal/spi/mac/NSEventSPI.h> -
trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h
r239948 r240211 26 26 #if USE(APPLE_INTERNAL_SDK) 27 27 28 #import < PDFKit/PDFViewPriv.h>28 #import <Quartz/QuartzPrivate.h> 29 29 30 30 #else -
trunk/Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm
r239948 r240211 31 31 32 32 #if !PLATFORM(IOS_FAMILY) 33 #import < PDFKit/PDFDocument.h>33 #import <Quartz/Quartz.h> 34 34 #endif 35 35 -
trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.h
r239948 r240211 29 29 #if !PLATFORM(IOS_FAMILY) 30 30 31 #import < PDFKit/PDFKit.h>31 #import <Quartz/Quartz.h> 32 32 #import <WebKitLegacy/WebDocumentInternal.h> 33 33 -
trunk/Tools/ChangeLog
r240210 r240211 1 2019-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 1 22 2019-01-20 Tadeu Zagallo <tzagallo@apple.com> 2 23 -
trunk/Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp
r239948 r240211 48 48 #include <CommonCrypto/CommonDigest.h> 49 49 #elif PLATFORM(MAC) 50 #include < LaunchServices/UTCoreTypes.h>50 #include <CoreServices/CoreServices.h> 51 51 #define COMMON_DIGEST_FOR_OPENSSL 52 52 #include <CommonCrypto/CommonDigest.h> -
trunk/Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig
r239948 r240211 22 22 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 23 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;24 OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks; 25 25 OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS); 26 26 GCC_ENABLE_OBJC_EXCEPTIONS = YES; -
trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m
r239948 r240211 44 44 #if USE(APPLE_INTERNAL_SDK) 45 45 46 #i nclude<ColorSync/ColorSyncPriv.h>46 #import <ColorSync/ColorSyncPriv.h> 47 47 48 48 #else -
trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig
r240176 r240211 103 103 104 104 OTHER_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;105 OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; 106 106 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS); 107 107 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS); -
trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig
r239948 r240211 22 22 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 23 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);26 24 INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources; -
trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp
r239948 r240211 36 36 37 37 #if PLATFORM(MAC) && !PLATFORM(IOS_FAMILY) 38 #include < LaunchServices/UTCoreTypes.h>38 #include <CoreServices/CoreServices.h> 39 39 #endif 40 40
Note: See TracChangeset
for help on using the changeset viewer.