Attachment 341439 Details for Bug 186016 – Import umbrella framework headers

[patch] Import umbrella framework headers

bug-186016-20180527174704.patch (text/plain), 30.99 KB, created by mitz on 2018-05-27 17:47:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: mitz

Created: 2018-05-27 17:47:05 PDT

Size: 30.99 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 232225)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2018-05-27  Dan Bernstein  <mitz@apple.com>
>+
>+        [Cocoa] Avoid importing directly from subumbrella frameworks
>+        https://bugs.webkit.org/show_bug.cgi?id=186016
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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.
>+
> 2018-05-26  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Implement margin computation
>Index: Source/WebCore/Configurations/WebCore.xcconfig
>===================================================================
>--- Source/WebCore/Configurations/WebCore.xcconfig	(revision 232225)
>+++ Source/WebCore/Configurations/WebCore.xcconfig	(working copy)
>@@ -40,9 +40,6 @@ FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(
> SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks
> 
> LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_LIBWEBRTC_LIBRARY_DIR)";
>-ADDITIONAL_CFLAGS = -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks;
>-OTHER_CFLAGS = $(inherited) $(ADDITIONAL_CFLAGS);
>-OTHER_CPLUSPLUSFLAGS = $(inherited) $(ADDITIONAL_CFLAGS);
> 
> WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
> LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc/sdk/objc/Framework/Headers $(SDKROOT)/usr/local/include/webrtc/sdk/objc/Framework/Headers;
>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 232225)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2018-05-27  Dan Bernstein  <mitz@apple.com>
>+
>+        [Cocoa] Avoid importing directly from subumbrella frameworks
>+        https://bugs.webkit.org/show_bug.cgi?id=186016
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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.
>+
> 2018-05-25  Chris Dumez  <cdumez@apple.com>
> 
>         Drop support for NSURLCache in WebKit2
>Index: Source/WebCore/PAL/Configurations/PAL.xcconfig
>===================================================================
>--- Source/WebCore/PAL/Configurations/PAL.xcconfig	(revision 232225)
>+++ Source/WebCore/PAL/Configurations/PAL.xcconfig	(working copy)
>@@ -38,7 +38,7 @@ FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(
> 
> SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
> 
>-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
>+OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
> 
> HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
>Index: Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h
>===================================================================
>--- Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h	(revision 232225)
>+++ Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h	(working copy)
>@@ -33,13 +33,21 @@
> #endif
> 
> #if PLATFORM(MAC)
>+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
> #include <ColorSync/ColorSync.h>
>+#else
>+#include <ApplicationServices/ApplicationServices.h>
>+#endif
> #endif
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
> #if PLATFORM(MAC)
>+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
> #include <ColorSync/ColorSyncPriv.h>
>+#else
>+#include <ApplicationServices/ApplicationServicesPriv.h>
>+#endif
> #endif
> #include <CoreGraphics/CGFontCache.h>
> #include <CoreGraphics/CoreGraphicsPrivate.h>
>Index: Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h
>===================================================================
>--- Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h	(revision 232225)
>+++ Source/WebCore/PAL/pal/spi/mac/HIToolboxSPI.h	(working copy)
>@@ -27,7 +27,7 @@
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>-#include <HIToolbox/HIToolboxPriv.h>
>+#include <Carbon/CarbonPriv.h>
> 
> #else
> 
>Index: Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h
>===================================================================
>--- Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h	(revision 232225)
>+++ Source/WebCore/PAL/pal/spi/mac/QuickLookMacSPI.h	(working copy)
>@@ -23,7 +23,7 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import <QuickLookUI/QLPreviewItem.h>
>+#import <Quartz/Quartz.h>
> 
> @protocol QLPreviewMenuItemDelegate <NSObject>
> @optional
>Index: Source/WebCore/editing/mac/DictionaryLookup.mm
>===================================================================
>--- Source/WebCore/editing/mac/DictionaryLookup.mm	(revision 232225)
>+++ Source/WebCore/editing/mac/DictionaryLookup.mm	(working copy)
>@@ -42,7 +42,7 @@
> #import "VisiblePosition.h"
> #import "VisibleSelection.h"
> #import "VisibleUnits.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <pal/spi/mac/LookupSPI.h>
> #import <pal/spi/mac/NSImmediateActionGestureRecognizerSPI.h>
> #import <wtf/BlockObjCExceptions.h>
>Index: Source/WebCore/html/HTMLKeygenElement.cpp
>===================================================================
>--- Source/WebCore/html/HTMLKeygenElement.cpp	(revision 232225)
>+++ Source/WebCore/html/HTMLKeygenElement.cpp	(working copy)
>@@ -39,8 +39,6 @@
> #include <wtf/NeverDestroyed.h>
> #include <wtf/StdLibExtras.h>
> 
>-using namespace WebCore;
>-
> namespace WebCore {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(HTMLKeygenElement);
>Index: Source/WebCore/platform/mac/PlatformEventFactoryMac.mm
>===================================================================
>--- Source/WebCore/platform/mac/PlatformEventFactoryMac.mm	(revision 232225)
>+++ Source/WebCore/platform/mac/PlatformEventFactoryMac.mm	(working copy)
>@@ -33,8 +33,7 @@
> #import "PlatformScreen.h"
> #import "Scrollbar.h"
> #import "WindowsKeyboardCodes.h"
>-#import <HIToolbox/CarbonEvents.h>
>-#import <HIToolbox/Events.h>
>+#import <Carbon/Carbon.h>
> #import <mach/mach_time.h>
> #import <pal/spi/mac/HIToolboxSPI.h>
> #import <pal/spi/mac/NSEventSPI.h>
>Index: Source/WebCore/platform/mac/PlatformScreenMac.mm
>===================================================================
>--- Source/WebCore/platform/mac/PlatformScreenMac.mm	(revision 232225)
>+++ Source/WebCore/platform/mac/PlatformScreenMac.mm	(working copy)
>@@ -32,10 +32,15 @@
> #import "FrameView.h"
> #import "HostWindow.h"
> #import "ScreenProperties.h"
>-#import <ColorSync/ColorSync.h>
> #import <pal/spi/cg/CoreGraphicsSPI.h>
> #import <wtf/ProcessPrivilege.h>
> 
>+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
>+#import <ColorSync/ColorSync.h>
>+#else
>+#import <ApplicationServices/ApplicationServices.h>
>+#endif
>+
> extern "C" {
> bool CGDisplayUsesInvertedPolarity(void);
> bool CGDisplayUsesForceToGray(void);
>Index: Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp
>===================================================================
>--- Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp	(revision 232225)
>+++ Source/WebCore/platform/mediastream/CaptureDeviceManager.cpp	(working copy)
>@@ -36,7 +36,7 @@
> #include <wtf/MainThread.h>
> #include <wtf/text/StringHash.h>
> 
>-using namespace WebCore;
>+namespace WebCore {
> 
> CaptureDeviceManager::~CaptureDeviceManager() = default;
> 
>@@ -69,5 +69,6 @@ void CaptureDeviceManager::removeCapture
>     m_observers.remove(token);
> }
> 
>+} // namespace WebCore
> 
> #endif // ENABLE(MEDIA_STREAM)
>Index: Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm
>===================================================================
>--- Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm	(revision 232225)
>+++ Source/WebCore/platform/text/mac/TextEncodingRegistryMac.mm	(working copy)
>@@ -28,7 +28,7 @@
> 
> #if PLATFORM(MAC)
> 
>-#import <CarbonCore/CarbonCore.h>
>+#import <Carbon/Carbon.h>
> #import <wtf/spi/cf/CFStringSPI.h>
> 
> namespace WebCore {
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 232225)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,28 @@
>+2018-05-27  Dan Bernstein  <mitz@apple.com>
>+
>+        [Cocoa] Avoid importing directly from subumbrella frameworks
>+        https://bugs.webkit.org/show_bug.cgi?id=186016
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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.
>+
> 2018-05-25  Timothy Hatcher  <timothy@apple.com>
> 
>         Setting drawsBackground to YES on a WKView doesn't take effect immediately
>Index: Source/WebKit/Configurations/BaseTarget.xcconfig
>===================================================================
>--- Source/WebKit/Configurations/BaseTarget.xcconfig	(revision 232225)
>+++ Source/WebKit/Configurations/BaseTarget.xcconfig	(working copy)
>@@ -42,7 +42,7 @@ LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_
> 
> 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) $(HEADER_SEARCH_PATHS);
> 
>-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
>+OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
> 
> NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
>Index: Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm
>===================================================================
>--- Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm	(revision 232225)
>+++ Source/WebKit/UIProcess/Automation/mac/WebAutomationSessionMac.mm	(working copy)
>@@ -32,7 +32,7 @@
> #import "WebInspectorProxy.h"
> #import "WebPageProxy.h"
> #import "_WKAutomationSession.h"
>-#import <HIToolbox/Events.h>
>+#import <Carbon/Carbon.h>
> #import <WebCore/IntPoint.h>
> #import <WebCore/IntSize.h>
> #import <WebCore/PlatformMouseEvent.h>
>Index: Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm
>===================================================================
>--- Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	(revision 232225)
>+++ Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm	(working copy)
>@@ -67,7 +67,7 @@
> #import "WebProcessProxy.h"
> #import "_WKRemoteObjectRegistryInternal.h"
> #import "_WKThumbnailViewInternal.h"
>-#import <HIToolbox/CarbonEventsCore.h>
>+#import <Carbon/Carbon.h>
> #import <WebCore/AXObjectCache.h>
> #import <WebCore/ActivityState.h>
> #import <WebCore/ColorMac.h>
>Index: Source/WebKit/UIProcess/mac/WKPrintingView.mm
>===================================================================
>--- Source/WebKit/UIProcess/mac/WKPrintingView.mm	(revision 232225)
>+++ Source/WebKit/UIProcess/mac/WKPrintingView.mm	(working copy)
>@@ -34,7 +34,7 @@
> #import "PrintInfo.h"
> #import "ShareableBitmap.h"
> #import "WebPageProxy.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebCore/GraphicsContext.h>
> #import <WebCore/WebCoreObjCExtras.h>
> #import <wtf/RunLoop.h>
>Index: Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm
>===================================================================
>--- Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm	(revision 232225)
>+++ Source/WebKit/UIProcess/mac/WKTextInputWindowController.mm	(working copy)
>@@ -28,7 +28,7 @@
> 
> #if USE(APPKIT)
> 
>-#import <HIToolbox/CarbonEventsCore.h>
>+#import <Carbon/Carbon.h>
> #import <pal/spi/mac/HIToolboxSPI.h>
> #import <pal/system/mac/WebPanel.h>
> 
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFAnnotationTextWidgetDetails.h	(working copy)
>@@ -23,7 +23,7 @@
>  * THE POSSIBILITY OF SUCH DAMAGE.
>  */
> 
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> 
> @interface PDFAnnotationTextWidget (Details)
> - (BOOL)isMultiline;
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFLayerControllerSPI.h	(working copy)
>@@ -28,7 +28,7 @@
> 
> #if ENABLE(PDFKIT_PLUGIN)
> 
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> 
> @class CPReadingModel;
> @class PDFViewLayout;
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm	(working copy)
>@@ -50,7 +50,7 @@
> #import <JavaScriptCore/JSObjectRef.h>
> #import <JavaScriptCore/JSStringRef.h>
> #import <JavaScriptCore/JSStringRefCF.h>
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <QuartzCore/QuartzCore.h>
> #import <WebCore/AXObjectCache.h>
> #import <WebCore/ArchiveResource.h>
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFPluginAnnotation.mm	(working copy)
>@@ -33,7 +33,7 @@
> #import "PDFPlugin.h"
> #import "PDFPluginChoiceAnnotation.h"
> #import "PDFPluginTextAnnotation.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebCore/CSSPrimitiveValue.h>
> #import <WebCore/CSSPropertyNames.h>
> #import <WebCore/ColorMac.h>
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFPluginChoiceAnnotation.mm	(working copy)
>@@ -30,7 +30,7 @@
> 
> #import "PDFKitImports.h"
> #import "PDFLayerControllerSPI.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebCore/CSSPrimitiveValue.h>
> #import <WebCore/CSSPropertyNames.h>
> #import <WebCore/ColorMac.h>
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFPluginPasswordField.mm	(working copy)
>@@ -31,7 +31,7 @@
> #import "PDFKitImports.h"
> #import "PDFLayerControllerSPI.h"
> #import "PDFPlugin.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebCore/Event.h>
> #import <WebCore/EventNames.h>
> #import <WebCore/HTMLElement.h>
>Index: Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm
>===================================================================
>--- Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm	(working copy)
>@@ -32,7 +32,7 @@
> #import "PDFKitImports.h"
> #import "PDFLayerControllerSPI.h"
> #import "PDFPlugin.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebCore/CSSPrimitiveValue.h>
> #import <WebCore/CSSPropertyNames.h>
> #import <WebCore/ColorMac.h>
>Index: Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm	(revision 232225)
>+++ Source/WebKit/WebProcess/WebPage/mac/WebPageMac.mm	(working copy)
>@@ -53,7 +53,7 @@
> #import "WebPasteboardOverrides.h"
> #import "WebPreferencesStore.h"
> #import "WebProcess.h"
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <QuartzCore/QuartzCore.h>
> #import <WebCore/AXObjectCache.h>
> #import <WebCore/BackForwardController.h>
>Index: Source/WebKitLegacy/mac/ChangeLog
>===================================================================
>--- Source/WebKitLegacy/mac/ChangeLog	(revision 232225)
>+++ Source/WebKitLegacy/mac/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-05-27  Dan Bernstein  <mitz@apple.com>
>+
>+        [Cocoa] Avoid importing directly from subumbrella frameworks
>+        https://bugs.webkit.org/show_bug.cgi?id=186016
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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.
>+
> 2018-05-25  Chris Dumez  <cdumez@apple.com>
> 
>         Minor ApplicationCacheStorage clean up
>Index: Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h
>===================================================================
>--- Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h	(revision 232225)
>+++ Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.h	(working copy)
>@@ -28,8 +28,7 @@
> 
> #import <Foundation/Foundation.h>
> #import <AppKit/AppKit.h>
>-#import <HIToolbox/CarbonEvents.h>
>-#import <HIToolbox/MacWindows.h>
>+#import <Carbon/Carbon.h>
> 
> @interface CarbonWindowAdapter : NSWindow 
> {
>Index: Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm	(revision 232225)
>+++ Source/WebKitLegacy/mac/Carbon/CarbonWindowAdapter.mm	(working copy)
>@@ -65,9 +65,7 @@
> 
> #import <AppKit/AppKit.h>
> //#import <CoreGraphics/CGSWindow.h>
>-#import <HIToolbox/CarbonEvents.h>
>-#import <HIToolbox/Controls.h>
>-#import <HIToolbox/HIView.h>
>+#import <Carbon/Carbon.h>
> #import <assert.h>
> 
> #import <JavaScriptCore/InitializeThreading.h>
>Index: Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m
>===================================================================
>--- Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m	(revision 232225)
>+++ Source/WebKitLegacy/mac/Carbon/CarbonWindowFrame.m	(working copy)
>@@ -31,9 +31,9 @@
> #import "CarbonWindowFrame.h"
> #import "CarbonWindowAdapter.h"
> #import "CarbonWindowContentView.h"
>+#import <Carbon/Carbon.h>
> #import <Foundation/NSGeometry.h>
> #import <Foundation/NSString.h>
>-#import <HIToolbox/MacWindows.h>
> 
> #import "WebTypesInternal.h"
> 
>Index: Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h
>===================================================================
>--- Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h	(revision 232225)
>+++ Source/WebKitLegacy/mac/Carbon/HIViewAdapter.h	(working copy)
>@@ -27,7 +27,7 @@
>  */
> 
> #import <WebKitLegacy/WebKit.h>
>-#include <HIToolbox/HIView.h>
>+#include <Carbon/Carbon.h>
> 
> @interface HIViewAdapter : NSObject
> 
>Index: Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>===================================================================
>--- Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	(revision 232225)
>+++ Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	(working copy)
>@@ -48,7 +48,7 @@ SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inheri
> 
> OTHER_CFLAGS = $(OTHER_CFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
> OTHER_CFLAGS_COCOA_TOUCH_YES = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
>-OTHER_CFLAGS_COCOA_TOUCH_NO = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
>+OTHER_CFLAGS_COCOA_TOUCH_NO = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
> 
> GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
>Index: Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm
>===================================================================
>--- Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm	(revision 232225)
>+++ Source/WebKitLegacy/mac/Plugins/WebNetscapePluginEventHandlerCarbon.mm	(working copy)
>@@ -29,7 +29,7 @@
> 
> #import "WebNetscapePluginView.h"
> #import "WebKitLogging.h"
>-#import <HIToolbox/CarbonEvents.h>
>+#import <Carbon/Carbon.h>
> #import <pal/spi/mac/HIToolboxSPI.h>
> #import <pal/spi/mac/NSEventSPI.h>
> 
>Index: Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm	(revision 232225)
>+++ Source/WebKitLegacy/mac/WebView/WebPDFDocumentExtras.mm	(working copy)
>@@ -30,7 +30,7 @@
> #import <wtf/RetainPtr.h>
> 
> #if !PLATFORM(IOS)
>-#import <PDFKit/PDFDocument.h>
>+#import <Quartz/Quartz.h>
> #endif
> 
> static void appendValuesInPDFNameSubtreeToVector(CGPDFDictionaryRef subtree, Vector<CGPDFObjectRef>& values)
>Index: Source/WebKitLegacy/mac/WebView/WebPDFView.h
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebPDFView.h	(revision 232225)
>+++ Source/WebKitLegacy/mac/WebView/WebPDFView.h	(working copy)
>@@ -28,7 +28,7 @@
> 
> #if !PLATFORM(IOS)
> 
>-#import <PDFKit/PDFKit.h>
>+#import <Quartz/Quartz.h>
> #import <WebKitLegacy/WebDocumentInternal.h>
> 
> @class WebDataSource;
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 232228)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,25 @@
>+2018-05-27  Dan Bernstein  <mitz@apple.com>
>+
>+        [Cocoa] Avoid importing directly from subumbrella frameworks
>+        https://bugs.webkit.org/show_bug.cgi?id=186016
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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.
>+
> 2018-05-27  David Kilzer  <ddkilzer@apple.com>
> 
>         svn-apply fails when a patch has an empty file
>Index: Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp
>===================================================================
>--- Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp	(revision 232225)
>+++ Tools/DumpRenderTree/cg/PixelDumpSupportCG.cpp	(working copy)
>@@ -47,7 +47,7 @@
> #define COMMON_DIGEST_FOR_OPENSSL
> #include <CommonCrypto/CommonDigest.h>
> #elif PLATFORM(MAC)
>-#include <LaunchServices/UTCoreTypes.h>
>+#include <CoreServices/CoreServices.h>
> #define COMMON_DIGEST_FOR_OPENSSL
> #include <CommonCrypto/CommonDigest.h>
> #endif
>Index: Tools/DumpRenderTree/mac/LayoutTestHelper.m
>===================================================================
>--- Tools/DumpRenderTree/mac/LayoutTestHelper.m	(revision 232225)
>+++ Tools/DumpRenderTree/mac/LayoutTestHelper.m	(working copy)
>@@ -43,7 +43,11 @@
> 
> #if USE(APPLE_INTERNAL_SDK)
> 
>-#include <ColorSync/ColorSyncPriv.h>
>+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
>+#import <ColorSync/ColorSyncPriv.h>
>+#else
>+#import <ApplicationServices/ApplicationServicesPriv.h>
>+#endif
> 
> #else
> 
>Index: Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig
>===================================================================
>--- Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig	(revision 232225)
>+++ Tools/DumpRenderTree/mac/Configurations/BaseTarget.xcconfig	(working copy)
>@@ -21,7 +21,7 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
>-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
>+OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
> GCC_PREFIX_HEADER = DumpRenderTreePrefix.h;
>Index: Tools/TestWebKitAPI/Configurations/Base.xcconfig
>===================================================================
>--- Tools/TestWebKitAPI/Configurations/Base.xcconfig	(revision 232225)
>+++ Tools/TestWebKitAPI/Configurations/Base.xcconfig	(working copy)
>@@ -97,7 +97,7 @@ EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] 
> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *Mac.h *Mac.cpp *Mac.mm */mac/*;
> 
> OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
>-OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
>+OTHER_CFLAGS[sdk=macosx*] = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
> 
>Index: Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm	(revision 232225)
>+++ Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm	(working copy)
>@@ -29,7 +29,7 @@
> 
> #import "PlatformUtilities.h"
> #import "WebCoreTestSupport.h"
>-#import <HIToolbox/CarbonEvents.h>
>+#import <Carbon/Carbon.h>
> #import <IOKit/pwr_mgt/IOPMLib.h>
> #import <JavaScriptCore/JSContext.h>
> #import <WebCore/Settings.h>
>Index: Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig
>===================================================================
>--- Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig	(revision 232225)
>+++ Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig	(working copy)
>@@ -21,6 +21,4 @@
> // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
> 
>-OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
>-OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
> INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
>Index: Tools/WebKitTestRunner/cg/TestInvocationCG.cpp
>===================================================================
>--- Tools/WebKitTestRunner/cg/TestInvocationCG.cpp	(revision 232225)
>+++ Tools/WebKitTestRunner/cg/TestInvocationCG.cpp	(working copy)
>@@ -35,7 +35,7 @@
> #include <wtf/RetainPtr.h>
> 
> #if PLATFORM(MAC) && !PLATFORM(IOS)
>-#include <LaunchServices/UTCoreTypes.h>
>+#include <CoreServices/CoreServices.h>
> #endif
> 
> #if PLATFORM(IOS)

Flags:

sam: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 186016: 341411 | 341412 | 341435 | 341437 | 341439 | 358025