Title: [158950] branches/safari-537.73-branch/Source/WebCore
- Revision
- 158950
- Author
- [email protected]
- Date
- 2013-11-08 13:42:02 -0800 (Fri, 08 Nov 2013)
Log Message
Merged r152867. <rdar://problem/15411424>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebCore/ChangeLog (158949 => 158950)
--- branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-11-08 21:35:58 UTC (rev 158949)
+++ branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-11-08 21:42:02 UTC (rev 158950)
@@ -1,3 +1,20 @@
+2013-11-08 Lucas Forschler <[email protected]>
+
+ Merge r152867
+
+ 2013-07-18 Jer Noble <[email protected]>
+
+ New PDFPlugin doesn't support WebKitOmitPDFSupport, acts as if Plug-ins are off
+ https://bugs.webkit.org/show_bug.cgi?id=118858
+
+ Reviewed by Eric Carlson.
+
+ Expand the scope of rejecting non video/ or audio/ MIME types when
+ filling the MIME type cache.
+
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
+ (WebCore::shouldRejectMIMEType): Added utility function.
+
2013-11-07 Chris Fleizach <[email protected]>
Merge r158743
Modified: branches/safari-537.73-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm (158949 => 158950)
--- branches/safari-537.73-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2013-11-08 21:35:58 UTC (rev 158949)
+++ branches/safari-537.73-branch/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm 2013-11-08 21:42:02 UTC (rev 158950)
@@ -1410,6 +1410,13 @@
[m_objcObserver.get() setDelayCallbacks:NO];
}
+static bool shouldRejectMIMEType(const String& type)
+{
+ // QTKit will return non-video MIME types which it claims to support, but which we
+ // do not support in the <video> element. Disclaim all non video/ or audio/ types.
+ return !type.startsWith("video/") && !type.startsWith("audio/");
+}
+
static void addFileTypesToCache(NSArray * fileTypes, HashSet<String> &cache)
{
int count = [fileTypes count];
@@ -1419,6 +1426,8 @@
if (!uti)
continue;
RetainPtr<CFStringRef> mime = adoptCF(UTTypeCopyPreferredTagWithClass(uti.get(), kUTTagClassMIMEType));
+ if (shouldRejectMIMEType(mime.get()))
+ continue;
if (mime)
cache.add(mime.get());
@@ -1433,9 +1442,7 @@
for (unsigned ndx = 0; ndx < count; ++ndx) {
String& type = typesForExtension[ndx];
- // QTKit will return non-video MIME types which it claims to support, but which we
- // do not support in the <video> element. Disclaim all non video/ or audio/ types.
- if (!type.startsWith("video/") && !type.startsWith("audio/"))
+ if (shouldRejectMIMEType(type))
continue;
if (!cache.contains(type))
@@ -1497,7 +1504,7 @@
// Due to <rdar://problem/10777059>, avoid calling the mime types cache functions if at
// all possible:
- if (!type.startsWith("video/") && !type.startsWith("audio/"))
+ if (shouldRejectMIMEType(type))
return MediaPlayer::IsNotSupported;
// We check the "modern" type cache first, as it doesn't require QTKitServer to start.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
