Changeset 205516 in webkit


Ignore:
Timestamp:
Sep 6, 2016 4:01:53 PM (8 years ago)
Author:
ddkilzer@apple.com
Message:

[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.

Location:
trunk/Source/WebCore
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r205515 r205516  
     12016-09-06  David Kilzer  <ddkilzer@apple.com>
     2
     3        [iOS] Remove soft linking of MobileCoreServices.framework
     4        <https://webkit.org/b/161641>
     5        <rdar://problem/10420118>
     6
     7        Reviewed by Darin Adler.
     8
     9        * Configurations/WebCore.xcconfig: Add hard link to
     10        MobileCoreServices.framework.
     11
     12        * editing/ios/EditorIOS.mm: Change #include to #import.
     13        * platform/graphics/cg/ImageSourceCGMac.mm:
     14        * platform/graphics/mac/ImageMac.mm:
     15        * platform/ios/PasteboardIOS.mm:
     16        * platform/ios/PlatformPasteboardIOS.mm:
     17        * platform/network/ios/WebCoreURLResponseIOS.mm:
     18        * platform/network/mac/UTIUtilities.mm:
     19        - Rearrange import statements as needed.
     20        - Remove soft link to MobileCoreServices.framework.
     21        - Add import of <MobileCoreServices/MobileCoreServices.h> as
     22          needed.
     23
     24        * rendering/RenderThemeIOS.mm: Remove unused soft link to
     25        MobileCoreServices.framework.
     26
    1272016-09-06  Chris Dumez  <cdumez@apple.com>
    228

  • trunk/Source/WebCore/Configurations/WebCore.xcconfig

    r205357 r205516  
    7272OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM) $(WK_GAMECONTROLLER_LDFLAGS);
    7373OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
    74 OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework OpenGLES -lMobileGestalt $(WK_IOS_BINCOMPAT_LDFLAGS);
     74OTHER_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);
    7575OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface;
    7676OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = $(OTHER_LDFLAGS_BASE_ios);

  • trunk/Source/WebCore/editing/ios/EditorIOS.mm

    r204717 r205516  
    2424 */
    2525
    26 #include "config.h"
    27 #include "Editor.h"
    28 
    29 #include "CSSComputedStyleDeclaration.h"
    30 #include "CSSPrimitiveValueMappings.h"
    31 #include "CachedImage.h"
    32 #include "CachedResourceLoader.h"
    33 #include "DataTransfer.h"
    34 #include "DocumentFragment.h"
    35 #include "DocumentLoader.h"
    36 #include "EditorClient.h"
    37 #include "FontCascade.h"
    38 #include "Frame.h"
    39 #include "FrameLoaderClient.h"
    40 #include "HTMLConverter.h"
    41 #include "HTMLImageElement.h"
    42 #include "HTMLInputElement.h"
    43 #include "HTMLNames.h"
    44 #include "HTMLParserIdioms.h"
    45 #include "HTMLTextAreaElement.h"
    46 #include "LegacyWebArchive.h"
    47 #include "NSAttributedStringSPI.h"
    48 #include "NodeTraversal.h"
    49 #include "Page.h"
    50 #include "Pasteboard.h"
    51 #include "RenderBlock.h"
    52 #include "RenderImage.h"
    53 #include "SharedBuffer.h"
    54 #include "SoftLinking.h"
    55 #include "StyleProperties.h"
    56 #include "Text.h"
    57 #include "TypingCommand.h"
    58 #include "WAKAppKitStubs.h"
    59 #include "htmlediting.h"
    60 #include "markup.h"
    61 #include <wtf/BlockObjCExceptions.h>
     26#import "config.h"
     27#import "Editor.h"
     28
     29#import "CSSComputedStyleDeclaration.h"
     30#import "CSSPrimitiveValueMappings.h"
     31#import "CachedImage.h"
     32#import "CachedResourceLoader.h"
     33#import "DataTransfer.h"
     34#import "DocumentFragment.h"
     35#import "DocumentLoader.h"
     36#import "EditorClient.h"
     37#import "FontCascade.h"
     38#import "Frame.h"
     39#import "FrameLoaderClient.h"
     40#import "HTMLConverter.h"
     41#import "HTMLImageElement.h"
     42#import "HTMLInputElement.h"
     43#import "HTMLNames.h"
     44#import "HTMLParserIdioms.h"
     45#import "HTMLTextAreaElement.h"
     46#import "LegacyWebArchive.h"
     47#import "NSAttributedStringSPI.h"
     48#import "NodeTraversal.h"
     49#import "Page.h"
     50#import "Pasteboard.h"
     51#import "RenderBlock.h"
     52#import "RenderImage.h"
     53#import "SharedBuffer.h"
     54#import "SoftLinking.h"
     55#import "StyleProperties.h"
     56#import "Text.h"
     57#import "TypingCommand.h"
     58#import "WAKAppKitStubs.h"
     59#import "htmlediting.h"
     60#import "markup.h"
     61#import <MobileCoreServices/MobileCoreServices.h>
     62#import <wtf/BlockObjCExceptions.h>
    6263
    6364SOFT_LINK_FRAMEWORK(AppSupport)
    6465SOFT_LINK(AppSupport, CPSharedResourcesDirectory, CFStringRef, (void), ())
    65 
    66 SOFT_LINK_FRAMEWORK(MobileCoreServices)
    67 
    68 SOFT_LINK(MobileCoreServices, UTTypeConformsTo, Boolean, (CFStringRef inUTI, CFStringRef inConformsToUTI), (inUTI, inConformsToUTI))
    69 SOFT_LINK(MobileCoreServices, UTTypeCreatePreferredIdentifierForTag, CFStringRef, (CFStringRef inTagClass, CFStringRef inTag, CFStringRef inConformingToUTI), (inTagClass, inTag, inConformingToUTI))
    70 SOFT_LINK(MobileCoreServices, UTTypeCopyPreferredTagWithClass, CFStringRef, (CFStringRef inUTI, CFStringRef inTagClass), (inUTI, inTagClass))
    71 
    72 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypePNG, CFStringRef)
    73 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeJPEG, CFStringRef)
    74 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef)
    75 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef)
    76 
    77 #define kUTTypePNG  getkUTTypePNG()
    78 #define kUTTypeJPEG getkUTTypeJPEG()
    79 #define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension()
    80 #define kUTTagClassMIMEType getkUTTagClassMIMEType()
    8166
    8267@interface NSAttributedString (NSAttributedStringKitAdditions)

  • trunk/Source/WebCore/platform/graphics/cg/ImageSourceCGMac.mm

    r161589 r205516  
    3131
    3232#if PLATFORM(IOS)
    33 #include "SoftLinking.h"
    34 #include <MobileCoreServices/MobileCoreServices.h>
    35 
    36 SOFT_LINK_FRAMEWORK(MobileCoreServices)
    37 
    38 SOFT_LINK(MobileCoreServices, UTTypeCopyPreferredTagWithClass, CFStringRef, (CFStringRef inUTI, CFStringRef inTagClass), (inUTI, inTagClass))
    39 
    40 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef)
    41 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef)
    42 
    43 #define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension()
    44 #define kUTTagClassMIMEType getkUTTagClassMIMEType()
     33#import <MobileCoreServices/MobileCoreServices.h>
    4534#endif
    4635

  • trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm

    r202242 r205516  
    3232#import <wtf/text/WTFString.h>
    3333
     34#if PLATFORM(IOS)
     35#import <CoreGraphics/CoreGraphics.h>
     36#import <ImageIO/ImageIO.h>
     37#import <MobileCoreServices/MobileCoreServices.h>
     38#endif
     39
    3440@interface WebCoreBundleFinder : NSObject
    3541@end
    … …  
    3743@implementation WebCoreBundleFinder
    3844@end
    39 
    40 #if PLATFORM(IOS)
    41 #import "SoftLinking.h"
    42 
    43 #import <CoreGraphics/CoreGraphics.h>
    44 #import <ImageIO/ImageIO.h>
    45 #import <MobileCoreServices/MobileCoreServices.h>
    46 
    47 SOFT_LINK_FRAMEWORK(MobileCoreServices)
    48 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeTIFF, CFStringRef)
    49 #define kUTTypeTIFF getkUTTypeTIFF()
    50 #endif
    5145
    5246namespace WebCore {

  • trunk/Source/WebCore/platform/ios/PasteboardIOS.mm

    r204717 r205516  
    4646#import "RuntimeApplicationChecks.h"
    4747#import "SharedBuffer.h"
    48 #import "SoftLinking.h"
    4948#import "Text.h"
    5049#import "URL.h"
    … …  
    6160- (BOOL)containsAttachments;
    6261@end
    63 
    64 // FIXME: The following soft linking and #define needs to be shared with PlatformPasteboardIOS.mm and EditorIOS.mm
    65 
    66 SOFT_LINK_FRAMEWORK(MobileCoreServices)
    67 
    68 SOFT_LINK(MobileCoreServices, UTTypeCreatePreferredIdentifierForTag, CFStringRef, (CFStringRef inTagClass, CFStringRef inTag, CFStringRef inConformingToUTI), (inTagClass, inTag, inConformingToUTI))
    69 SOFT_LINK(MobileCoreServices, UTTypeCopyPreferredTagWithClass, CFStringRef, (CFStringRef inUTI, CFStringRef inTagClass), (inUTI, inTagClass))
    70 
    71 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeText, CFStringRef)
    72 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypePNG, CFStringRef)
    73 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeJPEG, CFStringRef)
    74 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeURL, CFStringRef)
    75 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeTIFF, CFStringRef)
    76 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeGIF, CFStringRef)
    77 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef)
    78 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef)
    79 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeHTML, CFStringRef)
    80 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeFlatRTFD, CFStringRef)
    81 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeRTF, CFStringRef)
    82 
    83 #define kUTTypeText getkUTTypeText()
    84 #define kUTTypePNG  getkUTTypePNG()
    85 #define kUTTypeJPEG getkUTTypeJPEG()
    86 #define kUTTypeURL  getkUTTypeURL()
    87 #define kUTTypeTIFF getkUTTypeTIFF()
    88 #define kUTTypeGIF  getkUTTypeGIF()
    89 #define kUTTagClassMIMEType getkUTTagClassMIMEType()
    90 #define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension()
    91 #define kUTTypeHTML getkUTTypeHTML()
    92 #define kUTTypeFlatRTFD getkUTTypeFlatRTFD()
    93 #define kUTTypeRTF getkUTTypeRTF()
    9462
    9563namespace WebCore {

  • trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm

    r203109 r205516  
    3333#import "SharedBuffer.h"
    3434#import "SoftLinking.h"
     35#import <MobileCoreServices/MobileCoreServices.h>
    3536
    3637SOFT_LINK_FRAMEWORK(UIKit)
    … …  
    4546- (NSInteger)changeCount;
    4647@end
    47 
    48 // FIXME: The following soft linking and #define needs to be shared with PasteboardIOS.mm.
    49 SOFT_LINK_FRAMEWORK(MobileCoreServices)
    50 
    51 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeText, CFStringRef)
    52 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypePNG, CFStringRef)
    53 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeJPEG, CFStringRef)
    54 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeURL, CFStringRef)
    55 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeTIFF, CFStringRef)
    56 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeGIF, CFStringRef)
    57 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef)
    58 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef)
    59 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeFlatRTFD, CFStringRef)
    60 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeRTF, CFStringRef)
    61 
    62 #define kUTTypeText getkUTTypeText()
    63 #define kUTTypePNG  getkUTTypePNG()
    64 #define kUTTypeJPEG getkUTTypeJPEG()
    65 #define kUTTypeURL  getkUTTypeURL()
    66 #define kUTTypeTIFF getkUTTypeTIFF()
    67 #define kUTTypeGIF  getkUTTypeGIF()
    68 #define kUTTagClassMIMEType getkUTTagClassMIMEType()
    69 #define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension()
    70 #define kUTTypeFlatRTFD getkUTTypeFlatRTFD()
    71 #define kUTTypeRTF getkUTTypeRTF()
    7248
    7349namespace WebCore {

  • trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm

    r199682 r205516  
    2929#import "config.h"
    3030#import "WebCoreURLResponseIOS.h"
     31
     32#import "QuickLook.h"
    3133#import "UTIUtilities.h"
    3234#import "WebCoreSystemInterface.h"
    33 
    34 #import "QuickLook.h"
    35 #import "QuickLookSoftLink.h"
    36 #import "SoftLinking.h"
    3735#import <MobileCoreServices/MobileCoreServices.h>
    3836
    39 SOFT_LINK_FRAMEWORK(MobileCoreServices)
    40 
    41 SOFT_LINK(MobileCoreServices, UTTypeCreatePreferredIdentifierForTag, CFStringRef, (CFStringRef inTagClass, CFStringRef inTag, CFStringRef inConformingToUTI), (inTagClass, inTag, inConformingToUTI))
    42 
    43 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassFilenameExtension, CFStringRef)
    44 
    45 #define kUTTagClassFilenameExtension getkUTTagClassFilenameExtension()
     37#import "QuickLookSoftLink.h"
    4638
    4739namespace WebCore {

  • trunk/Source/WebCore/platform/network/mac/UTIUtilities.mm

    r200530 r205516  
    2828
    2929#if PLATFORM(IOS)
    30 #import "SoftLinking.h"
    3130#import <MobileCoreServices/MobileCoreServices.h>
    32 
    33 SOFT_LINK_FRAMEWORK(MobileCoreServices)
    34 
    35 SOFT_LINK(MobileCoreServices, UTTypeIsDeclared, Boolean, (CFStringRef inUTI), (inUTI))
    36 SOFT_LINK(MobileCoreServices, UTTypeCopyDeclaration, CFDictionaryRef, (CFStringRef inUTI), (inUTI))
    37 SOFT_LINK(MobileCoreServices, UTTypeCopyPreferredTagWithClass, CFStringRef, (CFStringRef inUTI, CFStringRef inTagClass), (inUTI, inTagClass))
    38 SOFT_LINK(MobileCoreServices, UTTypeCreatePreferredIdentifierForTag, CFStringRef, (CFStringRef inTagClass, CFStringRef inTag, CFStringRef inConformingToUTI), (inTagClass, inTag, inConformingToUTI))
    39 
    40 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTypeConformsToKey, CFStringRef)
    41 SOFT_LINK_CONSTANT(MobileCoreServices, kUTTagClassMIMEType, CFStringRef)
    42 
    43 #define kUTTagClassMIMEType getkUTTagClassMIMEType()
    44 #define kUTTypeConformsToKey getkUTTypeConformsToKey()
    4531#endif
    4632

  • trunk/Source/WebCore/rendering/RenderThemeIOS.mm

    r205282 r205516  
    7575#import <wtf/StdLibExtras.h>
    7676
    77 SOFT_LINK_FRAMEWORK(MobileCoreServices)
    78 SOFT_LINK_CLASS(MobileCoreServices, LSDocumentProxy)
    79 
    8077SOFT_LINK_FRAMEWORK(UIKit)
    8178SOFT_LINK_CLASS(UIKit, UIApplication)
Note: See TracChangeset for help on using the changeset viewer.