Changeset 249938 in webkit

Timestamp:

Sep 16, 2019 8:05:13 PM (5 years ago)

Author:

Fujii Hironori

Message:

[AppleWin] Assertion failure in defaultSupportedImageTypes in UTIRegistry.cpp
​https://bugs.webkit.org/show_bug.cgi?id=198286

Reviewed by Brent Fulgham.

Some image types aren't supported by CG for Windows.

No new tests, covered by existing tests.

• platform/graphics/cg/ImageSourceCGWin.cpp:

(WebCore::MIMETypeForImageType): Return the correct MIME types for
com.microsoft.cur and com.microsoft.ico.

• platform/graphics/cg/UTIRegistry.cpp:

(WebCore::defaultSupportedImageTypes): Excluded public.jpeg-2000 and public.mpo-image if PLATFORM(WIN).

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/ImageSourceCGWin.cpp (modified) (1 diff)
• platform/graphics/cg/UTIRegistry.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-16  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [AppleWin] Assertion failure in defaultSupportedImageTypes in UTIRegistry.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=198286
+
+        Reviewed by Brent Fulgham.
+
+        Some image types aren't supported by CG for Windows.
+
+        No new tests, covered by existing tests.
+
+        * platform/graphics/cg/ImageSourceCGWin.cpp:
+        (WebCore::MIMETypeForImageType): Return the correct MIME types for
+        com.microsoft.cur and com.microsoft.ico.
+        * platform/graphics/cg/UTIRegistry.cpp:
+        (WebCore::defaultSupportedImageTypes): Excluded public.jpeg-2000 and public.mpo-image if PLATFORM(WIN).
+
 2019-09-16  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/platform/graphics/cg/ImageSourceCGWin.cpp

@@ -40 +40 @@
     // png, tiff, gif but won't work for UTIs like: public.jpeg-2000,
     // public.xbitmap-image, com.apple.quicktime-image, and others.
-    if (int dotLocation = type.reverseFind('.'))
+    if (type == "com.microsoft.cur" || type == "com.microsoft.ico")
+        mimeType = "image/vnd.microsoft.icon"_s;
+    else if (int dotLocation = type.reverseFind('.'))
         mimeType = "image/" + type.substring(dotLocation + 1);
     return mimeType;

trunk/Source/WebCore/platform/graphics/cg/UTIRegistry.cpp

@@ -51 +51 @@
         "com.microsoft.ico",
         "public.jpeg",
+        "public.png",
+        "public.tiff",
+#if !PLATFORM(WIN)
         "public.jpeg-2000",
         "public.mpo-image",
-        "public.png",
-        "public.tiff",
+#endif
     };