<!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>[212192] trunk/Source/WebCore</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/212192">212192</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-11 06:29:52 -0800 (Sat, 11 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][EFL] Implement MIMETypeRegistry::getPreferredExtensionForMIMEType
https://bugs.webkit.org/show_bug.cgi?id=168163
Reviewed by Michael Catanzaro.
It's missing causing several HTML anchor download tests to fail because the suggested filename missed the
extension. This patch moves MIMETypeRegistry::appendFileExtensionIfNecessary() from the cocoa specific file to the
common file because it's not actually platform specific. MIMETypeRegistry::getPreferredExtensionForMIMEType() is
what platforms should implement.
Fixes: fast/dom/HTMLAnchorElement/anchor-download-user-triggered-synthetic-click.html
fast/dom/HTMLAnchorElement/anchor-download.html
fast/dom/HTMLAnchorElement/anchor-file-blob-download-no-extension.html
fast/dom/HTMLAnchorElement/anchor-nodownload-set.html
* platform/MIMETypeRegistry.cpp:
(WebCore::MIMETypeRegistry::appendFileExtensionIfNecessary):
* platform/cocoa/MIMETypeRegistryCocoa.mm:
(WebCore::MIMETypeRegistry::appendFileExtensionIfNecessary): Deleted.
* platform/efl/MIMETypeRegistryEfl.cpp:
(WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType):
* platform/gtk/MIMETypeRegistryGtk.cpp:
(WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformMIMETypeRegistrycpp">trunk/Source/WebCore/platform/MIMETypeRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaMIMETypeRegistryCocoamm">trunk/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformeflMIMETypeRegistryEflcpp">trunk/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkMIMETypeRegistryGtkcpp">trunk/Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212191 => 212192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-11 14:03:23 UTC (rev 212191)
+++ trunk/Source/WebCore/ChangeLog 2017-02-11 14:29:52 UTC (rev 212192)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2017-02-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK][EFL] Implement MIMETypeRegistry::getPreferredExtensionForMIMEType
+ https://bugs.webkit.org/show_bug.cgi?id=168163
+
+ Reviewed by Michael Catanzaro.
+
+ It's missing causing several HTML anchor download tests to fail because the suggested filename missed the
+ extension. This patch moves MIMETypeRegistry::appendFileExtensionIfNecessary() from the cocoa specific file to the
+ common file because it's not actually platform specific. MIMETypeRegistry::getPreferredExtensionForMIMEType() is
+ what platforms should implement.
+
+ Fixes: fast/dom/HTMLAnchorElement/anchor-download-user-triggered-synthetic-click.html
+ fast/dom/HTMLAnchorElement/anchor-download.html
+ fast/dom/HTMLAnchorElement/anchor-file-blob-download-no-extension.html
+ fast/dom/HTMLAnchorElement/anchor-nodownload-set.html
+
+ * platform/MIMETypeRegistry.cpp:
+ (WebCore::MIMETypeRegistry::appendFileExtensionIfNecessary):
+ * platform/cocoa/MIMETypeRegistryCocoa.mm:
+ (WebCore::MIMETypeRegistry::appendFileExtensionIfNecessary): Deleted.
+ * platform/efl/MIMETypeRegistryEfl.cpp:
+ (WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType):
+ * platform/gtk/MIMETypeRegistryGtk.cpp:
+ (WebCore::MIMETypeRegistry::getPreferredExtensionForMIMEType):
+
+2017-02-11 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> Unreviewed. Update imageTitle translatable string.
</span><span class="cx">
</span><span class="cx"> To match mac port. Fixes fast/images/imageDocument-title.html.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMIMETypeRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (212191 => 212192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2017-02-11 14:03:23 UTC (rev 212191)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2017-02-11 14:29:52 UTC (rev 212192)
</span><span class="lines">@@ -788,13 +788,19 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA)
</del><ins>+String MIMETypeRegistry::appendFileExtensionIfNecessary(const String& filename, const String& mimeType)
+{
+ if (filename.isEmpty())
+ return emptyString();
</ins><span class="cx">
</span><del>-String MIMETypeRegistry::appendFileExtensionIfNecessary(const String& filename, const String&)
-{
- return filename;
</del><ins>+ if (filename.reverseFind('.') != notFound)
+ return filename;
+
+ String preferredExtension = getPreferredExtensionForMIMEType(mimeType);
+ if (preferredExtension.isEmpty())
+ return filename;
+
+ return filename + "." + preferredExtension;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMIMETypeRegistryCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm (212191 => 212192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm 2017-02-11 14:03:23 UTC (rev 212191)
+++ trunk/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm 2017-02-11 14:29:52 UTC (rev 212192)
</span><span class="lines">@@ -71,19 +71,4 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String MIMETypeRegistry::appendFileExtensionIfNecessary(const String& filename, const String& mimeType)
-{
- if (filename.isEmpty())
- return emptyString();
-
- if (filename.reverseFind('.') != notFound)
- return filename;
-
- String preferredExtension = getPreferredExtensionForMIMEType(mimeType);
- if (preferredExtension.isEmpty())
- return filename;
-
- return filename + "." + preferredExtension;
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformeflMIMETypeRegistryEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp (212191 => 212192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp 2017-02-11 14:03:23 UTC (rev 212191)
+++ trunk/Source/WebCore/platform/efl/MIMETypeRegistryEfl.cpp 2017-02-11 14:29:52 UTC (rev 212192)
</span><span class="lines">@@ -86,4 +86,13 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String MIMETypeRegistry::getPreferredExtensionForMIMEType(const String& mimeType)
+{
+ for (auto& entry : extensionMap) {
+ if (equalIgnoringASCIICase(mimeType, entry.mimeType))
+ return entry.extension;
+ }
+ return emptyString();
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkMIMETypeRegistryGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp (212191 => 212192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp 2017-02-11 14:03:23 UTC (rev 212191)
+++ trunk/Source/WebCore/platform/gtk/MIMETypeRegistryGtk.cpp 2017-02-11 14:29:52 UTC (rev 212192)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> { "bmp", "image/bmp" },
</span><span class="cx"> { "css", "text/css" },
</span><span class="cx"> { "gif", "image/gif" },
</span><ins>+ { "html", "text/html" },
</ins><span class="cx"> { "htm", "text/html" },
</span><del>- { "html", "text/html" },
</del><span class="cx"> { "ico", "image/x-icon" },
</span><span class="cx"> { "jpeg", "image/jpeg" },
</span><span class="cx"> { "jpg", "image/jpeg" },
</span><span class="lines">@@ -74,4 +74,13 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String MIMETypeRegistry::getPreferredExtensionForMIMEType(const String& mimeType)
+{
+ for (auto& entry : extensionMap) {
+ if (equalIgnoringASCIICase(mimeType, entry.mimeType))
+ return entry.extension;
+ }
+ return emptyString();
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>