<!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>[195678] trunk</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/195678">195678</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-01-27 11:11:22 -0800 (Wed, 27 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Need to be able to specify MIME type for <attachment> without filename or handle
https://bugs.webkit.org/show_bug.cgi?id=153552
<rdar://problem/20145857>
Reviewed by Anders Carlsson.
Tests: fast/attachment/attachment-default-icon.html
fast/attachment/attachment-type-attribute.html
* html/HTMLAttachmentElement.cpp:
(WebCore::HTMLAttachmentElement::parseAttribute):
Invalidate attachment when 'type' attribute changes.
(WebCore::HTMLAttachmentElement::attachmentType):
* html/HTMLAttachmentElement.h:
* platform/graphics/Icon.h:
* platform/graphics/mac/IconMac.mm:
(WebCore::Icon::createIconForUTI):
(WebCore::Icon::createIconForMIMEType):
Add Icon class methods to retrieve an icon given a UTI or MIME type.
* rendering/RenderThemeMac.mm:
(WebCore::paintAttachmentIcon):
Use the 'type' attribute (a MIME type) if we have one. Otherwise,
use the filename. Lastly fall back to a plain file icon (using the root
file UTI, public.data).
* fast/attachment/attachment-default-icon-expected.html: Added.
* fast/attachment/attachment-default-icon.html: Added.
* fast/attachment/attachment-type-attribute-expected.html: Added.
* fast/attachment/attachment-type-attribute.html: Added.
Add some tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttachmentElementcpp">trunk/Source/WebCore/html/HTMLAttachmentElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAttachmentElementh">trunk/Source/WebCore/html/HTMLAttachmentElement.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIconh">trunk/Source/WebCore/platform/graphics/Icon.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacIconMacmm">trunk/Source/WebCore/platform/graphics/mac/IconMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastattachmentattachmentdefaulticonexpectedhtml">trunk/LayoutTests/fast/attachment/attachment-default-icon-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastattachmentattachmentdefaulticonhtml">trunk/LayoutTests/fast/attachment/attachment-default-icon.html</a></li>
<li><a href="#trunkLayoutTestsfastattachmentattachmenttypeattributeexpectedhtml">trunk/LayoutTests/fast/attachment/attachment-type-attribute-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastattachmentattachmenttypeattributehtml">trunk/LayoutTests/fast/attachment/attachment-type-attribute.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195677 => 195678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-27 18:38:22 UTC (rev 195677)
+++ trunk/LayoutTests/ChangeLog 2016-01-27 19:11:22 UTC (rev 195678)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-27 Tim Horton <timothy_horton@apple.com>
+
+ Need to be able to specify MIME type for <attachment> without filename or handle
+ https://bugs.webkit.org/show_bug.cgi?id=153552
+ <rdar://problem/20145857>
+
+ Reviewed by Anders Carlsson.
+
+ * fast/attachment/attachment-default-icon-expected.html: Added.
+ * fast/attachment/attachment-default-icon.html: Added.
+ * fast/attachment/attachment-type-attribute-expected.html: Added.
+ * fast/attachment/attachment-type-attribute.html: Added.
+ Add some tests.
+
</ins><span class="cx"> 2016-01-27 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [GTK] Problem running promises code in workers
</span></span></pre></div>
<a id="trunkLayoutTestsfastattachmentattachmentdefaulticonexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/attachment/attachment-default-icon-expected.html (0 => 195678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/attachment/attachment-default-icon-expected.html (rev 0)
+++ trunk/LayoutTests/fast/attachment/attachment-default-icon-expected.html 2016-01-27 19:11:22 UTC (rev 195678)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<attachment id="attachment" title=" "></attachment>
+<script>
+var file;
+if (window.internals)
+ file = window.internals.createFile("resources/test-file.dat");
+
+document.getElementById("attachment").file = file;
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastattachmentattachmentdefaulticonhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/attachment/attachment-default-icon.html (0 => 195678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/attachment/attachment-default-icon.html (rev 0)
+++ trunk/LayoutTests/fast/attachment/attachment-default-icon.html 2016-01-27 19:11:22 UTC (rev 195678)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<attachment></attachment>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastattachmentattachmenttypeattributeexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/attachment/attachment-type-attribute-expected.html (0 => 195678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/attachment/attachment-type-attribute-expected.html (rev 0)
+++ trunk/LayoutTests/fast/attachment/attachment-type-attribute-expected.html 2016-01-27 19:11:22 UTC (rev 195678)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<attachment id="attachment" title=" "></attachment>
+<script>
+var file;
+if (window.internals)
+ file = window.internals.createFile("resources/test-file.txt");
+
+document.getElementById("attachment").file = file;
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastattachmentattachmenttypeattributehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/attachment/attachment-type-attribute.html (0 => 195678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/attachment/attachment-type-attribute.html (rev 0)
+++ trunk/LayoutTests/fast/attachment/attachment-type-attribute.html 2016-01-27 19:11:22 UTC (rev 195678)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<attachment type="text/plain"></attachment>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195677 => 195678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-27 18:38:22 UTC (rev 195677)
+++ trunk/Source/WebCore/ChangeLog 2016-01-27 19:11:22 UTC (rev 195678)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-01-27 Tim Horton <timothy_horton@apple.com>
+
+ Need to be able to specify MIME type for <attachment> without filename or handle
+ https://bugs.webkit.org/show_bug.cgi?id=153552
+ <rdar://problem/20145857>
+
+ Reviewed by Anders Carlsson.
+
+ Tests: fast/attachment/attachment-default-icon.html
+ fast/attachment/attachment-type-attribute.html
+
+ * html/HTMLAttachmentElement.cpp:
+ (WebCore::HTMLAttachmentElement::parseAttribute):
+ Invalidate attachment when 'type' attribute changes.
+
+ (WebCore::HTMLAttachmentElement::attachmentType):
+ * html/HTMLAttachmentElement.h:
+ * platform/graphics/Icon.h:
+ * platform/graphics/mac/IconMac.mm:
+ (WebCore::Icon::createIconForUTI):
+ (WebCore::Icon::createIconForMIMEType):
+ Add Icon class methods to retrieve an icon given a UTI or MIME type.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::paintAttachmentIcon):
+ Use the 'type' attribute (a MIME type) if we have one. Otherwise,
+ use the filename. Lastly fall back to a plain file icon (using the root
+ file UTI, public.data).
+
</ins><span class="cx"> 2016-01-27 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE_CURRENTSRC
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttachmentElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttachmentElement.cpp (195677 => 195678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2016-01-27 18:38:22 UTC (rev 195677)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2016-01-27 19:11:22 UTC (rev 195678)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> void HTMLAttachmentElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
</span><span class="cx"> {
</span><del>- if ((name == progressAttr || name == titleAttr || name == subtitleAttr) && is<RenderAttachment>(renderer())) {
</del><ins>+ if ((name == progressAttr || name == titleAttr || name == subtitleAttr || name == typeAttr) && is<RenderAttachment>(renderer())) {
</ins><span class="cx"> downcast<RenderAttachment>(*renderer()).invalidate();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -90,6 +90,11 @@
</span><span class="cx"> return m_file ? m_file->name() : String();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String HTMLAttachmentElement::attachmentType() const
+{
+ return fastGetAttribute(typeAttr);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(ATTACHMENT_ELEMENT)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttachmentElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttachmentElement.h (195677 => 195678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttachmentElement.h 2016-01-27 18:38:22 UTC (rev 195677)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.h 2016-01-27 19:11:22 UTC (rev 195678)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> void setFile(File*);
</span><span class="cx">
</span><span class="cx"> String attachmentTitle() const;
</span><ins>+ String attachmentType() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> HTMLAttachmentElement(const QualifiedName&, Document&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIconh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Icon.h (195677 => 195678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Icon.h 2016-01-27 18:38:22 UTC (rev 195677)
+++ trunk/Source/WebCore/platform/graphics/Icon.h 2016-01-27 19:11:22 UTC (rev 195678)
</span><span class="lines">@@ -60,6 +60,11 @@
</span><span class="cx"> WEBCORE_EXPORT static PassRefPtr<Icon> createIconForImage(NativeImagePtr);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ static RefPtr<Icon> createIconForUTI(const String&);
+ static RefPtr<Icon> createIconForMIMEType(const String&);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> Icon(CGImageRef);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacIconMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/IconMac.mm (195677 => 195678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2016-01-27 18:38:22 UTC (rev 195677)
+++ trunk/Source/WebCore/platform/graphics/mac/IconMac.mm 2016-01-27 19:11:22 UTC (rev 195678)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #import "GraphicsContext.h"
</span><span class="cx"> #import "IntRect.h"
</span><span class="cx"> #import "LocalCurrentGraphicsContext.h"
</span><ins>+#import "UTIUtilities.h"
</ins><span class="cx"> #import <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -72,6 +73,20 @@
</span><span class="cx"> return adoptRef(new Icon(image));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<Icon> Icon::createIconForUTI(const String& UTI)
+{
+ NSImage *image = [[NSWorkspace sharedWorkspace] iconForFileType:UTI];
+ if (!image)
+ return nullptr;
+
+ return adoptRef(new Icon(image));
+}
+
+RefPtr<Icon> Icon::createIconForMIMEType(const String& MIMEType)
+{
+ return createIconForUTI(UTIFromMIMEType(MIMEType.createCFString().get()).get());
+}
+
</ins><span class="cx"> void Icon::paint(GraphicsContext& context, const FloatRect& rect)
</span><span class="cx"> {
</span><span class="cx"> if (context.paintingDisabled())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (195677 => 195678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-01-27 18:38:22 UTC (rev 195677)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-01-27 19:11:22 UTC (rev 195678)
</span><span class="lines">@@ -2339,11 +2339,21 @@
</span><span class="cx">
</span><span class="cx"> static void paintAttachmentIcon(const RenderAttachment& attachment, GraphicsContext& context, AttachmentLayout& layout)
</span><span class="cx"> {
</span><del>- Vector<String> filenames;
- if (File* file = attachment.attachmentElement().file())
- filenames.append(file->path());
- RefPtr<Icon> icon = Icon::createIconForFiles(filenames);
</del><ins>+ RefPtr<Icon> icon;
+ String type = attachment.attachmentElement().attachmentType();
+ if (!type.isEmpty())
+ icon = Icon::createIconForMIMEType(type);
+ else {
+ Vector<String> filenames;
+ if (File* file = attachment.attachmentElement().file())
+ filenames.append(file->path());
+ icon = Icon::createIconForFiles(filenames);
+ }
+
</ins><span class="cx"> if (!icon)
</span><ins>+ icon = Icon::createIconForUTI("public.data");
+
+ if (!icon)
</ins><span class="cx"> return;
</span><span class="cx"> icon->paint(context, layout.iconRect);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>