Diff
Modified: trunk/Source/WebCore/ChangeLog (229399 => 229400)
--- trunk/Source/WebCore/ChangeLog 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/ChangeLog 2018-03-08 08:28:38 UTC (rev 229400)
@@ -1,3 +1,34 @@
+2018-03-08 Tim Horton <timothy_hor...@apple.com>
+
+ Stop linking ApplicationServices directly
+ https://bugs.webkit.org/show_bug.cgi?id=182867
+ <rdar://problem/38252142>
+
+ Reviewed by Alex Christensen.
+
+ The frameworks that we use that live inside ApplicationServices
+ have mostly moved out, so import them directly.
+
+ * Configurations/WebCore.xcconfig:
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ * html/canvas/CanvasRenderingContext2DBase.cpp:
+ * platform/MIMETypeRegistry.cpp:
+ * platform/graphics/ComplexTextController.cpp:
+ * platform/graphics/cg/ColorCG.cpp:
+ * platform/graphics/cg/ImageDecoderCG.cpp:
+ * platform/graphics/cg/UTIRegistry.cpp:
+ * platform/graphics/cocoa/FontCocoa.mm:
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ * platform/graphics/mac/GlyphPageMac.cpp:
+ * platform/graphics/mac/PDFDocumentImageMac.mm:
+ * platform/graphics/mac/SimpleFontDataCoreText.cpp:
+ * platform/graphics/win/FontCGWin.cpp:
+ * platform/graphics/win/FontCacheWin.cpp:
+ * platform/graphics/win/FontCustomPlatformData.cpp:
+ * platform/graphics/win/FontPlatformDataCGWin.cpp:
+ * platform/graphics/win/ImageCGWin.cpp:
+ * platform/graphics/win/SimpleFontDataCGWin.cpp:
+
2018-03-07 Tim Horton <timothy_hor...@apple.com>
Sort and separate FeatureDefines.xcconfig
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (229399 => 229400)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2018-03-08 08:28:38 UTC (rev 229400)
@@ -82,7 +82,7 @@
OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework MobileCoreServices -framework OpenGLES -lMobileGestalt $(WK_IOS_BINCOMPAT_LDFLAGS) -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI;
OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface -framework IOSurfaceAccelerator -framework GraphicsServices $(LIBWEBRTC_LDFLAGS);
OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = $(OTHER_LDFLAGS_BASE_ios) $(LIBWEBRTC_LDFLAGS);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework DataDetectorsCore -framework IOSurface -framework OpenGL -framework SystemConfiguration $(LIBWEBRTC_LDFLAGS);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -framework AudioUnit -framework Carbon -framework Cocoa -framework DataDetectorsCore -framework IOSurface -framework OpenGL -framework SystemConfiguration $(LIBWEBRTC_LDFLAGS);
WK_UNDEFINED_SYMBOLS_LDFLAGS[sdk=macosx*] = $(WK_UNDEFINED_SYMBOLS_LDFLAGS$(WK_MACOS_1013));
WK_UNDEFINED_SYMBOLS_LDFLAGS_MACOS_BEFORE_1013 = -Wl,-U,_CTFontCreatePhysicalFontForCharactersWithLanguage;
Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp (229399 => 229400)
--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2DBase.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -67,10 +67,6 @@
#include <wtf/text/StringBuilder.h>
#include <wtf/text/TextStream.h>
-#if USE(CG) && !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
namespace WebCore {
using namespace HTMLNames;
Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -36,6 +36,7 @@
#if USE(CG)
#include "ImageSourceCG.h"
#include "UTIRegistry.h"
+#include <ImageIO/ImageIO.h>
#include <wtf/RetainPtr.h>
#endif
@@ -43,14 +44,6 @@
#include "UTIUtilities.h"
#endif
-#if USE(CG) && !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
-#if PLATFORM(IOS)
-#include <ImageIO/CGImageDestination.h>
-#endif
-
#if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
#include "ArchiveFactory.h"
#endif
Modified: trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -41,10 +41,6 @@
#include <CoreText/CoreText.h>
#endif
-#if PLATFORM(MAC)
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
namespace WebCore {
class TextLayout {
Modified: trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/cg/ColorCG.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -32,12 +32,8 @@
#include <wtf/Assertions.h>
#include <wtf/RetainPtr.h>
#include <wtf/TinyLRUCache.h>
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <pal/spi/cg/CoreGraphicsSPI.h>
#include <wtf/StdLibExtras.h>
-#endif // !PLATFORM(IOS)
namespace WebCore {
static CGColorRef leakCGColor(const Color&) CF_RETURNS_RETAINED;
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageDecoderCG.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -36,13 +36,8 @@
#include "SharedBuffer.h"
#include "UTIRegistry.h"
#include <pal/spi/cg/ImageIOSPI.h>
-
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <ImageIO/ImageIO.h>
#include <pal/spi/cg/CoreGraphicsSPI.h>
-#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/cg/UTIRegistry.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/cg/UTIRegistry.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/cg/UTIRegistry.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -30,12 +30,7 @@
#include <wtf/HashSet.h>
#include <wtf/NeverDestroyed.h>
-
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <ImageIO/ImageIO.h>
-#endif
#if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)
#include "ArchiveFactory.h"
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2018-03-08 08:28:38 UTC (rev 229400)
@@ -34,6 +34,7 @@
#import "FontDescription.h"
#import "OpenTypeCG.h"
#import "SharedBuffer.h"
+#import <CoreText/CoreText.h>
#import <float.h>
#import <pal/spi/cg/CoreGraphicsSPI.h>
#import <pal/spi/cocoa/CoreTextSPI.h>
@@ -44,11 +45,9 @@
#if USE(APPKIT)
#import <AppKit/AppKit.h>
-#import <ApplicationServices/ApplicationServices.h>
-#else
-#import <CoreText/CoreText.h>
#endif
+
#if USE(APPKIT)
@interface NSFont (WebAppKitSecretAPI)
- (BOOL)_isFakeFixedPitch;
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2018-03-08 08:28:38 UTC (rev 229400)
@@ -30,12 +30,7 @@
#include <pal/spi/cocoa/CoreTextSPI.h>
#include <wtf/SoftLinking.h>
#include <wtf/WeakPtr.h>
-
-#if PLATFORM(IOS)
#include <CoreText/CoreText.h>
-#else
-#include <ApplicationServices/ApplicationServices.h>
-#endif
// Note: CTFontDescriptorRefs can live forever in caches inside CoreText, so this object can too.
@interface WebCascadeList : NSArray {
Modified: trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/mac/GlyphPageMac.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -33,9 +33,6 @@
#include "FontCascade.h"
#include <pal/spi/cg/CoreGraphicsSPI.h>
#include <pal/spi/cocoa/CoreTextSPI.h>
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/mac/PDFDocumentImageMac.mm 2018-03-08 08:28:38 UTC (rev 229400)
@@ -35,10 +35,6 @@
#import <wtf/RetainPtr.h>
#import <wtf/SoftLinking.h>
-#if USE(APPLE_INTERNAL_SDK)
-#import <ApplicationServices/ApplicationServicesPriv.h>
-#endif
-
SOFT_LINK_FRAMEWORK_IN_UMBRELLA(Quartz, PDFKit)
SOFT_LINK_CLASS(PDFKit, PDFDocument)
Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataCoreText.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -27,11 +27,7 @@
#include "config.h"
#include "Font.h"
-#if !PLATFORM(IOS)
-#include <ApplicationServices/ApplicationServices.h>
-#else
#include <CoreText/CoreText.h>
-#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/win/FontCGWin.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -36,7 +36,6 @@
#include "IntRect.h"
#include "UniscribeController.h"
#include "WebCoreTextRenderer.h"
-#include <ApplicationServices/ApplicationServices.h>
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#include <wtf/MathExtras.h>
Modified: trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -43,7 +43,6 @@
#include <wtf/win/GDIObject.h>
#if USE(CG)
-#include <ApplicationServices/ApplicationServices.h>
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#include <pal/spi/cg/CoreGraphicsSPI.h>
#endif
Modified: trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -30,7 +30,6 @@
#include <wtf/win/GDIObject.h>
#if USE(CG)
-#include <ApplicationServices/ApplicationServices.h>
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif
Modified: trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCGWin.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -27,7 +27,6 @@
#if USE(CG)
#include "SharedGDIObject.h"
-#include <ApplicationServices/ApplicationServices.h>
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#include <wtf/HashMap.h>
#include <wtf/RetainPtr.h>
Modified: trunk/Source/WebCore/platform/graphics/win/ImageCGWin.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/win/ImageCGWin.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/win/ImageCGWin.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -31,7 +31,6 @@
#include "BitmapImage.h"
#include "BitmapInfo.h"
#include "GraphicsContextCG.h"
-#include <ApplicationServices/ApplicationServices.h>
#include <windows.h>
#include <wtf/RetainPtr.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp (229399 => 229400)
--- trunk/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebCore/platform/graphics/win/SimpleFontDataCGWin.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -37,7 +37,6 @@
#include "GlyphPage.h"
#include "HWndDC.h"
#include "OpenTypeCG.h"
-#include <ApplicationServices/ApplicationServices.h>
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#include <mlang.h>
#include <pal/spi/win/CoreTextSPIWin.h>
Modified: trunk/Source/WebKit/ChangeLog (229399 => 229400)
--- trunk/Source/WebKit/ChangeLog 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebKit/ChangeLog 2018-03-08 08:28:38 UTC (rev 229400)
@@ -1,3 +1,16 @@
+2018-03-08 Tim Horton <timothy_hor...@apple.com>
+
+ Stop linking ApplicationServices directly
+ https://bugs.webkit.org/show_bug.cgi?id=182867
+ <rdar://problem/38252142>
+
+ Reviewed by Alex Christensen.
+
+ The frameworks that we use that live inside ApplicationServices
+ have mostly moved out, so import them directly.
+
+ * Configurations/WebKit.xcconfig:
+
2018-03-08 Wenson Hsieh <wenson_hs...@apple.com>
[Extra zoom mode] Specify password mode as needed when inputting text
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (229399 => 229400)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2018-03-08 08:28:38 UTC (rev 229400)
@@ -41,7 +41,7 @@
FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphonesimulator*] = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios);
FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_iphoneos = ;
FRAMEWORK_AND_LIBRARY_LDFLAGS_PLATFORM_iphonesimulator = ;
-FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=macosx*] = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
+FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=macosx*] = -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
// Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12Policy
ActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE;
Modified: trunk/Source/WebKitLegacy/mac/Carbon/CarbonUtils.h (229399 => 229400)
--- trunk/Source/WebKitLegacy/mac/Carbon/CarbonUtils.h 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebKitLegacy/mac/Carbon/CarbonUtils.h 2018-03-08 08:28:38 UTC (rev 229400)
@@ -36,7 +36,6 @@
#include <WebKitLegacy/WebKitAvailability.h>
#ifdef __OBJC__
-#import <ApplicationServices/ApplicationServices.h>
@class NSImage;
#endif
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (229399 => 229400)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-03-08 08:28:38 UTC (rev 229400)
@@ -1,3 +1,19 @@
+2018-03-08 Tim Horton <timothy_hor...@apple.com>
+
+ Stop linking ApplicationServices directly
+ https://bugs.webkit.org/show_bug.cgi?id=182867
+ <rdar://problem/38252142>
+
+ Reviewed by Alex Christensen.
+
+ The frameworks that we use that live inside ApplicationServices
+ have mostly moved out, so import them directly.
+
+ * Carbon/CarbonUtils.h:
+ * WebKitPrefix.h:
+ * WebView/WebHTMLView.mm:
+ * WebView/WebPDFView.mm:
+
2018-03-07 Tim Horton <timothy_hor...@apple.com>
Sort and separate FeatureDefines.xcconfig
Modified: trunk/Source/WebKitLegacy/mac/WebKitPrefix.h (229399 => 229400)
--- trunk/Source/WebKitLegacy/mac/WebKitPrefix.h 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebKitLegacy/mac/WebKitPrefix.h 2018-03-08 08:28:38 UTC (rev 229400)
@@ -61,7 +61,6 @@
#endif
#if !TARGET_OS_IPHONE
-#import <ApplicationServices/ApplicationServices.h>
#import <Carbon/Carbon.h>
#ifndef CGFLOAT_DEFINED
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (229399 => 229400)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2018-03-08 08:28:38 UTC (rev 229400)
@@ -149,7 +149,6 @@
#import "WebNSEventExtras.h"
#import "WebNSPasteboardExtras.h"
#import <AppKit/NSAccessibility.h>
-#import <ApplicationServices/ApplicationServices.h>
#import <WebCore/PlatformEventFactoryMac.h>
#import <pal/spi/mac/NSMenuSPI.h>
#endif
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm (229399 => 229400)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm 2018-03-08 08:28:38 UTC (rev 229400)
@@ -66,10 +66,6 @@
#import <WebCore/WebNSAttributedStringExtras.h>
#import <wtf/Assertions.h>
-#if USE(APPLE_INTERNAL_SDK)
-#import <ApplicationServices/ApplicationServicesPriv.h>
-#endif
-
extern "C" {
bool CGContextGetAllowsFontSmoothing(CGContextRef context);
bool CGContextGetAllowsFontSubpixelQuantization(CGContextRef context);
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (229399 => 229400)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2018-03-08 08:28:38 UTC (rev 229400)
@@ -1,3 +1,16 @@
+2018-03-08 Tim Horton <timothy_hor...@apple.com>
+
+ Stop linking ApplicationServices directly
+ https://bugs.webkit.org/show_bug.cgi?id=182867
+ <rdar://problem/38252142>
+
+ Reviewed by Alex Christensen.
+
+ The frameworks that we use that live inside ApplicationServices
+ have mostly moved out, so import them directly.
+
+ * FullscreenVideoController.cpp:
+
2018-03-05 Yusuke Suzuki <utatane....@gmail.com>
Fix std::make_unique / new[] using system malloc
Modified: trunk/Source/WebKitLegacy/win/FullscreenVideoController.cpp (229399 => 229400)
--- trunk/Source/WebKitLegacy/win/FullscreenVideoController.cpp 2018-03-08 08:16:10 UTC (rev 229399)
+++ trunk/Source/WebKitLegacy/win/FullscreenVideoController.cpp 2018-03-08 08:28:38 UTC (rev 229400)
@@ -30,7 +30,6 @@
#include "WebKitDLL.h"
#include "WebView.h"
-#include <ApplicationServices/ApplicationServices.h>
#include <WebCore/BitmapInfo.h>
#include <WebCore/Chrome.h>
#include <WebCore/FloatRoundedRect.h>
