<!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>[244201] 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/244201">244201</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2019-04-11 16:13:44 -0700 (Thu, 11 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Extract UTI mapping and allow for additions
https://bugs.webkit.org/show_bug.cgi?id=196822
<rdar://problem/49822339>

Reviewed by Tim Horton.

Source/WebCore:

Add an ADDITIONAL_SYSTEM_PREVIEW_TYPES macro to the list
of accepted MIME types. And add a new helper to map
MIME types to UTI types when the system was unable to
find an existing type.

* platform/MIMETypeRegistry.cpp:
(WebCore::MIMETypeRegistry::systemPreviewMIMETypes):
* platform/network/mac/UTIUtilities.mm:
(WebCore::UTIFromUnknownMIMEType):
(WebCore::UTIFromMIMETypeCachePolicy::createValueForKey):

Source/WebKit:

Use the new helper to map MIME type to UTI.

* UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
(-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):
* UIProcess/ios/WKSystemPreviewView.mm:
(getUTIForSystemPreviewMIMEType):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformMIMETypeRegistrycpp">trunk/Source/WebCore/platform/MIMETypeRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacUTIUtilitiesmm">trunk/Source/WebCore/platform/network/mac/UTIUtilities.mm</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessCocoaSystemPreviewControllerCocoamm">trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKSystemPreviewViewmm">trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244200 => 244201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-04-11 22:57:02 UTC (rev 244200)
+++ trunk/Source/WebCore/ChangeLog      2019-04-11 23:13:44 UTC (rev 244201)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2019-04-11  Dean Jackson  <dino@apple.com>
+
+        Extract UTI mapping and allow for additions
+        https://bugs.webkit.org/show_bug.cgi?id=196822
+        <rdar://problem/49822339>
+
+        Reviewed by Tim Horton.
+
+        Add an ADDITIONAL_SYSTEM_PREVIEW_TYPES macro to the list
+        of accepted MIME types. And add a new helper to map
+        MIME types to UTI types when the system was unable to
+        find an existing type.
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::MIMETypeRegistry::systemPreviewMIMETypes):
+        * platform/network/mac/UTIUtilities.mm:
+        (WebCore::UTIFromUnknownMIMEType):
+        (WebCore::UTIFromMIMETypeCachePolicy::createValueForKey):
+
</ins><span class="cx"> 2019-04-09  Ryosuke Niwa  <rniwa@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         [iOS] Moving backwards by word granularity does not work if the previous line was inside another block element
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMIMETypeRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (244200 => 244201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp       2019-04-11 22:57:02 UTC (rev 244200)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp  2019-04-11 23:13:44 UTC (rev 244201)
</span><span class="lines">@@ -57,6 +57,12 @@
</span><span class="cx"> #include "PreviewConverter.h"
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/AdditionalSystemPreviewTypes.h>
+#else
+#define ADDITIONAL_SYSTEM_PREVIEW_TYPES
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> const HashSet<String, ASCIICaseInsensitiveHash>& MIMETypeRegistry::supportedImageMIMETypes()
</span><span class="lines">@@ -671,7 +677,8 @@
</span><span class="cx">         "model/vnd.usdz+zip",
</span><span class="cx">         // Unofficial, but supported because we documented them.
</span><span class="cx">         "model/usd",
</span><del>-        "model/vnd.pixar.usd"
</del><ins>+        "model/vnd.pixar.usd",
+        ADDITIONAL_SYSTEM_PREVIEW_TYPES
</ins><span class="cx">     };
</span><span class="cx">     return systemPreviewMIMETypes;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacUTIUtilitiesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/UTIUtilities.mm (244200 => 244201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/UTIUtilities.mm        2019-04-11 22:57:02 UTC (rev 244200)
+++ trunk/Source/WebCore/platform/network/mac/UTIUtilities.mm   2019-04-11 23:13:44 UTC (rev 244201)
</span><span class="lines">@@ -33,6 +33,12 @@
</span><span class="cx"> #import <MobileCoreServices/MobileCoreServices.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/AdditionalUTIMappings.h>
+#else
+#define ADDITIONAL_UTI_MAPPINGS
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> String MIMETypeFromUTI(const String& uti)
</span><span class="lines">@@ -78,11 +84,42 @@
</span><span class="cx">     return String();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static String UTIFromUnknownMIMEType(const String& mimeType)
+{
+    static const auto map = makeNeverDestroyed([] {
+        struct TypeExtensionPair {
+            ASCIILiteral type;
+            ASCIILiteral uti;
+        };
+
+        static const TypeExtensionPair pairs[] = {
+            { "model/vnd.usdz+zip"_s, "com.pixar.universal-scene-description-mobile"_s },
+            { "model/usd"_s, "com.pixar.universal-scene-description-mobile"_s },
+            { "model/vnd.pixar.usd"_s, "com.pixar.universal-scene-description-mobile"_s },
+            ADDITIONAL_UTI_MAPPINGS
+        };
+
+        HashMap<String, String, ASCIICaseInsensitiveHash> map;
+        for (auto& pair : pairs)
+            map.add(pair.type, pair.uti);
+        return map;
+    }());
+
+    auto mapEntry = map.get().find(mimeType);
+    if (mapEntry == map.get().end())
+        return emptyString();
+
+    return mapEntry->value;
+}
+
</ins><span class="cx"> struct UTIFromMIMETypeCachePolicy : TinyLRUCachePolicy<String, String> {
</span><span class="cx"> public:
</span><span class="cx">     static String createValueForKey(const String& key)
</span><span class="cx">     {
</span><del>-        return String(adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, key.createCFString().get(), 0)).get());
</del><ins>+        auto type = adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, key.createCFString().get(), 0));
+        if (type)
+            return String(type.get());
+        return UTIFromUnknownMIMEType(key);
</ins><span class="cx">     }
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (244200 => 244201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-04-11 22:57:02 UTC (rev 244200)
+++ trunk/Source/WebKit/ChangeLog       2019-04-11 23:13:44 UTC (rev 244201)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2019-04-11  Dean Jackson  <dino@apple.com>
+
+        Extract UTI mapping and allow for additions
+        https://bugs.webkit.org/show_bug.cgi?id=196822
+        <rdar://problem/49822339>
+
+        Reviewed by Tim Horton.
+
+        Use the new helper to map MIME type to UTI.
+
+        * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
+        (-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):
+        * UIProcess/ios/WKSystemPreviewView.mm:
+        (getUTIForSystemPreviewMIMEType):
+
+
</ins><span class="cx"> 2019-04-11  Said Abou-Hallawa  <sabouhallawa@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r244182): RemoteLayerTreeDrawingArea::flushLayers() should not be reentrant
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaSystemPreviewControllerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm (244200 => 244201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm      2019-04-11 22:57:02 UTC (rev 244200)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2019-04-11 23:13:44 UTC (rev 244201)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import <QuickLook/QuickLook.h>
</span><span class="cx"> #import <UIKit/UIViewController.h>
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><ins>+#import <WebCore/UTIUtilities.h>
</ins><span class="cx"> #import <pal/ios/QuickLookSoftLink.h>
</span><span class="cx"> #import <pal/spi/ios/QuickLookSPI.h>
</span><span class="cx"> #import <wtf/WeakObjCPtr.h>
</span><span class="lines">@@ -81,9 +82,7 @@
</span><span class="cx">     _itemProvider = adoptNS([[NSItemProvider alloc] init]);
</span><span class="cx">     // FIXME: We are launching the preview controller before getting a response from the resource, which
</span><span class="cx">     // means we don't actually know the real MIME type yet.
</span><del>-    // FIXME: At the moment we only have one supported UTI, but if we start supporting more types,
-    // then we'll need a table.
-    static NSString *contentType = (__bridge NSString *) UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, CFSTR("usdz"), nil);
</del><ins>+    NSString *contentType = WebCore::UTIFromMIMEType("model/vnd.usdz+zip"_s);
</ins><span class="cx"> 
</span><span class="cx">     _item = adoptNS([PAL::allocQLItemInstance() initWithPreviewItemProvider:_itemProvider.get() contentType:contentType previewTitle:@"Preview" fileSize:@(0)]);
</span><span class="cx">     [_item setUseLoadingTimeout:NO];
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKSystemPreviewViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm (244200 => 244201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm 2019-04-11 22:57:02 UTC (rev 244200)
+++ trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm    2019-04-11 23:13:44 UTC (rev 244201)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #import <WebCore/FloatRect.h>
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><ins>+#import <WebCore/UTIUtilities.h>
</ins><span class="cx"> #import <pal/ios/QuickLookSoftLink.h>
</span><span class="cx"> #import <pal/spi/cg/CoreGraphicsSPI.h>
</span><span class="cx"> #import <pal/spi/ios/SystemPreviewSPI.h>
</span><span class="lines">@@ -45,16 +46,12 @@
</span><span class="cx"> SOFT_LINK_PRIVATE_FRAMEWORK(AssetViewer);
</span><span class="cx"> SOFT_LINK_CLASS(AssetViewer, ASVThumbnailView);
</span><span class="cx"> 
</span><del>-// FIXME: At the moment we only have one supported UTI, but
-// if we start supporting more types, then we'll need a table.
</del><span class="cx"> static NSString *getUTIForSystemPreviewMIMEType(const String& mimeType)
</span><span class="cx"> {
</span><del>-    static NSString *uti = (__bridge NSString *) UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, CFSTR("usdz"), nil);
-
</del><span class="cx">     if (!WebCore::MIMETypeRegistry::isSystemPreviewMIMEType(mimeType))
</span><span class="cx">         return nil;
</span><span class="cx"> 
</span><del>-    return uti;
</del><ins>+    return WebCore::UTIFromMIMEType(mimeType);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> @interface WKSystemPreviewView () <ASVThumbnailViewDelegate>
</span></span></pre>
</div>
</div>

</body>
</html>