<!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>[184843] 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/184843">184843</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-24 10:43:03 -0700 (Sun, 24 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Register media MIME types as supported by HTML view in WebKit1.
https://bugs.webkit.org/show_bug.cgi?id=145356
Patch by Jeremy Jones <jeremyj@apple.com> on 2015-05-24
Reviewed by Eric Carlson.
Source/WebCore:
getSupportedMediaMIMETypes is now used in WebKit1.
* platform/MIMETypeRegistry.h: Export getSupportedMediaMIMETypes.
Source/WebKit/mac:
WebDataSource and WebFrame view knew about suppotedImageMIMETypes and supportedNonImageMIMETypes,
but not a third category supportedMediaMIMETypes. These are now included along-side
supportedNonImageMIMETypes.
* WebView/WebDataSource.mm:
(+[WebDataSource _repTypesAllowImageTypeOmission:]): use supportedMediaMIMETypes.
* WebView/WebFrameView.mm:
(+[WebFrameView _viewTypesAllowImageTypeOmission:]): use supportedMediaMIMETypes.
* WebView/WebHTMLRepresentation.h: declare -supportedMediaMIMETypes
* WebView/WebHTMLRepresentation.mm:
(+[WebHTMLRepresentation supportedMIMETypes]): include supportedMediaMIMETypes
(+[WebHTMLRepresentation supportedMediaMIMETypes]): added
* WebView/WebHTMLView.mm:
(+[WebHTMLView supportedMediaMIMETypes]): added
* WebView/WebHTMLViewPrivate.h: declare -supportedMediaMIMETypes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformMIMETypeRegistryh">trunk/Source/WebCore/platform/MIMETypeRegistry.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourcemm">trunk/Source/WebKit/mac/WebView/WebDataSource.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewmm">trunk/Source/WebKit/mac/WebView/WebFrameView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLRepresentationh">trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLRepresentationmm">trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewPrivateh">trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184842 => 184843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-24 04:00:52 UTC (rev 184842)
+++ trunk/Source/WebCore/ChangeLog 2015-05-24 17:43:03 UTC (rev 184843)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-24 Jeremy Jones <jeremyj@apple.com>
+
+ Register media MIME types as supported by HTML view in WebKit1.
+ https://bugs.webkit.org/show_bug.cgi?id=145356
+
+ Reviewed by Eric Carlson.
+
+ getSupportedMediaMIMETypes is now used in WebKit1.
+
+ * platform/MIMETypeRegistry.h: Export getSupportedMediaMIMETypes.
+
</ins><span class="cx"> 2015-05-23 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Permanent redirects should have long implicit cache lifetime
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMIMETypeRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.h (184842 => 184843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MIMETypeRegistry.h 2015-05-24 04:00:52 UTC (rev 184842)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.h 2015-05-24 17:43:03 UTC (rev 184843)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> static HashSet<String>& getSupportedImageResourceMIMETypes();
</span><span class="cx"> static HashSet<String>& getSupportedImageMIMETypesForEncoding();
</span><span class="cx"> WEBCORE_EXPORT static HashSet<String>& getSupportedNonImageMIMETypes();
</span><del>- static HashSet<String>& getSupportedMediaMIMETypes();
</del><ins>+ WEBCORE_EXPORT static HashSet<String>& getSupportedMediaMIMETypes();
</ins><span class="cx"> WEBCORE_EXPORT static HashSet<String>& getPDFMIMETypes();
</span><span class="cx"> static HashSet<String>& getPDFAndPostScriptMIMETypes();
</span><span class="cx"> WEBCORE_EXPORT static HashSet<String>& getUnsupportedTextMIMETypes();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (184842 => 184843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-05-24 04:00:52 UTC (rev 184842)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-24 17:43:03 UTC (rev 184843)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-05-24 Jeremy Jones <jeremyj@apple.com>
+
+ Register media MIME types as supported by HTML view in WebKit1.
+ https://bugs.webkit.org/show_bug.cgi?id=145356
+
+ Reviewed by Eric Carlson.
+
+ WebDataSource and WebFrame view knew about suppotedImageMIMETypes and supportedNonImageMIMETypes,
+ but not a third category supportedMediaMIMETypes. These are now included along-side
+ supportedNonImageMIMETypes.
+
+ * WebView/WebDataSource.mm:
+ (+[WebDataSource _repTypesAllowImageTypeOmission:]): use supportedMediaMIMETypes.
+ * WebView/WebFrameView.mm:
+ (+[WebFrameView _viewTypesAllowImageTypeOmission:]): use supportedMediaMIMETypes.
+ * WebView/WebHTMLRepresentation.h: declare -supportedMediaMIMETypes
+ * WebView/WebHTMLRepresentation.mm:
+ (+[WebHTMLRepresentation supportedMIMETypes]): include supportedMediaMIMETypes
+ (+[WebHTMLRepresentation supportedMediaMIMETypes]): added
+ * WebView/WebHTMLView.mm:
+ (+[WebHTMLView supportedMediaMIMETypes]): added
+ * WebView/WebHTMLViewPrivate.h: declare -supportedMediaMIMETypes
+
</ins><span class="cx"> 2015-05-22 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename MediaPlaybackAllowsInline
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (184842 => 184843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2015-05-24 04:00:52 UTC (rev 184842)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2015-05-24 17:43:03 UTC (rev 184843)
</span><span class="lines">@@ -263,6 +263,7 @@
</span><span class="cx"> if (!repTypes) {
</span><span class="cx"> repTypes = [[NSMutableDictionary alloc] init];
</span><span class="cx"> addTypesFromClass(repTypes, [WebHTMLRepresentation class], [WebHTMLRepresentation supportedNonImageMIMETypes]);
</span><ins>+ addTypesFromClass(repTypes, [WebHTMLRepresentation class], [WebHTMLRepresentation supportedMediaMIMETypes]);
</ins><span class="cx">
</span><span class="cx"> // Since this is a "secret default" we don't both registering it.
</span><span class="cx"> BOOL omitPDFSupport = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitOmitPDFSupport"];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.mm (184842 => 184843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2015-05-24 04:00:52 UTC (rev 184842)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.mm 2015-05-24 17:43:03 UTC (rev 184843)
</span><span class="lines">@@ -273,6 +273,7 @@
</span><span class="cx"> if (!viewTypes) {
</span><span class="cx"> viewTypes = [[NSMutableDictionary alloc] init];
</span><span class="cx"> addTypesFromClass(viewTypes, [WebHTMLView class], [WebHTMLView supportedNonImageMIMETypes]);
</span><ins>+ addTypesFromClass(viewTypes, [WebHTMLView class], [WebHTMLView supportedMediaMIMETypes]);
</ins><span class="cx">
</span><span class="cx"> // Since this is a "secret default" we don't bother registering it.
</span><span class="cx"> BOOL omitPDFSupport = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitOmitPDFSupport"];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLRepresentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.h (184842 => 184843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.h 2015-05-24 04:00:52 UTC (rev 184842)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.h 2015-05-24 17:43:03 UTC (rev 184843)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (NSArray *)supportedMIMETypes;
</span><ins>++ (NSArray *)supportedMediaMIMETypes;
</ins><span class="cx"> + (NSArray *)supportedNonImageMIMETypes;
</span><span class="cx"> + (NSArray *)supportedImageMIMETypes;
</span><span class="cx"> + (NSArray *)unsupportedTextMIMETypes;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLRepresentationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm (184842 => 184843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2015-05-24 04:00:52 UTC (rev 184842)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm 2015-05-24 17:43:03 UTC (rev 184843)
</span><span class="lines">@@ -106,10 +106,17 @@
</span><span class="cx">
</span><span class="cx"> + (NSArray *)supportedMIMETypes
</span><span class="cx"> {
</span><del>- static __unsafe_unretained NSArray *staticSupportedMIMETypes = newArrayByConcatenatingArrays([self supportedNonImageMIMETypes], [self supportedImageMIMETypes]);
</del><ins>+ static __unsafe_unretained NSArray *staticSupportedMIMETypes = newArrayByConcatenatingArrays([self supportedNonImageMIMETypes],
+ newArrayByConcatenatingArrays([self supportedImageMIMETypes], [self supportedMediaMIMETypes]));
</ins><span class="cx"> return staticSupportedMIMETypes;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>++ (NSArray *)supportedMediaMIMETypes
+{
+ static __unsafe_unretained NSArray *staticSupportedMediaMIMETypes = newArrayWithStrings(MIMETypeRegistry::getSupportedMediaMIMETypes());
+ return staticSupportedMediaMIMETypes;
+}
+
</ins><span class="cx"> + (NSArray *)supportedNonImageMIMETypes
</span><span class="cx"> {
</span><span class="cx"> static __unsafe_unretained NSArray *staticSupportedNonImageMIMETypes = newArrayWithStrings(MIMETypeRegistry::getSupportedNonImageMIMETypes());
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (184842 => 184843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-24 04:00:52 UTC (rev 184842)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-05-24 17:43:03 UTC (rev 184843)
</span><span class="lines">@@ -1262,6 +1262,11 @@
</span><span class="cx"> return [WebHTMLRepresentation supportedMIMETypes];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>++ (NSArray *)supportedMediaMIMETypes
+{
+ return [WebHTMLRepresentation supportedMediaMIMETypes];
+}
+
</ins><span class="cx"> + (NSArray *)supportedImageMIMETypes
</span><span class="cx"> {
</span><span class="cx"> return [WebHTMLRepresentation supportedImageMIMETypes];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h (184842 => 184843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h 2015-05-24 04:00:52 UTC (rev 184842)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLViewPrivate.h 2015-05-24 17:43:03 UTC (rev 184843)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> @interface WebHTMLView (WebPrivate)
</span><span class="cx">
</span><span class="cx"> + (NSArray *)supportedMIMETypes;
</span><ins>++ (NSArray *)supportedMediaMIMETypes;
</ins><span class="cx"> + (NSArray *)supportedImageMIMETypes;
</span><span class="cx"> + (NSArray *)supportedNonImageMIMETypes;
</span><span class="cx"> + (NSArray *)unsupportedTextMIMETypes;
</span></span></pre>
</div>
</div>
</body>
</html>