Title: [197301] trunk
- Revision
- 197301
- Author
- [email protected]
- Date
- 2016-02-28 13:00:15 -0800 (Sun, 28 Feb 2016)
Log Message
Switch to application/vnd.apple.folder for <attachment> folder special-case
https://bugs.webkit.org/show_bug.cgi?id=154786
<rdar://problem/24416632>
Reviewed by Anders Carlsson.
Source/WebCore:
No new tests, adjusted an existing test to cover this.
* rendering/RenderThemeMac.mm:
(WebCore::iconForAttachment):
Add a second folder MIME type.
LayoutTests:
* fast/attachment/attachment-folder-icon-expected.html:
* fast/attachment/attachment-folder-icon.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (197300 => 197301)
--- trunk/LayoutTests/ChangeLog 2016-02-28 20:42:55 UTC (rev 197300)
+++ trunk/LayoutTests/ChangeLog 2016-02-28 21:00:15 UTC (rev 197301)
@@ -1,5 +1,16 @@
2016-02-28 Tim Horton <[email protected]>
+ Switch to application/vnd.apple.folder for <attachment> folder special-case
+ https://bugs.webkit.org/show_bug.cgi?id=154786
+ <rdar://problem/24416632>
+
+ Reviewed by Anders Carlsson.
+
+ * fast/attachment/attachment-folder-icon-expected.html:
+ * fast/attachment/attachment-folder-icon.html:
+
+2016-02-28 Tim Horton <[email protected]>
+
Variables can resolve to the wrong value when elements differ in nothing but inherited variable value
https://bugs.webkit.org/show_bug.cgi?id=154785
Modified: trunk/LayoutTests/fast/attachment/attachment-folder-icon-expected.html (197300 => 197301)
--- trunk/LayoutTests/fast/attachment/attachment-folder-icon-expected.html 2016-02-28 20:42:55 UTC (rev 197300)
+++ trunk/LayoutTests/fast/attachment/attachment-folder-icon-expected.html 2016-02-28 21:00:15 UTC (rev 197301)
@@ -2,6 +2,7 @@
<html>
<body>
<attachment title=" "></attachment>
+<attachment title=" "></attachment>
<script>
if (window.internals)
file = window.internals.createFile("resources/");
Modified: trunk/LayoutTests/fast/attachment/attachment-folder-icon.html (197300 => 197301)
--- trunk/LayoutTests/fast/attachment/attachment-folder-icon.html 2016-02-28 20:42:55 UTC (rev 197300)
+++ trunk/LayoutTests/fast/attachment/attachment-folder-icon.html 2016-02-28 21:00:15 UTC (rev 197301)
@@ -2,5 +2,6 @@
<html>
<body>
<attachment type="multipart/x-folder"></attachment>
+<attachment type="application/vnd.apple.folder"></attachment>
</body>
</html>
Modified: trunk/Source/WebCore/ChangeLog (197300 => 197301)
--- trunk/Source/WebCore/ChangeLog 2016-02-28 20:42:55 UTC (rev 197300)
+++ trunk/Source/WebCore/ChangeLog 2016-02-28 21:00:15 UTC (rev 197301)
@@ -1,5 +1,19 @@
2016-02-28 Tim Horton <[email protected]>
+ Switch to application/vnd.apple.folder for <attachment> folder special-case
+ https://bugs.webkit.org/show_bug.cgi?id=154786
+ <rdar://problem/24416632>
+
+ Reviewed by Anders Carlsson.
+
+ No new tests, adjusted an existing test to cover this.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::iconForAttachment):
+ Add a second folder MIME type.
+
+2016-02-28 Tim Horton <[email protected]>
+
Variables can resolve to the wrong value when elements differ in nothing but inherited variable value
https://bugs.webkit.org/show_bug.cgi?id=154785
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (197300 => 197301)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-02-28 20:42:55 UTC (rev 197300)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-02-28 21:00:15 UTC (rev 197301)
@@ -2349,7 +2349,7 @@
{
String MIMEType = attachment.attachmentElement().attachmentType();
if (!MIMEType.isEmpty()) {
- if (equalIgnoringASCIICase(MIMEType, "multipart/x-folder")) {
+ if (equalIgnoringASCIICase(MIMEType, "multipart/x-folder") || equalIgnoringASCIICase(MIMEType, "application/vnd.apple.folder")) {
if (auto icon = Icon::createIconForUTI("public.directory"))
return icon;
} else if (auto icon = Icon::createIconForMIMEType(MIMEType))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes