<!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>[181118] 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/181118">181118</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-03-05 16:46:25 -0800 (Thu, 05 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre><attachment> should allow the title property to override its title
https://bugs.webkit.org/show_bug.cgi?id=142369
Reviewed by Anders Carlsson.
Test: fast/attachment/attachment-title.html
* html/HTMLAttachmentElement.cpp:
(WebCore::HTMLAttachmentElement::parseAttribute):
Invalidate the attachment if the title changes.
(WebCore::HTMLAttachmentElement::attachmentTitle):
Use the title attribute for the title, unless it's empty, in which
case we'll use the file's name.
* html/HTMLAttachmentElement.h:
* rendering/RenderThemeMac.mm:
(WebCore::AttachmentLayout::layOutTitle):
Use attachmentTitle() instead of reaching into the file. Also rename
some things from filename to title.
* fast/attachment/attachment-title.html: Added.
* platform/mac/fast/attachment/attachment-title-expected.png: Added.
* platform/mac/fast/attachment/attachment-title-expected.txt: Added.
Add a test for the title property.</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="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastattachmentattachmenttitlehtml">trunk/LayoutTests/fast/attachment/attachment-title.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastattachmentattachmenttitleexpectedpng">trunk/LayoutTests/platform/mac/fast/attachment/attachment-title-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastattachmentattachmenttitleexpectedtxt">trunk/LayoutTests/platform/mac/fast/attachment/attachment-title-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksfastattachmentattachmenttitleexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/fast/attachment/attachment-title-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (181117 => 181118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-06 00:44:38 UTC (rev 181117)
+++ trunk/LayoutTests/ChangeLog 2015-03-06 00:46:25 UTC (rev 181118)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-03-05 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ <attachment> should allow the title property to override its title
+ https://bugs.webkit.org/show_bug.cgi?id=142369
+
+ Reviewed by Anders Carlsson.
+
+ * fast/attachment/attachment-title.html: Added.
+ * platform/mac/fast/attachment/attachment-title-expected.png: Added.
+ * platform/mac/fast/attachment/attachment-title-expected.txt: Added.
+ Add a test for the title property.
+
+2015-03-05 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> <attachment> should support indication of download progress
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142336
</span><span class="cx"> <rdar://problem/19982504>
</span></span></pre></div>
<a id="trunkLayoutTestsfastattachmentattachmenttitlehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/attachment/attachment-title.html (0 => 181118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/attachment/attachment-title.html (rev 0)
+++ trunk/LayoutTests/fast/attachment/attachment-title.html 2015-03-06 00:46:25 UTC (rev 181118)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<attachment id="attachment" title="overridden title" subtitle="1024 bytes"></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="trunkLayoutTestsplatformmacfastattachmentattachmenttitleexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/fast/attachment/attachment-title-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/fast/attachment/attachment-title-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmacfastattachmentattachmenttitleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/attachment/attachment-title-expected.txt (0 => 181118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/attachment/attachment-title-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/attachment/attachment-title-expected.txt 2015-03-06 00:46:25 UTC (rev 181118)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x105
+ RenderBlock {HTML} at (0,0) size 800x105
+ RenderBody {BODY} at (8,8) size 784x89
+ RenderAttachment {ATTACHMENT} at (0,0) size 98x89
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksfastattachmentattachmenttitleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-mavericks/fast/attachment/attachment-title-expected.txt (0 => 181118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/fast/attachment/attachment-title-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/fast/attachment/attachment-title-expected.txt 2015-03-06 00:46:25 UTC (rev 181118)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x105
+ RenderBlock {HTML} at (0,0) size 800x105
+ RenderBody {BODY} at (8,8) size 784x89
+ RenderAttachment {ATTACHMENT} at (0,0) size 102x89
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181117 => 181118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-06 00:44:38 UTC (rev 181117)
+++ trunk/Source/WebCore/ChangeLog 2015-03-06 00:46:25 UTC (rev 181118)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-03-05 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ <attachment> should allow the title property to override its title
+ https://bugs.webkit.org/show_bug.cgi?id=142369
+
+ Reviewed by Anders Carlsson.
+
+ Test: fast/attachment/attachment-title.html
+
+ * html/HTMLAttachmentElement.cpp:
+ (WebCore::HTMLAttachmentElement::parseAttribute):
+ Invalidate the attachment if the title changes.
+
+ (WebCore::HTMLAttachmentElement::attachmentTitle):
+ Use the title attribute for the title, unless it's empty, in which
+ case we'll use the file's name.
+
+ * html/HTMLAttachmentElement.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::AttachmentLayout::layOutTitle):
+ Use attachmentTitle() instead of reaching into the file. Also rename
+ some things from filename to title.
+
+2015-03-05 Timothy Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Two text carets result when dragging a file into a contentEditable area that preventDefault()s the "drop" event
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142362
</span><span class="cx"> <rdar://problem/20046434>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAttachmentElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAttachmentElement.cpp (181117 => 181118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2015-03-06 00:44:38 UTC (rev 181117)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.cpp 2015-03-06 00:46:25 UTC (rev 181118)
</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 == subtitleAttr) && is<RenderAttachment>(renderer())) {
</del><ins>+ if ((name == progressAttr || name == titleAttr || name == subtitleAttr) && is<RenderAttachment>(renderer())) {
</ins><span class="cx"> downcast<RenderAttachment>(*renderer()).invalidate();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -82,6 +82,14 @@
</span><span class="cx"> HTMLElement::parseAttribute(name, value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String HTMLAttachmentElement::attachmentTitle() const
+{
+ String title = fastGetAttribute(titleAttr);
+ if (!title.isEmpty())
+ return title;
+ return m_file ? m_file->name() : String();
+}
+
</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 (181117 => 181118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAttachmentElement.h 2015-03-06 00:44:38 UTC (rev 181117)
+++ trunk/Source/WebCore/html/HTMLAttachmentElement.h 2015-03-06 00:46:25 UTC (rev 181118)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> File* file() const;
</span><span class="cx"> void setFile(File*);
</span><span class="cx">
</span><ins>+ String attachmentTitle() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> HTMLAttachmentElement(const QualifiedName&, Document&);
</span><span class="cx"> virtual ~HTMLAttachmentElement();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (181117 => 181118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-03-06 00:44:38 UTC (rev 181117)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-03-06 00:46:25 UTC (rev 181118)
</span><span class="lines">@@ -2181,19 +2181,16 @@
</span><span class="cx"> RetainPtr<CTFontRef> font = adoptCF(CTFontCreateUIFontForLanguage(kCTFontSystemFontType, attachmentTitleFontSize, nullptr));
</span><span class="cx"> baseline = CGRound(attachmentIconBackgroundSize + attachmentIconToTitleMargin + CTFontGetAscent(font.get()));
</span><span class="cx">
</span><del>- File* file = attachment.attachmentElement().file();
- if (!file)
</del><ins>+ String title = attachment.attachmentElement().attachmentTitle();
+ if (title.isEmpty())
</ins><span class="cx"> return;
</span><del>- String filename = file->name();
- if (filename.isEmpty())
- return;
</del><span class="cx">
</span><span class="cx"> NSDictionary *textAttributes = @{
</span><span class="cx"> (id)kCTFontAttributeName: (id)font.get(),
</span><span class="cx"> (id)kCTForegroundColorAttributeName: titleTextColorForAttachment(attachment)
</span><span class="cx"> };
</span><del>- RetainPtr<NSAttributedString> attributedFilename = adoptNS([[NSAttributedString alloc] initWithString:filename attributes:textAttributes]);
- RetainPtr<CTFramesetterRef> titleFramesetter = adoptCF(CTFramesetterCreateWithAttributedString((CFAttributedStringRef)attributedFilename.get()));
</del><ins>+ RetainPtr<NSAttributedString> attributedTitle = adoptNS([[NSAttributedString alloc] initWithString:title attributes:textAttributes]);
+ RetainPtr<CTFramesetterRef> titleFramesetter = adoptCF(CTFramesetterCreateWithAttributedString((CFAttributedStringRef)attributedTitle.get()));
</ins><span class="cx">
</span><span class="cx"> CFRange fitRange;
</span><span class="cx"> CGSize titleTextSize = CTFramesetterSuggestFrameSizeWithConstraints(titleFramesetter.get(), CFRangeMake(0, 0), nullptr, CGSizeMake(attachmentTitleMaximumWidth, CGFLOAT_MAX), &fitRange);
</span><span class="lines">@@ -2224,8 +2221,8 @@
</span><span class="cx"> // Combine it into one last line, and center-truncate it.
</span><span class="cx"> CTLineRef firstRemainingLine = (CTLineRef)CFArrayGetValueAtIndex(ctLines, lineIndex);
</span><span class="cx"> CFIndex remainingRangeStart = CTLineGetStringRange(firstRemainingLine).location;
</span><del>- NSRange remainingRange = NSMakeRange(remainingRangeStart, [attributedFilename length] - remainingRangeStart);
- NSAttributedString *remainingString = [attributedFilename attributedSubstringFromRange:remainingRange];
</del><ins>+ NSRange remainingRange = NSMakeRange(remainingRangeStart, [attributedTitle length] - remainingRangeStart);
+ NSAttributedString *remainingString = [attributedTitle attributedSubstringFromRange:remainingRange];
</ins><span class="cx"> RetainPtr<CTLineRef> remainingLine = adoptCF(CTLineCreateWithAttributedString((CFAttributedStringRef)remainingString));
</span><span class="cx"> RetainPtr<NSAttributedString> ellipsisString = adoptNS([[NSAttributedString alloc] initWithString:@"\u2026" attributes:textAttributes]);
</span><span class="cx"> RetainPtr<CTLineRef> ellipsisLine = adoptCF(CTLineCreateWithAttributedString((CFAttributedStringRef)ellipsisString.get()));
</span></span></pre>
</div>
</div>
</body>
</html>