<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205516] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205516">205516</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-09-06 16:01:53 -0700 (Tue, 06 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreeditingiosEditorIOSmm">trunk/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageSourceCGMacmm">trunk/Source/WebCore/platform/graphics/cg/ImageSourceCGMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacImageMacmm">trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PasteboardIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm">trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkiosWebCoreURLResponseIOSmm">trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacUTIUtilitiesmm">trunk/Source/WebCore/platform/network/mac/UTIUtilities.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205515 => 205516)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-09-06 David Kilzer <ddkilzer@apple.com>
+
+ [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.
+
</ins><span class="cx"> 2016-09-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Align srcset attribute parsing with the HTML specification
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (205515 => 205516)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM) $(WK_GAMECONTROLLER_LDFLAGS);
</span><span class="cx"> OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
</span><del>-OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework OpenGLES -lMobileGestalt $(WK_IOS_BINCOMPAT_LDFLAGS);
</del><ins>+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);
</ins><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface;
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = $(OTHER_LDFLAGS_BASE_ios);
</span><span class="cx"> 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;
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (205515 => 205516)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,62 +23,47 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include "config.h"
-#include "Editor.h"
</del><ins>+#import "config.h"
+#import "Editor.h"
</ins><span class="cx">
</span><del>-#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>
</del><ins>+#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>
</ins><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK(AppSupport)
</span><span class="cx"> SOFT_LINK(AppSupport, CPSharedResourcesDirectory, CFStringRef, (void), ())
</span><span class="cx">
</span><del>-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()
-
</del><span class="cx"> @interface NSAttributedString (NSAttributedStringKitAdditions)
</span><span class="cx"> - (id)initWithRTF:(NSData *)data documentAttributes:(NSDictionary **)dict;
</span><span class="cx"> - (id)initWithRTFD:(NSData *)data documentAttributes:(NSDictionary **)dict;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageSourceCGMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageSourceCGMac.mm (205515 => 205516)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,18 +30,7 @@
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#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()
</del><ins>+#import <MobileCoreServices/MobileCoreServices.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacImageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ImageMac.mm (205515 => 205516)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,6 +31,12 @@
</span><span class="cx"> #import "SharedBuffer.h"
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#import <CoreGraphics/CoreGraphics.h>
+#import <ImageIO/ImageIO.h>
+#import <MobileCoreServices/MobileCoreServices.h>
+#endif
+
</ins><span class="cx"> @interface WebCoreBundleFinder : NSObject
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -37,18 +43,6 @@
</span><span class="cx"> @implementation WebCoreBundleFinder
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> void BitmapImage::invalidatePlatformData()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (205515 => 205516)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> #import "RenderImage.h"
</span><span class="cx"> #import "RuntimeApplicationChecks.h"
</span><span class="cx"> #import "SharedBuffer.h"
</span><del>-#import "SoftLinking.h"
</del><span class="cx"> #import "Text.h"
</span><span class="cx"> #import "URL.h"
</span><span class="cx"> #import "WebNSAttributedStringExtras.h"
</span><span class="lines">@@ -61,37 +60,6 @@
</span><span class="cx"> - (BOOL)containsAttachments;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-// 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()
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // FIXME: Does this need to be declared in the header file?
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformPasteboardIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformPasteboardIOS.mm (205515 => 205516)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import "Pasteboard.h"
</span><span class="cx"> #import "SharedBuffer.h"
</span><span class="cx"> #import "SoftLinking.h"
</span><ins>+#import <MobileCoreServices/MobileCoreServices.h>
</ins><span class="cx">
</span><span class="cx"> SOFT_LINK_FRAMEWORK(UIKit)
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIPasteboard)
</span><span class="lines">@@ -45,31 +46,6 @@
</span><span class="cx"> - (NSInteger)changeCount;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-// 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()
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> PlatformPasteboard::PlatformPasteboard()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkiosWebCoreURLResponseIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ios/WebCoreURLResponseIOS.mm (205515 => 205516)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,22 +28,14 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WebCoreURLResponseIOS.h"
</span><ins>+
+#import "QuickLook.h"
</ins><span class="cx"> #import "UTIUtilities.h"
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><ins>+#import <MobileCoreServices/MobileCoreServices.h>
</ins><span class="cx">
</span><del>-#import "QuickLook.h"
</del><span class="cx"> #import "QuickLookSoftLink.h"
</span><del>-#import "SoftLinking.h"
-#import <MobileCoreServices/MobileCoreServices.h>
</del><span class="cx">
</span><del>-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()
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> void adjustMIMETypeIfNecessary(CFURLResponseRef cfResponse, bool isMainResourceLoad)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacUTIUtilitiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/UTIUtilities.mm (205515 => 205516)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,21 +27,7 @@
</span><span class="cx"> #import "UTIUtilities.h"
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#import "SoftLinking.h"
</del><span class="cx"> #import <MobileCoreServices/MobileCoreServices.h>
</span><del>-
-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()
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (205515 => 205516)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -74,9 +74,6 @@
</span><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="cx"> #import <wtf/StdLibExtras.h>
</span><span class="cx">
</span><del>-SOFT_LINK_FRAMEWORK(MobileCoreServices)
-SOFT_LINK_CLASS(MobileCoreServices, LSDocumentProxy)
-
</del><span class="cx"> SOFT_LINK_FRAMEWORK(UIKit)
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIApplication)
</span><span class="cx"> SOFT_LINK_CLASS(UIKit, UIColor)
</span></span></pre>
</div>
</div>
</body>
</html>