<!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>[172749] trunk/Source</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/172749">172749</a></dd>
<dt>Author</dt> <dd>mjs@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 01:37:09 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use NSURLFileTypeMappings directly instead of depending on WebKitSystemInterface wrappers for it
https://bugs.webkit.org/show_bug.cgi?id=136035
Reviewed by Dan Bernstein.
Source/WebCore:
* WebCore.exp.in: Remove reference to no longer existent sumbols.
* WebCore.order: ditto
* WebCore.xcodeproj/project.pbxproj: Install new NSURLFileTyeMappings.h header.
* platform/ios/MIMETypeRegistryIOS.mm:
(WebCore::MIMETypeRegistry::getMIMETypeForExtension): Use NSURLFileTypeMappings
directly instead of via WKSI wrapper.
* platform/mac/MIMETypeRegistryMac.mm:
(WebCore::MIMETypeRegistry::getMIMETypeForExtension): ditto
(WebCore::MIMETypeRegistry::getExtensionsForMIMEType): ditto
(WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType): ditto
* platform/mac/WebCoreSystemInterface.h: Remove references to the no-longer-used
WKGetExtensionsForMIMEType, WKGetPreferredExtensionForMIMEType, or WKGetMIMETypeForExtension
* platform/mac/WebCoreSystemInterface.mm: ditto
* platform/spi: Added. This is where headers to declare SPI go.
* platform/spi/cocoa: Added. See above.
* platform/spi/cocoa/NSURLFileTypeMappingsSPI.h: Added. Header to declare
the internal class NSURLFileTypeMappings and some of its methods.
Source/WebKit/mac:
* Misc/WebNSViewExtras.m:
(-[NSView _web_DragImageForElement:rect:event:pasteboard:source:offset:]): Remove comment
reference to obsolete WKSI function.
* WebCoreSupport/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Don't initialize the no-longer-used WKGetExtensionsForMIMEType,
WKGetPreferredExtensionForMIMEType, or WKGetMIMETypeForExtension
* Plugins/WebPluginDatabase.mm:
(-[WebPluginDatabase pluginForExtension:]): Include SPI header from WebCore; use
NSURLFileTypeMappings directly instead of via WKSI wrapper.
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::objectContentType): ditto
* WebView/WebHTMLView.mm:
(-[WebHTMLView _imageExistsAtPaths:]): ditto
* WebView/WebView.mm:
(+[WebView _supportedFileExtensions]): ditto
(+[WebView suggestedFileExtensionForMIMEType:]): ditto
(+[WebView _MIMETypeForFile:]): ditto
Source/WebKit2:
* WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
(InitWebCoreSystemInterface): Don't initialize the no-longer-used WKGetExtensionsForMIMEType,
WKGetPreferredExtensionForMIMEType, or WKGetMIMETypeForExtension
* mac/WebKit2.order: Remove exports related to above.
Source/WTF:
* wtf/Platform.h: Define USE(APPLE_INTERNAL_SDK) by default on platforms that have it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCoreorder">trunk/Source/WebCore/WebCore.order</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreplatformiosMIMETypeRegistryIOSmm">trunk/Source/WebCore/platform/ios/MIMETypeRegistryIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacMIMETypeRegistryMacmm">trunk/Source/WebCore/platform/mac/MIMETypeRegistryMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm">trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebNSViewExtrasm">trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginDatabasemm">trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm">trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm</a></li>
<li><a href="#trunkSourceWebKit2macWebKit2order">trunk/Source/WebKit2/mac/WebKit2.order</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Source/WebCore/platform/spi/</li>
<li>trunk/Source/WebCore/platform/spi/cocoa/</li>
<li><a href="#trunkSourceWebCoreplatformspicocoaNSURLFileTypeMappingsSPIh">trunk/Source/WebCore/platform/spi/cocoa/NSURLFileTypeMappingsSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WTF/ChangeLog 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-08-18 Maciej Stachowiak <mjs@apple.com>
+
+ Use NSURLFileTypeMappings directly instead of depending on WebKitSystemInterface wrappers for it
+ https://bugs.webkit.org/show_bug.cgi?id=136035
+
+ Reviewed by Dan Bernstein.
+
+ * wtf/Platform.h: Define USE(APPLE_INTERNAL_SDK) by default on platforms that have it.
+
</ins><span class="cx"> 2014-08-18 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r172736.
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WTF/wtf/Platform.h 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -1043,6 +1043,12 @@
</span><span class="cx"> #define WTF_USE_ASYNC_NSTEXTINPUTCLIENT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+#if defined __has_include && __has_include(<CoreFoundation/CFPriv.h>)
+#define WTF_USE_APPLE_INTERNAL_SDK 1
+#endif
+#endif
+
</ins><span class="cx"> #if (OS(DARWIN) && USE(CG)) || USE(FREETYPE) || (PLATFORM(WIN) && (USE(CG) || USE(CAIRO)))
</span><span class="cx"> #undef ENABLE_OPENTYPE_MATH
</span><span class="cx"> #define ENABLE_OPENTYPE_MATH 1
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebCore/ChangeLog 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-08-18 Maciej Stachowiak <mjs@apple.com>
+
+ Use NSURLFileTypeMappings directly instead of depending on WebKitSystemInterface wrappers for it
+ https://bugs.webkit.org/show_bug.cgi?id=136035
+
+ Reviewed by Dan Bernstein.
+
+ * WebCore.exp.in: Remove reference to no longer existent sumbols.
+ * WebCore.order: ditto
+ * WebCore.xcodeproj/project.pbxproj: Install new NSURLFileTyeMappings.h header.
+ * platform/ios/MIMETypeRegistryIOS.mm:
+ (WebCore::MIMETypeRegistry::getMIMETypeForExtension): Use NSURLFileTypeMappings
+ directly instead of via WKSI wrapper.
+ * platform/mac/MIMETypeRegistryMac.mm:
+ (WebCore::MIMETypeRegistry::getMIMETypeForExtension): ditto
+ (WebCore::MIMETypeRegistry::getExtensionsForMIMEType): ditto
+ (WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType): ditto
+ * platform/mac/WebCoreSystemInterface.h: Remove references to the no-longer-used
+ WKGetExtensionsForMIMEType, WKGetPreferredExtensionForMIMEType, or WKGetMIMETypeForExtension
+ * platform/mac/WebCoreSystemInterface.mm: ditto
+ * platform/spi: Added. This is where headers to declare SPI go.
+ * platform/spi/cocoa: Added. See above.
+ * platform/spi/cocoa/NSURLFileTypeMappingsSPI.h: Added. Header to declare
+ the internal class NSURLFileTypeMappings and some of its methods.
+
</ins><span class="cx"> 2014-08-18 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r172736.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -2106,7 +2106,6 @@
</span><span class="cx"> _wkGetCFURLResponseURL
</span><span class="cx"> _wkGetHTTPCookieAcceptPolicy
</span><span class="cx"> _wkGetHTTPRequestPriority
</span><del>-_wkGetMIMETypeForExtension
</del><span class="cx"> _wkGetNSURLResponseLastModifiedDate
</span><span class="cx"> _wkGetUserToBaseCTM
</span><span class="cx"> _wkGetWebDefaultCFStringEncoding
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.order (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.order 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebCore/WebCore.order 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -30609,7 +30609,6 @@
</span><span class="cx"> _wkGetPreferredExtensionForMIMEType
</span><span class="cx"> _wkSignedPublicKeyAndChallengeString
</span><span class="cx"> _wkGetExtensionsForMIMEType
</span><del>-_wkGetMIMETypeForExtension
</del><span class="cx"> _wkGetNSURLResponseLastModifiedDate
</span><span class="cx"> _wkGetWheelEventDeltas
</span><span class="cx"> _wkGetNSEventKeyChar
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -2177,6 +2177,7 @@
</span><span class="cx"> 6571DCC81385E6A400702DD0 /* MemoryPressureHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 657EDA071385CB97004E0645 /* MemoryPressureHandler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 657EDA081385CB97004E0645 /* MemoryPressureHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 657EDA061385CB97004E0645 /* MemoryPressureHandler.cpp */; };
</span><span class="cx"> 658436860AE01B7400E53753 /* FrameLoadRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 658436850AE01B7400E53753 /* FrameLoadRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 658F540319A1C9240088FC92 /* NSURLFileTypeMappingsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 653EF83819A043AE0052202C /* NSURLFileTypeMappingsSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 6593923709AE4346002C531F /* URL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6593923509AE4346002C531F /* URL.cpp */; };
</span><span class="cx"> 6593923809AE4346002C531F /* URL.h in Headers */ = {isa = PBXBuildFile; fileRef = 6593923609AE4346002C531F /* URL.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 6593923A09AE435C002C531F /* URLMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6593923909AE435C002C531F /* URLMac.mm */; };
</span><span class="lines">@@ -9271,6 +9272,7 @@
</span><span class="cx"> 6515EC8F0D9723FF0063D49A /* JSSVGAltGlyphElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGAltGlyphElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 6515EC900D9723FF0063D49A /* JSSVGAltGlyphElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSSVGAltGlyphElement.h; sourceTree = "<group>"; };
</span><span class="cx"> 652FBBBB0DE27CB60001D386 /* JSDOMWindowCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMWindowCustom.h; sourceTree = "<group>"; };
</span><ins>+ 653EF83819A043AE0052202C /* NSURLFileTypeMappingsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSURLFileTypeMappingsSPI.h; sourceTree = "<group>"; };
</ins><span class="cx"> 6548E24809E1E04D00AF8020 /* Document.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Document.idl; sourceTree = "<group>"; };
</span><span class="cx"> 6550B693099DF0270090D781 /* CDATASection.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CDATASection.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 6550B694099DF0270090D781 /* CDATASection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CDATASection.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16216,6 +16218,22 @@
</span><span class="cx"> path = plugins;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 653EF83619A043AE0052202C /* spi */ = {
+ isa = PBXGroup;
+ children = (
+ 653EF83719A043AE0052202C /* cocoa */,
+ );
+ path = spi;
+ sourceTree = "<group>";
+ };
+ 653EF83719A043AE0052202C /* cocoa */ = {
+ isa = PBXGroup;
+ children = (
+ 653EF83819A043AE0052202C /* NSURLFileTypeMappingsSPI.h */,
+ );
+ path = cocoa;
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 656580EC09D12B20000E61D7 /* Derived Sources */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -21294,6 +21312,7 @@
</span><span class="cx"> 656B84D70AEA1CE900A095B4 /* network */,
</span><span class="cx"> 516030090CC4245400C8AC25 /* posix */,
</span><span class="cx"> 1A2E6E560CC551E0004A2062 /* sql */,
</span><ins>+ 653EF83619A043AE0052202C /* spi */,
</ins><span class="cx"> B2C3D9EC0D006C1D00EF6F26 /* text */,
</span><span class="cx"> 49AE2D94134EE5F90072920A /* CalculationValue.cpp */,
</span><span class="cx"> 49AE2D95134EE5F90072920A /* CalculationValue.h */,
</span><span class="lines">@@ -25276,6 +25295,7 @@
</span><span class="cx"> F5973DE015CFB2030027F804 /* LocaleMac.h in Headers */,
</span><span class="cx"> 7633A72613D8B33A008501B6 /* LocaleToScriptMapping.h in Headers */,
</span><span class="cx"> A516E8B7136E04DB0076C3C0 /* LocalizedDateCache.h in Headers */,
</span><ins>+ 658F540319A1C9240088FC92 /* NSURLFileTypeMappingsSPI.h in Headers */,
</ins><span class="cx"> 935207BE09BD410A00F2038D /* LocalizedStrings.h in Headers */,
</span><span class="cx"> BCE1C41B0D982980003B02F2 /* Location.h in Headers */,
</span><span class="cx"> A8239E0109B3CF8A00B60641 /* Logging.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosMIMETypeRegistryIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/MIMETypeRegistryIOS.mm (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/MIMETypeRegistryIOS.mm 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebCore/platform/ios/MIMETypeRegistryIOS.mm 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -26,13 +26,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx">
</span><del>-#include "WebCoreSystemInterface.h"
</del><ins>+#include "NSURLFileTypeMappingsSPI.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore
</span><span class="cx"> {
</span><del>-String MIMETypeRegistry::getMIMETypeForExtension(const String &ext)
</del><ins>+String MIMETypeRegistry::getMIMETypeForExtension(const String& extension)
</ins><span class="cx"> {
</span><del>- return wkGetMIMETypeForExtension(ext);
</del><ins>+ return [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:(NSString *)extension];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> MIMETypeRegistry::getExtensionsForMIMEType(const String& /*type*/)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacMIMETypeRegistryMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/MIMETypeRegistryMac.mm (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/MIMETypeRegistryMac.mm 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebCore/platform/mac/MIMETypeRegistryMac.mm 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -27,22 +27,22 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx">
</span><del>-#include "WebCoreSystemInterface.h"
</del><ins>+#include "NSURLFileTypeMappingsSPI.h"
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore
</span><span class="cx"> {
</span><span class="cx">
</span><del>-String MIMETypeRegistry::getMIMETypeForExtension(const String &ext)
</del><ins>+String MIMETypeRegistry::getMIMETypeForExtension(const String& extension)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- return wkGetMIMETypeForExtension(ext);
</del><ins>+ return [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:(NSString *)extension];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<String> MIMETypeRegistry::getExtensionsForMIMEType(const String& type)
</span><span class="cx"> {
</span><del>- NSArray *stringsArray = wkGetExtensionsForMIMEType(type);
</del><ins>+ NSArray *stringsArray = [[NSURLFileTypeMappings sharedMappings] extensionsForMIMEType:(NSString *)type];
</ins><span class="cx"> Vector<String> stringsVector = Vector<String>();
</span><span class="cx"> unsigned count = [stringsArray count];
</span><span class="cx"> if (count > 0) {
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> String MIMETypeRegistry::getPreferredExtensionForMIMEType(const String& type)
</span><span class="cx"> {
</span><del>- return wkGetPreferredExtensionForMIMEType(type);
</del><ins>+ return [[NSURLFileTypeMappings sharedMappings] preferredExtensionForMIMEType:(NSString *)type];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MIMETypeRegistry::isApplicationPluginMIMEType(const String& MIMEType)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -171,10 +171,7 @@
</span><span class="cx"> float duration, unsigned state);
</span><span class="cx"> extern void (*wkDrawMediaUIPart)(int part, CGContextRef context, CGRect rect, unsigned state);
</span><span class="cx"> extern CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
</span><del>-extern NSString* (*wkGetPreferredExtensionForMIMEType)(NSString*);
-extern NSArray* (*wkGetExtensionsForMIMEType)(NSString*);
</del><span class="cx"> #endif
</span><del>-extern NSString* (*wkGetMIMETypeForExtension)(NSString*);
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> extern ATSUFontID (*wkGetNSFontATSUFontId)(NSFont*);
</span><span class="cx"> extern double (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebCoreSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> NSString* (*wkGetPreferredExtensionForMIMEType)(NSString*);
</span><span class="cx"> CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
</span><span class="cx"> NSArray* (*wkGetExtensionsForMIMEType)(NSString*);
</span><del>-NSString* (*wkGetMIMETypeForExtension)(NSString*);
</del><span class="cx"> NSTimeInterval (*wkGetNSURLResponseCalculatedExpiration)(NSURLResponse *response);
</span><span class="cx"> NSDate *(*wkGetNSURLResponseLastModifiedDate)(NSURLResponse *response);
</span><span class="cx"> BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaNSURLFileTypeMappingsSPIh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/spi/cocoa/NSURLFileTypeMappingsSPI.h (0 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/NSURLFileTypeMappingsSPI.h (rev 0)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSURLFileTypeMappingsSPI.h 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if USE(APPLE_INTERNAL_SDK)
+
+#import <Foundation/NSURLFileTypeMappings.h>
+
+#else
+
+// FIXME: We should use UTI instead, but it's missing some mappings that this old SPI knows.
+// Remove these methods once <rdar://problem/18042184> is fixed.
+@interface NSURLFileTypeMappings
+@end
+@interface NSURLFileTypeMappings (Private)
++ (NSURLFileTypeMappings *)sharedMappings;
+- (NSString *)MIMETypeForExtension:(NSString *)ext;
+- (NSString *)preferredExtensionForMIMEType:(NSString *)type;
+- (NSArray *)extensionsForMIMEType:(NSString *)type;
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-08-18 Maciej Stachowiak <mjs@apple.com>
+
+ Use NSURLFileTypeMappings directly instead of depending on WebKitSystemInterface wrappers for it
+ https://bugs.webkit.org/show_bug.cgi?id=136035
+
+ Reviewed by Dan Bernstein.
+
+ * Misc/WebNSViewExtras.m:
+ (-[NSView _web_DragImageForElement:rect:event:pasteboard:source:offset:]): Remove comment
+ reference to obsolete WKSI function.
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Don't initialize the no-longer-used WKGetExtensionsForMIMEType,
+ WKGetPreferredExtensionForMIMEType, or WKGetMIMETypeForExtension
+ * Plugins/WebPluginDatabase.mm:
+ (-[WebPluginDatabase pluginForExtension:]): Include SPI header from WebCore; use
+ NSURLFileTypeMappings directly instead of via WKSI wrapper.
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::objectContentType): ditto
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _imageExistsAtPaths:]): ditto
+ * WebView/WebView.mm:
+ (+[WebView _supportedFileExtensions]): ditto
+ (+[WebView suggestedFileExtensionForMIMEType:]): ditto
+ (+[WebView _MIMETypeForFile:]): ditto
+
</ins><span class="cx"> 2014-08-18 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r172736.
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebNSViewExtrasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebKit/mac/Misc/WebNSViewExtras.m 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> // FIXME: This has been broken for a while.
</span><span class="cx"> // There's no way to get the MIME type for the image from a DOM element.
</span><del>- // The old code used WKGetPreferredExtensionForMIMEType([image MIMEType]);
</del><ins>+ // The old code used [image MIMEType];
</ins><span class="cx"> NSString *extension = @"";
</span><span class="cx"> dragImage = [[NSWorkspace sharedWorkspace] iconForFileType:extension];
</span><span class="cx"> NSSize offset = NSMakeSize([dragImage size].width - WebDragIconRightInset, -WebDragIconBottomInset);
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginDatabasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.mm (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.mm 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginDatabase.mm 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #import "WebPluginPackage.h"
</span><span class="cx"> #import "WebViewPrivate.h"
</span><span class="cx"> #import "WebViewInternal.h"
</span><ins>+#import <WebCore/NSURLFileTypeMappingsSPI.h>
</ins><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx">
</span><span class="lines">@@ -175,7 +176,7 @@
</span><span class="cx"> // If no plug-in was found from the extension, attempt to map from the extension to a MIME type
</span><span class="cx"> // and find the a plug-in from the MIME type. This is done in case the plug-in has not fully specified
</span><span class="cx"> // an extension <-> MIME type mapping.
</span><del>- NSString *MIMEType = WKGetMIMETypeForExtension(extension);
</del><ins>+ NSString *MIMEType = [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
</ins><span class="cx"> if ([MIMEType length] > 0)
</span><span class="cx"> plugin = [self pluginForMIMEType:MIMEType];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><span class="cx"> #import <WebCore/MouseEvent.h>
</span><ins>+#import <WebCore/NSURLFileTypeMappingsSPI.h>
</ins><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/PluginViewBase.h>
</span><span class="cx"> #import <WebCore/ProtectionSpace.h>
</span><span class="lines">@@ -1620,7 +1621,7 @@
</span><span class="cx"> NSURL *URL = url;
</span><span class="cx"> NSString *extension = [[URL path] pathExtension];
</span><span class="cx"> if ([extension length] > 0) {
</span><del>- type = WKGetMIMETypeForExtension(extension);
</del><ins>+ type = [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
</ins><span class="cx"> if (type.isEmpty()) {
</span><span class="cx"> // If no MIME type is specified, use a plug-in if we have one that can handle the extension.
</span><span class="cx"> if (WebBasePluginPackage *package = [getWebView(m_webFrame.get()) _pluginForExtension:extension]) {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -72,18 +72,15 @@
</span><span class="cx"> INIT(DrawMediaUIPart);
</span><span class="cx"> INIT(DrawMediaSliderTrack);
</span><span class="cx"> INIT(DrawTextFieldCellFocusRing);
</span><del>- INIT(GetExtensionsForMIMEType);
</del><span class="cx"> INIT(GetFontInLanguageForCharacter);
</span><span class="cx"> INIT(GetFontInLanguageForRange);
</span><span class="cx"> INIT(GetGlyphTransformedAdvances);
</span><span class="cx"> #endif
</span><span class="cx"> INIT(GetHTTPRequestPriority);
</span><del>- INIT(GetMIMETypeForExtension);
</del><span class="cx"> INIT(GetNSURLResponseLastModifiedDate);
</span><span class="cx"> INIT(GetWebDefaultCFStringEncoding);
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(SignedPublicKeyAndChallengeString);
</span><del>- INIT(GetPreferredExtensionForMIMEType);
</del><span class="cx"> INIT(GetWheelEventDeltas);
</span><span class="cx"> INIT(GetNSEventKeyChar);
</span><span class="cx"> INIT(HitTestMediaUIPart);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -102,6 +102,7 @@
</span><span class="cx"> #import <WebCore/LegacyWebArchive.h>
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><ins>+#import <WebCore/NSURLFileTypeMappingsSPI.h>
</ins><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/Range.h>
</span><span class="cx"> #import <WebCore/RenderView.h>
</span><span class="lines">@@ -768,7 +769,7 @@
</span><span class="cx"> NSString *path;
</span><span class="cx">
</span><span class="cx"> while ((path = [enumerator nextObject]) != nil) {
</span><del>- NSString *MIMEType = WKGetMIMETypeForExtension([path pathExtension]);
</del><ins>+ NSString *MIMEType = [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:[path pathExtension]];
</ins><span class="cx"> if (MIMETypeRegistry::isSupportedImageResourceMIMEType(MIMEType))
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -148,6 +148,7 @@
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><span class="cx"> #import <WebCore/MemoryPressureHandler.h>
</span><ins>+#import <WebCore/NSURLFileTypeMappingsSPI.h>
</ins><span class="cx"> #import <WebCore/NodeList.h>
</span><span class="cx"> #import <WebCore/Notification.h>
</span><span class="cx"> #import <WebCore/NotificationController.h>
</span><span class="lines">@@ -1098,7 +1099,7 @@
</span><span class="cx"> NSEnumerator *enumerator = [MIMETypes objectEnumerator];
</span><span class="cx"> NSString *MIMEType;
</span><span class="cx"> while ((MIMEType = [enumerator nextObject]) != nil) {
</span><del>- NSArray *extensionsForType = WKGetExtensionsForMIMEType(MIMEType);
</del><ins>+ NSArray *extensionsForType = [[NSURLFileTypeMappings sharedMappings] extensionsForMIMEType:MIMEType];
</ins><span class="cx"> if (extensionsForType) {
</span><span class="cx"> [extensions addObjectsFromArray:extensionsForType];
</span><span class="cx"> }
</span><span class="lines">@@ -1495,7 +1496,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> + (NSString *)suggestedFileExtensionForMIMEType:(NSString *)type
</span><span class="cx"> {
</span><del>- return WKGetPreferredExtensionForMIMEType(type);
</del><ins>+ return [[NSURLFileTypeMappings sharedMappings] preferredExtensionForMIMEType:type];
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1798,7 +1799,7 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> // Get the MIME type from the extension.
</span><span class="cx"> if ([extension length] != 0) {
</span><del>- MIMEType = WKGetMIMETypeForExtension(extension);
</del><ins>+ MIMEType = [[NSURLFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-08-18 Maciej Stachowiak <mjs@apple.com>
+
+ Use NSURLFileTypeMappings directly instead of depending on WebKitSystemInterface wrappers for it
+ https://bugs.webkit.org/show_bug.cgi?id=136035
+
+ Reviewed by Dan Bernstein.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Don't initialize the no-longer-used WKGetExtensionsForMIMEType,
+ WKGetPreferredExtensionForMIMEType, or WKGetMIMETypeForExtension
+ * mac/WebKit2.order: Remove exports related to above.
+
</ins><span class="cx"> 2014-08-18 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r172736.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebSystemInterfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> INIT(DrawMediaSliderTrack);
</span><span class="cx"> INIT(DrawMediaUIPart);
</span><span class="cx"> INIT(DrawTextFieldCellFocusRing);
</span><del>- INIT(GetExtensionsForMIMEType);
</del><span class="cx"> INIT(GetFontInLanguageForCharacter);
</span><span class="cx"> INIT(GetFontInLanguageForRange);
</span><span class="cx"> INIT(GetGlyphTransformedAdvances);
</span><span class="lines">@@ -73,11 +72,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> INIT(GetVerticalGlyphsForCharacters);
</span><span class="cx"> INIT(GetHTTPRequestPriority);
</span><del>- INIT(GetMIMETypeForExtension);
</del><span class="cx"> INIT(GetNSURLResponseLastModifiedDate);
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> INIT(SignedPublicKeyAndChallengeString);
</span><del>- INIT(GetPreferredExtensionForMIMEType);
</del><span class="cx"> #endif
</span><span class="cx"> INIT(GetUserToBaseCTM);
</span><span class="cx"> INIT(GetWebDefaultCFStringEncoding);
</span></span></pre></div>
<a id="trunkSourceWebKit2macWebKit2order"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/WebKit2.order (172748 => 172749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/WebKit2.order 2014-08-19 08:09:10 UTC (rev 172748)
+++ trunk/Source/WebKit2/mac/WebKit2.order 2014-08-19 08:37:09 UTC (rev 172749)
</span><span class="lines">@@ -8668,7 +8668,6 @@
</span><span class="cx"> _WKBundleGarbageCollectJavaScriptObjects
</span><span class="cx"> __ZN6WebKit14InjectedBundle31garbageCollectJavaScriptObjectsEv
</span><span class="cx"> __ZNK6WebKit15WebEditorClient10canCopyCutEPN7WebCore5FrameEb
</span><del>-_WKGetExtensionsForMIMEType
</del><span class="cx"> __ZN6WebKit15WebEditorClient25shouldShowDeleteInterfaceEPN7WebCore11HTMLElementE
</span><span class="cx"> __ZNK6WebKit15WebEditorClient8canPasteEPN7WebCore5FrameEb
</span><span class="cx"> __ZN6WebKit15WebEditorClient22setInsertionPasteboardERKN3WTF6StringE
</span></span></pre>
</div>
</div>
</body>
</html>