<!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>[235651] 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/235651">235651</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2018-09-04 17:50:33 -0700 (Tue, 04 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Post review Weinig fix-ups
https://bugs.webkit.org/show_bug.cgi?id=189288

Reviewed by Sam Weinig.

Fix-ups from https://bugs.webkit.org/show_bug.cgi?id=189252

Source/WebCore:

* platform/MIMETypeRegistry.cpp:
(WebCore::MIMETypeRegistry::getSystemPreviewMIMETypes):
(WebCore::initializeSystemPreviewMIMETypes): Deleted.
* rendering/RenderThemeIOS.mm:
(WebCore::arKitBundle):
(WebCore::loadARKitPDFPage):
(WebCore::systemPreviewLogo):

Source/WebKit:

* UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
(-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):
(getUTIForMIMEType): Deleted.
* UIProcess/ios/WKSystemPreviewView.mm:
(getUTIForSystemPreviewMIMEType):
(-[WKSystemPreviewView web_setContentProviderData:suggestedFilename:]):
(getUTIForMIMEType): Deleted.</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="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.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 (235650 => 235651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-09-05 00:22:43 UTC (rev 235650)
+++ trunk/Source/WebCore/ChangeLog      2018-09-05 00:50:33 UTC (rev 235651)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2018-09-04  Dean Jackson  <dino@apple.com>
+
+        Post review Weinig fix-ups
+        https://bugs.webkit.org/show_bug.cgi?id=189288
+
+        Reviewed by Sam Weinig.
+
+        Fix-ups from https://bugs.webkit.org/show_bug.cgi?id=189252
+
+        * platform/MIMETypeRegistry.cpp:
+        (WebCore::MIMETypeRegistry::getSystemPreviewMIMETypes):
+        (WebCore::initializeSystemPreviewMIMETypes): Deleted.
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::arKitBundle):
+        (WebCore::loadARKitPDFPage):
+        (WebCore::systemPreviewLogo):
+
</ins><span class="cx"> 2018-09-04  Ryosuke Niwa  <rniwa@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         slotchange event doesn't get fired when inserting, removing, or renaming slot elements
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMIMETypeRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (235650 => 235651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp       2018-09-05 00:22:43 UTC (rev 235650)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp  2018-09-05 00:50:33 UTC (rev 235651)
</span><span class="lines">@@ -64,10 +64,6 @@
</span><span class="cx"> static HashSet<String, ASCIICaseInsensitiveHash>* pdfMIMETypes;
</span><span class="cx"> static HashSet<String, ASCIICaseInsensitiveHash>* unsupportedTextMIMETypes;
</span><span class="cx"> 
</span><del>-#if USE(SYSTEM_PREVIEW)
-static HashSet<String, ASCIICaseInsensitiveHash>* systemPreviewMIMETypes;
-#endif
-
</del><span class="cx"> static void initializeSupportedImageMIMETypes()
</span><span class="cx"> {
</span><span class="cx">     supportedImageResourceMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>;
</span><span class="lines">@@ -705,9 +701,9 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if USE(SYSTEM_PREVIEW)
</span><del>-static void initializeSystemPreviewMIMETypes()
</del><ins>+const HashSet<String, ASCIICaseInsensitiveHash>& MIMETypeRegistry::getSystemPreviewMIMETypes()
</ins><span class="cx"> {
</span><del>-    const char* const types[] = {
</del><ins>+    static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> systemPreviewMIMETypes = std::initializer_list<String> {
</ins><span class="cx">         // The official type: https://www.iana.org/assignments/media-types/model/vnd.usdz+zip
</span><span class="cx">         "model/vnd.usdz+zip",
</span><span class="cx">         // Unofficial, but supported because we documented them.
</span><span class="lines">@@ -714,19 +710,9 @@
</span><span class="cx">         "model/usd",
</span><span class="cx">         "model/vnd.pixar.usd"
</span><span class="cx">     };
</span><del>-
-    systemPreviewMIMETypes = new HashSet<String, ASCIICaseInsensitiveHash>;
-    for (auto& type : types)
-        systemPreviewMIMETypes->add(type);
</del><ins>+    return systemPreviewMIMETypes;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-const HashSet<String, ASCIICaseInsensitiveHash>& MIMETypeRegistry::getSystemPreviewMIMETypes()
-{
-    if (!systemPreviewMIMETypes)
-        initializeSystemPreviewMIMETypes();
-    return *systemPreviewMIMETypes;
-}
-
</del><span class="cx"> bool MIMETypeRegistry::isSystemPreviewMIMEType(const String& mimeType)
</span><span class="cx"> {
</span><span class="cx">     if (mimeType.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (235650 => 235651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2018-09-05 00:22:43 UTC (rev 235650)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm    2018-09-05 00:50:33 UTC (rev 235651)
</span><span class="lines">@@ -1855,16 +1855,14 @@
</span><span class="cx"> #if USE(SYSTEM_PREVIEW)
</span><span class="cx"> static NSBundle *arKitBundle()
</span><span class="cx"> {
</span><del>-    static NSBundle *arKitBundle;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
</del><ins>+    static NSBundle *arKitBundle = []() {
</ins><span class="cx"> #if PLATFORM(IOS_SIMULATOR)
</span><span class="cx">         dlopen("/System/Library/PrivateFrameworks/AssetViewer.framework/AssetViewer", RTLD_NOW);
</span><del>-        arKitBundle = [NSBundle bundleForClass:NSClassFromString(@"ASVThumbnailView")];
</del><ins>+        return [NSBundle bundleForClass:NSClassFromString(@"ASVThumbnailView")];
</ins><span class="cx"> #else
</span><del>-        arKitBundle = [NSBundle bundleWithURL:[NSURL fileURLWithPath:@"/System/Library/PrivateFrameworks/AssetViewer.framework"]];
</del><ins>+        return [NSBundle bundleWithURL:[NSURL fileURLWithPath:@"/System/Library/PrivateFrameworks/AssetViewer.framework"]];
</ins><span class="cx"> #endif
</span><del>-    });
</del><ins>+    }();
</ins><span class="cx"> 
</span><span class="cx">     return arKitBundle;
</span><span class="cx"> }
</span><span class="lines">@@ -1884,18 +1882,13 @@
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><span class="cx">     return CGPDFDocumentGetPage(document.get(), 1);
</span><del>-};
</del><ins>+}
</ins><span class="cx"> 
</span><span class="cx"> static CGPDFPageRef systemPreviewLogo()
</span><span class="cx"> {
</span><del>-    static CGPDFPageRef logoPage;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        logoPage = loadARKitPDFPage(@"ARKitBadge").leakRef();
-    });
-
</del><ins>+    static CGPDFPageRef logoPage = loadARKitPDFPage(@"ARKitBadge").leakRef();
</ins><span class="cx">     return logoPage;
</span><del>-};
</del><ins>+}
</ins><span class="cx"> 
</span><span class="cx"> void RenderThemeIOS::paintSystemPreviewBadge(Image& image, const PaintInfo& paintInfo, const FloatRect& rect)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (235650 => 235651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2018-09-05 00:22:43 UTC (rev 235650)
+++ trunk/Source/WebKit/ChangeLog       2018-09-05 00:50:33 UTC (rev 235651)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2018-09-04  Dean Jackson  <dino@apple.com>
+
+        Post review Weinig fix-ups
+        https://bugs.webkit.org/show_bug.cgi?id=189288
+
+        Reviewed by Sam Weinig.
+
+        Fix-ups from https://bugs.webkit.org/show_bug.cgi?id=189252
+
+        * UIProcess/Cocoa/SystemPreviewControllerCocoa.mm:
+        (-[_WKPreviewControllerDataSource previewController:previewItemAtIndex:]):
+        (getUTIForMIMEType): Deleted.
+        * UIProcess/ios/WKSystemPreviewView.mm:
+        (getUTIForSystemPreviewMIMEType):
+        (-[WKSystemPreviewView web_setContentProviderData:suggestedFilename:]):
+        (getUTIForMIMEType): Deleted.
+
</ins><span class="cx"> 2018-09-04  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Populate "text/uri-list" with multiple URLs when the pasteboard contains multiple URLs
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessCocoaSystemPreviewControllerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm (235650 => 235651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm      2018-09-05 00:22:43 UTC (rev 235650)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SystemPreviewControllerCocoa.mm 2018-09-05 00:50:33 UTC (rev 235651)
</span><span class="lines">@@ -42,18 +42,6 @@
</span><span class="cx"> SOFT_LINK_CLASS(QuickLook, QLPreviewController);
</span><span class="cx"> SOFT_LINK_CLASS(QuickLook, QLItem);
</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.
-static String getUTIForMIMEType(const String& mimeType)
-{
-    static const NeverDestroyed<String> uti = adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, CFSTR("usdz"), nil)).get();
-
-    if (!WebCore::MIMETypeRegistry::isSystemPreviewMIMEType(mimeType))
-        return emptyString();
-
-    return uti;
-}
-
</del><span class="cx"> @interface _WKPreviewControllerDataSource : NSObject <QLPreviewControllerDataSource> {
</span><span class="cx">     RetainPtr<NSItemProvider> _itemProvider;
</span><span class="cx">     RetainPtr<QLItem> _item;
</span><span class="lines">@@ -95,8 +83,10 @@
</span><span class="cx"> 
</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><del>-    // means we don't actually know the real MIME type yet. Assume it is one of those that we registered.
-    NSString *contentType = getUTIForMIMEType(*WebCore::MIMETypeRegistry::getSystemPreviewMIMETypes().begin());
</del><ins>+    // means we don't actually know the real MIME type yet.
+    // 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);
</ins><span class="cx"> 
</span><span class="cx">     _item = adoptNS([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 (235650 => 235651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm 2018-09-05 00:22:43 UTC (rev 235650)
+++ trunk/Source/WebKit/UIProcess/ios/WKSystemPreviewView.mm    2018-09-05 00:50:33 UTC (rev 235651)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx"> 
</span><span class="cx"> // FIXME: At the moment we only have one supported UTI, but
</span><span class="cx"> // if we start supporting more types, then we'll need a table.
</span><del>-static String getUTIForMIMEType(const String& mimeType)
</del><ins>+static NSString *getUTIForSystemPreviewMIMEType(const String& mimeType)
</ins><span class="cx"> {
</span><del>-    static const NeverDestroyed<String> uti = adoptCF(UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, CFSTR("usdz"), nil)).get();
</del><ins>+    static NSString *uti = (__bridge NSString *) UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, CFSTR("usdz"), nil);
</ins><span class="cx"> 
</span><span class="cx">     if (!WebCore::MIMETypeRegistry::isSystemPreviewMIMEType(mimeType))
</span><del>-        return emptyString();
</del><ins>+        return nil;
</ins><span class="cx"> 
</span><span class="cx">     return uti;
</span><span class="cx"> }
</span><span class="lines">@@ -103,8 +103,7 @@
</span><span class="cx">     _suggestedFilename = adoptNS([filename copy]);
</span><span class="cx">     _data = adoptNS([data copy]);
</span><span class="cx"> 
</span><del>-    NSString *contentType;
-    contentType = getUTIForMIMEType(_mimeType.get());
</del><ins>+    NSString *contentType = getUTIForSystemPreviewMIMEType(_mimeType.get());
</ins><span class="cx"> 
</span><span class="cx">     _item = adoptNS([allocQLItemInstance() initWithDataProvider:self contentType:contentType previewTitle:_suggestedFilename.get()]);
</span><span class="cx">     [_item setUseLoadingTimeout:NO];
</span></span></pre>
</div>
</div>

</body>
</html>