From ea2d1922d76fe022733affdac81408b6950c1266 Mon Sep 17 00:00:00 2001 From: "ddkilzer@apple.com" Date: Tue, 6 Sep 2016 23:01:53 +0000 Subject: [PATCH] [iOS] Remove soft linking of MobileCoreServices.framework Reviewed by Darin Adler. * Configurations/WebCore.xcconfig: Add hard link to MobileCoreServices.framework. * editing/ios/EditorIOS.mm: Change #include to #import. * platform/graphics/cg/ImageSourceCGMac.mm: * platform/graphics/mac/ImageMac.mm: * platform/ios/PasteboardIOS.mm: * platform/ios/PlatformPasteboardIOS.mm: * platform/network/ios/WebCoreURLResponseIOS.mm: * platform/network/mac/UTIUtilities.mm: - Rearrange import statements as needed. - Remove soft link to MobileCoreServices.framework. - Add import of as needed. * rendering/RenderThemeIOS.mm: Remove unused soft link to MobileCoreServices.framework. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@205516 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 26 +++++++ Source/WebCore/Configurations/WebCore.xcconfig | 2 +- Source/WebCore/editing/ios/EditorIOS.mm | 89 +++++++++------------- .../platform/graphics/cg/ImageSourceCGMac.mm | 13 +--- Source/WebCore/platform/graphics/mac/ImageMac.mm | 18 ++--- Source/WebCore/platform/ios/PasteboardIOS.mm | 32 -------- .../WebCore/platform/ios/PlatformPasteboardIOS.mm | 26 +------ .../platform/network/ios/WebCoreURLResponseIOS.mm | 14 +--- .../WebCore/platform/network/mac/UTIUtilities.mm | 14 ---- Source/WebCore/rendering/RenderThemeIOS.mm | 3 - 10 files changed, 75 insertions(+), 162 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 7bf2d75..03dca53 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,29 @@ +2016-09-06 David Kilzer + + [iOS] Remove soft linking of MobileCoreServices.framework + + + + Reviewed by Darin Adler. + + * Configurations/WebCore.xcconfig: Add hard link to + MobileCoreServices.framework. + + * editing/ios/EditorIOS.mm: Change #include to #import. + * platform/graphics/cg/ImageSourceCGMac.mm: + * platform/graphics/mac/ImageMac.mm: + * platform/ios/PasteboardIOS.mm: + * platform/ios/PlatformPasteboardIOS.mm: + * platform/network/ios/WebCoreURLResponseIOS.mm: + * platform/network/mac/UTIUtilities.mm: + - Rearrange import statements as needed. + - Remove soft link to MobileCoreServices.framework. + - Add import of as + needed. + + * rendering/RenderThemeIOS.mm: Remove unused soft link to + MobileCoreServices.framework. + 2016-09-06 Chris Dumez Align srcset attribute parsing with the HTML specification diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig index 6bde0fb..07a34f7 100644 --- a/Source/WebCore/Configurations/WebCore.xcconfig +++ b/Source/WebCore/Configurations/WebCore.xcconfig @@ -71,7 +71,7 @@ WK_GAMECONTROLLER_LDFLAGS_ENABLE_GAMEPAD[sdk=macosx*] = -weak_framework GameCont OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM) $(WK_GAMECONTROLLER_LDFLAGS); OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE; -OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework OpenGLES -lMobileGestalt $(WK_IOS_BINCOMPAT_LDFLAGS); +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); OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface; OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = $(OTHER_LDFLAGS_BASE_ios); OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework CoreAudio -framework DataDetectorsCore -framework IOSurface -framework OpenGL -framework SystemConfiguration; diff --git a/Source/WebCore/editing/ios/EditorIOS.mm b/Source/WebCore/editing/ios/EditorIOS.mm index 9e69754..4afe13d 100644 --- a/Source/WebCore/editing/ios/EditorIOS.mm +++ b/Source/WebCore/editing/ios/EditorIOS.mm @@ -23,62 +23,47 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" -#include "Editor.h" - -#include "CSSComputedStyleDeclaration.h" -#include "CSSPrimitiveValueMappings.h" -#include "CachedImage.h" -#include "CachedResourceLoader.h" -#include "DataTransfer.h" -#include "DocumentFragment.h" -#include "DocumentLoader.h" -#include "EditorClient.h" -#include "FontCascade.h" -#include "Frame.h" -#include "FrameLoaderClient.h" -#include "HTMLConverter.h" -#include "HTMLImageElement.h" -#include "HTMLInputElement.h" -#include "HTMLNames.h" -#include "HTMLParserIdioms.h" -#include "HTMLTextAreaElement.h" -#include "LegacyWebArchive.h" -#include "NSAttributedStringSPI.h" -#include "NodeTraversal.h" -#include "Page.h" -#include "Pasteboard.h" -#include "RenderBlock.h" -#include "RenderImage.h" -#include "SharedBuffer.h" -#include "SoftLinking.h" -#include "StyleProperties.h" -#include "Text.h" -#include "TypingCommand.h" -#include "WAKAppKitStubs.h" -#include "htmlediting.h" -#include "markup.h" -#include +#import "config.h" +#import "Editor.h" + +#import "CSSComputedStyleDeclaration.h" +#import "CSSPrimitiveValueMappings.h" +#import "CachedImage.h" +#import "CachedResourceLoader.h" +#import "DataTransfer.h" +#import "DocumentFragment.h" +#import "DocumentLoader.h" +#import "EditorClient.h" +#import "FontCascade.h" +#import "Frame.h" +#import "FrameLoaderClient.h" +#import "HTMLConverter.h" +#import "HTMLImageElement.h" +#import "HTMLInputElement.h" +#import "HTMLNames.h" +#import "HTMLParserIdioms.h" +#import "HTMLTextAreaElement.h" +#import "LegacyWebArchive.h" +#import "NSAttributedStringSPI.h" +#import "NodeTraversal.h" +#import "Page.h" +#import "Pasteboard.h" +#import "RenderBlock.h" +#import "RenderImage.h" +#import "SharedBuffer.h" +#import "SoftLinking.h" +#import "StyleProperties.h" +#import "Text.h" +#import "TypingCommand.h" +#import "WAKAppKitStubs.h" +#import "htmlediting.h" +#import "markup.h" +#import +#import SOFT_LINK_FRAMEWORK(AppSupport) SOFT_LINK(AppSupport, CPSharedResourcesDirectory, CFStringRef, (void), ()) -SOFT_LINK_FRAMEWORK(MobileCoreServices) - -SOFT_LINK(MobileCoreServices, UTTypeConformsTo, Boolean, (CFStringRef inUTI, CFStringRef inConformsToUTI), (inUTI, inConformsToUTI)) -SOFT_LINK(MobileCoreServices, UTTypeCreatePreferredIdentifierForTag, CFStringRef, (CFStringRef inTagClass, CFStringRef inTag, CFStringRef inConformingToUTI), (inTagClass, inTag, inConformingToUTI)) -SOFT_LINK(MobileCoreServices, UTTypeCopyPreferredTagWithClass, CFStringRef, (CFStringRef inUTI, CFStringRef inTagClass), (inUTI, inTagClass)) - -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypePNG, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeJPEG, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef) - -#define kUTTypePNG getkUTTypePNG() -#define kUTTypeJPEG getkUTTypeJPEG() -#define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension() -#define kUTTagClassMIMEType getkUTTagClassMIMEType() - @interface NSAttributedString (NSAttributedStringKitAdditions) - (id)initWithRTF:(NSData *)data documentAttributes:(NSDictionary **)dict; - (id)initWithRTFD:(NSData *)data documentAttributes:(NSDictionary **)dict; diff --git a/Source/WebCore/platform/graphics/cg/ImageSourceCGMac.mm b/Source/WebCore/platform/graphics/cg/ImageSourceCGMac.mm index edf9e49..a65fbb7 100644 --- a/Source/WebCore/platform/graphics/cg/ImageSourceCGMac.mm +++ b/Source/WebCore/platform/graphics/cg/ImageSourceCGMac.mm @@ -30,18 +30,7 @@ #import #if PLATFORM(IOS) -#include "SoftLinking.h" -#include - -SOFT_LINK_FRAMEWORK(MobileCoreServices) - -SOFT_LINK(MobileCoreServices, UTTypeCopyPreferredTagWithClass, CFStringRef, (CFStringRef inUTI, CFStringRef inTagClass), (inUTI, inTagClass)) - -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef) - -#define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension() -#define kUTTagClassMIMEType getkUTTagClassMIMEType() +#import #endif namespace WebCore { diff --git a/Source/WebCore/platform/graphics/mac/ImageMac.mm b/Source/WebCore/platform/graphics/mac/ImageMac.mm index 01eb6dd..1c87741 100644 --- a/Source/WebCore/platform/graphics/mac/ImageMac.mm +++ b/Source/WebCore/platform/graphics/mac/ImageMac.mm @@ -31,24 +31,18 @@ #import "SharedBuffer.h" #import -@interface WebCoreBundleFinder : NSObject -@end - -@implementation WebCoreBundleFinder -@end - #if PLATFORM(IOS) -#import "SoftLinking.h" - #import #import #import - -SOFT_LINK_FRAMEWORK(MobileCoreServices) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeTIFF, CFStringRef) -#define kUTTypeTIFF getkUTTypeTIFF() #endif +@interface WebCoreBundleFinder : NSObject +@end + +@implementation WebCoreBundleFinder +@end + namespace WebCore { void BitmapImage::invalidatePlatformData() diff --git a/Source/WebCore/platform/ios/PasteboardIOS.mm b/Source/WebCore/platform/ios/PasteboardIOS.mm index 952ff0a..8b018ac 100644 --- a/Source/WebCore/platform/ios/PasteboardIOS.mm +++ b/Source/WebCore/platform/ios/PasteboardIOS.mm @@ -45,7 +45,6 @@ #import "RenderImage.h" #import "RuntimeApplicationChecks.h" #import "SharedBuffer.h" -#import "SoftLinking.h" #import "Text.h" #import "URL.h" #import "WebNSAttributedStringExtras.h" @@ -61,37 +60,6 @@ - (BOOL)containsAttachments; @end -// FIXME: The following soft linking and #define needs to be shared with PlatformPasteboardIOS.mm and EditorIOS.mm - -SOFT_LINK_FRAMEWORK(MobileCoreServices) - -SOFT_LINK(MobileCoreServices, UTTypeCreatePreferredIdentifierForTag, CFStringRef, (CFStringRef inTagClass, CFStringRef inTag, CFStringRef inConformingToUTI), (inTagClass, inTag, inConformingToUTI)) -SOFT_LINK(MobileCoreServices, UTTypeCopyPreferredTagWithClass, CFStringRef, (CFStringRef inUTI, CFStringRef inTagClass), (inUTI, inTagClass)) - -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeText, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypePNG, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeJPEG, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeURL, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeTIFF, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeGIF, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeHTML, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeFlatRTFD, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeRTF, CFStringRef) - -#define kUTTypeText getkUTTypeText() -#define kUTTypePNG getkUTTypePNG() -#define kUTTypeJPEG getkUTTypeJPEG() -#define kUTTypeURL getkUTTypeURL() -#define kUTTypeTIFF getkUTTypeTIFF() -#define kUTTypeGIF getkUTTypeGIF() -#define kUTTagClassMIMEType getkUTTagClassMIMEType() -#define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension() -#define kUTTypeHTML getkUTTypeHTML() -#define kUTTypeFlatRTFD getkUTTypeFlatRTFD() -#define kUTTypeRTF getkUTTypeRTF() - namespace WebCore { // FIXME: Does this need to be declared in the header file? diff --git a/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm b/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm index d8886fb..9294cfb 100644 --- a/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm +++ b/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm @@ -32,6 +32,7 @@ #import "Pasteboard.h" #import "SharedBuffer.h" #import "SoftLinking.h" +#import SOFT_LINK_FRAMEWORK(UIKit) SOFT_LINK_CLASS(UIKit, UIPasteboard) @@ -45,31 +46,6 @@ SOFT_LINK_CLASS(UIKit, UIPasteboard) - (NSInteger)changeCount; @end -// FIXME: The following soft linking and #define needs to be shared with PasteboardIOS.mm. -SOFT_LINK_FRAMEWORK(MobileCoreServices) - -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeText, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypePNG, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeJPEG, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeURL, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeTIFF, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeGIF, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeFlatRTFD, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeRTF, CFStringRef) - -#define kUTTypeText getkUTTypeText() -#define kUTTypePNG getkUTTypePNG() -#define kUTTypeJPEG getkUTTypeJPEG() -#define kUTTypeURL getkUTTypeURL() -#define kUTTypeTIFF getkUTTypeTIFF() -#define kUTTypeGIF getkUTTypeGIF() -#define kUTTagClassMIMEType getkUTTagClassMIMEType() -#define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension() -#define kUTTypeFlatRTFD getkUTTypeFlatRTFD() -#define kUTTypeRTF getkUTTypeRTF() - namespace WebCore { PlatformPasteboard::PlatformPasteboard() diff --git a/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm b/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm index 14a7f193..f6caa29 100644 --- a/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm +++ b/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm @@ -28,21 +28,13 @@ #import "config.h" #import "WebCoreURLResponseIOS.h" -#import "UTIUtilities.h" -#import "WebCoreSystemInterface.h" #import "QuickLook.h" -#import "QuickLookSoftLink.h" -#import "SoftLinking.h" +#import "UTIUtilities.h" +#import "WebCoreSystemInterface.h" #import -SOFT_LINK_FRAMEWORK(MobileCoreServices) - -SOFT_LINK(MobileCoreServices, UTTypeCreatePreferredIdentifierForTag, CFStringRef, (CFStringRef inTagClass, CFStringRef inTag, CFStringRef inConformingToUTI), (inTagClass, inTag, inConformingToUTI)) - -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef) - -#define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension() +#import "QuickLookSoftLink.h" namespace WebCore { diff --git a/Source/WebCore/platform/network/mac/UTIUtilities.mm b/Source/WebCore/platform/network/mac/UTIUtilities.mm index 8b19119..3a42acf 100644 --- a/Source/WebCore/platform/network/mac/UTIUtilities.mm +++ b/Source/WebCore/platform/network/mac/UTIUtilities.mm @@ -27,21 +27,7 @@ #import "UTIUtilities.h" #if PLATFORM(IOS) -#import "SoftLinking.h" #import - -SOFT_LINK_FRAMEWORK(MobileCoreServices) - -SOFT_LINK(MobileCoreServices, UTTypeIsDeclared, Boolean, (CFStringRef inUTI), (inUTI)) -SOFT_LINK(MobileCoreServices, UTTypeCopyDeclaration, CFDictionaryRef, (CFStringRef inUTI), (inUTI)) -SOFT_LINK(MobileCoreServices, UTTypeCopyPreferredTagWithClass, CFStringRef, (CFStringRef inUTI, CFStringRef inTagClass), (inUTI, inTagClass)) -SOFT_LINK(MobileCoreServices, UTTypeCreatePreferredIdentifierForTag, CFStringRef, (CFStringRef inTagClass, CFStringRef inTag, CFStringRef inConformingToUTI), (inTagClass, inTag, inConformingToUTI)) - -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeConformsToKey, CFStringRef) -SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef) - -#define kUTTagClassMIMEType getkUTTagClassMIMEType() -#define kUTTypeConformsToKey getkUTTypeConformsToKey() #endif namespace WebCore { diff --git a/Source/WebCore/rendering/RenderThemeIOS.mm b/Source/WebCore/rendering/RenderThemeIOS.mm index f9c9c91..e11e69f 100644 --- a/Source/WebCore/rendering/RenderThemeIOS.mm +++ b/Source/WebCore/rendering/RenderThemeIOS.mm @@ -74,9 +74,6 @@ #import #import -SOFT_LINK_FRAMEWORK(MobileCoreServices) -SOFT_LINK_CLASS(MobileCoreServices, LSDocumentProxy) - SOFT_LINK_FRAMEWORK(UIKit) SOFT_LINK_CLASS(UIKit, UIApplication) SOFT_LINK_CLASS(UIKit, UIColor) -- 1.8.3.1