Diff
Modified: trunk/Source/WebCore/ChangeLog (205515 => 205516)
--- trunk/Source/WebCore/ChangeLog 2016-09-06 22:59:29 UTC (rev 205515)
+++ trunk/Source/WebCore/ChangeLog 2016-09-06 23:01:53 UTC (rev 205516)
@@ -1,3 +1,29 @@
+2016-09-06 David Kilzer <[email protected]>
+
+ [iOS] Remove soft linking of MobileCoreServices.framework
+ <https://webkit.org/b/161641>
+ <rdar://problem/10420118>
+
+ 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 <MobileCoreServices/MobileCoreServices.h> as
+ needed.
+
+ * rendering/RenderThemeIOS.mm: Remove unused soft link to
+ MobileCoreServices.framework.
+
2016-09-06 Chris Dumez <[email protected]>
Align srcset attribute parsing with the HTML specification
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (205515 => 205516)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-09-06 22:59:29 UTC (rev 205515)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-09-06 23:01:53 UTC (rev 205516)
@@ -71,7 +71,7 @@
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;
Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (205515 => 205516)
--- trunk/Source/WebCore/editing/ios/EditorIOS.mm 2016-09-06 22:59:29 UTC (rev 205515)
+++ trunk/Source/WebCore/editing/ios/EditorIOS.mm 2016-09-06 23:01:53 UTC (rev 205516)
@@ -23,62 +23,47 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "config.h"
-#include "Editor.h"
+#import "config.h"
+#import "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 <wtf/BlockObjCExceptions.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 <MobileCoreServices/MobileCoreServices.h>
+#import <wtf/BlockObjCExceptions.h>
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;
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageSourceCGMac.mm (205515 => 205516)
--- trunk/Source/WebCore/platform/graphics/cg/ImageSourceCGMac.mm 2016-09-06 22:59:29 UTC (rev 205515)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageSourceCGMac.mm 2016-09-06 23:01:53 UTC (rev 205516)
@@ -30,18 +30,7 @@
#import <wtf/text/WTFString.h>
#if PLATFORM(IOS)
-#include "SoftLinking.h"
-#include <MobileCoreServices/MobileCoreServices.h>
-
-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 <MobileCoreServices/MobileCoreServices.h>
#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm (205515 => 205516)
--- trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm 2016-09-06 22:59:29 UTC (rev 205515)
+++ trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm 2016-09-06 23:01:53 UTC (rev 205516)
@@ -31,6 +31,12 @@
#import "SharedBuffer.h"
#import <wtf/text/WTFString.h>
+#if PLATFORM(IOS)
+#import <CoreGraphics/CoreGraphics.h>
+#import <ImageIO/ImageIO.h>
+#import <MobileCoreServices/MobileCoreServices.h>
+#endif
+
@interface WebCoreBundleFinder : NSObject
@end
@@ -37,18 +43,6 @@
@implementation WebCoreBundleFinder
@end
-#if PLATFORM(IOS)
-#import "SoftLinking.h"
-
-#import <CoreGraphics/CoreGraphics.h>
-#import <ImageIO/ImageIO.h>
-#import <MobileCoreServices/MobileCoreServices.h>
-
-SOFT_LINK_FRAMEWORK(MobileCoreServices)
-SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeTIFF, CFStringRef)
-#define kUTTypeTIFF getkUTTypeTIFF()
-#endif
-
namespace WebCore {
void BitmapImage::invalidatePlatformData()
Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (205515 => 205516)
--- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2016-09-06 22:59:29 UTC (rev 205515)
+++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2016-09-06 23:01:53 UTC (rev 205516)
@@ -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?
Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (205515 => 205516)
--- trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2016-09-06 22:59:29 UTC (rev 205515)
+++ trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm 2016-09-06 23:01:53 UTC (rev 205516)
@@ -32,6 +32,7 @@
#import "Pasteboard.h"
#import "SharedBuffer.h"
#import "SoftLinking.h"
+#import <MobileCoreServices/MobileCoreServices.h>
SOFT_LINK_FRAMEWORK(UIKit)
SOFT_LINK_CLASS(UIKit, UIPasteboard)
@@ -45,31 +46,6 @@
- (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()
Modified: trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm (205515 => 205516)
--- trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm 2016-09-06 22:59:29 UTC (rev 205515)
+++ trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm 2016-09-06 23:01:53 UTC (rev 205516)
@@ -28,22 +28,14 @@
#import "config.h"
#import "WebCoreURLResponseIOS.h"
+
+#import "QuickLook.h"
#import "UTIUtilities.h"
#import "WebCoreSystemInterface.h"
+#import <MobileCoreServices/MobileCoreServices.h>
-#import "QuickLook.h"
#import "QuickLookSoftLink.h"
-#import "SoftLinking.h"
-#import <MobileCoreServices/MobileCoreServices.h>
-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()
-
namespace WebCore {
void adjustMIMETypeIfNecessary(CFURLResponseRef cfResponse, bool isMainResourceLoad)
Modified: trunk/Source/WebCore/platform/network/mac/UTIUtilities.mm (205515 => 205516)
--- trunk/Source/WebCore/platform/network/mac/UTIUtilities.mm 2016-09-06 22:59:29 UTC (rev 205515)
+++ trunk/Source/WebCore/platform/network/mac/UTIUtilities.mm 2016-09-06 23:01:53 UTC (rev 205516)
@@ -27,21 +27,7 @@
#import "UTIUtilities.h"
#if PLATFORM(IOS)
-#import "SoftLinking.h"
#import <MobileCoreServices/MobileCoreServices.h>
-
-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 {
Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (205515 => 205516)
--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-09-06 22:59:29 UTC (rev 205515)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-09-06 23:01:53 UTC (rev 205516)
@@ -74,9 +74,6 @@
#import <wtf/RefPtr.h>
#import <wtf/StdLibExtras.h>
-SOFT_LINK_FRAMEWORK(MobileCoreServices)
-SOFT_LINK_CLASS(MobileCoreServices, LSDocumentProxy)
-
SOFT_LINK_FRAMEWORK(UIKit)
SOFT_LINK_CLASS(UIKit, UIApplication)
SOFT_LINK_CLASS(UIKit, UIColor)
