Title: [223862] trunk/Source/WebCore
- Revision
- 223862
- Author
- wenson_hs...@apple.com
- Date
- 2017-10-23 16:40:18 -0700 (Mon, 23 Oct 2017)
Log Message
Unreviewed, fix the Windows build after r223860
UTIUtilities only exists on Cocoa platforms, so we need to guard it accordingly.
* platform/MIMETypeRegistry.cpp:
(WebCore::initializeSupportedImageMIMETypes):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (223861 => 223862)
--- trunk/Source/WebCore/ChangeLog 2017-10-23 23:23:05 UTC (rev 223861)
+++ trunk/Source/WebCore/ChangeLog 2017-10-23 23:40:18 UTC (rev 223862)
@@ -1,5 +1,14 @@
2017-10-23 Wenson Hsieh <wenson_hs...@apple.com>
+ Unreviewed, fix the Windows build after r223860
+
+ UTIUtilities only exists on Cocoa platforms, so we need to guard it accordingly.
+
+ * platform/MIMETypeRegistry.cpp:
+ (WebCore::initializeSupportedImageMIMETypes):
+
+2017-10-23 Wenson Hsieh <wenson_hs...@apple.com>
+
[iOS] DocumentWriter::createDocument can spend ~100ms unnecessarily converting image UTIs to MIME types
https://bugs.webkit.org/show_bug.cgi?id=178618
<rdar://problem/35108852>
Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (223861 => 223862)
--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2017-10-23 23:23:05 UTC (rev 223861)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2017-10-23 23:40:18 UTC (rev 223862)
@@ -36,10 +36,13 @@
#if USE(CG)
#include "ImageSourceCG.h"
#include "UTIRegistry.h"
-#include "UTIUtilities.h"
#include <wtf/RetainPtr.h>
#endif
+#if USE(CG) && PLATFORM(COCOA)
+#include "UTIUtilities.h"
+#endif
+
#if USE(CG) && !PLATFORM(IOS)
#include <ApplicationServices/ApplicationServices.h>
#endif
@@ -85,9 +88,11 @@
}
}
+#if PLATFORM(COCOA)
for (auto& mime : *supportedImageMIMETypes)
ASSERT_UNUSED(mime, allowedImageUTIs().contains(UTIFromMIMEType(mime)));
#endif
+#endif
// Favicons don't have a MIME type in the registry either.
supportedImageMIMETypes->add("image/x-icon");
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes