Changeset 244956 in webkit

Timestamp:

May 5, 2019 3:45:22 AM (5 years ago)

Author:

Wenson Hsieh

Message:

fast/attachment/attachment-folder-icon.html is an Image Only failure on recent macOS builds
​https://bugs.webkit.org/show_bug.cgi?id=197593
<rdar://problem/50379267>

Reviewed by Tim Horton.

On recent versions of macOS, -[NSWorkspace iconForFileType:] returns the generic document icon for
"public.directory". Instead of using this UTI to generate attachment icons for "multipart/x-folder" and
"application/vnd.apple.folder", we should instead be using "public.folder", which has a folder icon. This fixes
the existing test fast/attachment/attachment-folder-icon.html, which currently results in an image diff on these
builds of macOS.

• rendering/RenderThemeMac.mm:

(WebCore::iconForAttachment):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderThemeMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-05  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        fast/attachment/attachment-folder-icon.html is an Image Only failure on recent macOS builds
+        https://bugs.webkit.org/show_bug.cgi?id=197593
+        <rdar://problem/50379267>
+
+        Reviewed by Tim Horton.
+
+        On recent versions of macOS, -[NSWorkspace iconForFileType:] returns the generic document icon for
+        "public.directory". Instead of using this UTI to generate attachment icons for "multipart/x-folder" and
+        "application/vnd.apple.folder", we should instead be using "public.folder", which has a folder icon. This fixes
+        the existing test fast/attachment/attachment-folder-icon.html, which currently results in an image diff on these
+        builds of macOS.
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::iconForAttachment):
+
 2019-05-04  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -72 +72 @@
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
+#import <CoreServices/CoreServices.h>
 #import <math.h>
 #import <pal/spi/cg/CoreGraphicsSPI.h>
@@ -2746 +2747 @@
     if (!attachmentType.isEmpty()) {
         if (equalIgnoringASCIICase(attachmentType, "multipart/x-folder") || equalIgnoringASCIICase(attachmentType, "application/vnd.apple.folder")) {
-            if (auto icon = Icon::createIconForUTI("public.directory"))
+            if (auto icon = Icon::createIconForUTI(kUTTypeFolder))
                 return icon;
         } else {