<!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>[198239] 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/198239">198239</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-03-15 16:13:34 -0700 (Tue, 15 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>iOS <attachment> element should allow customization of action text color
https://bugs.webkit.org/show_bug.cgi?id=155513
<rdar://problem/24805991>
Reviewed by Simon Fraser.
Test: fast/attachment/attachment-action.html
* css/html.css:
(attachment):
On iOS (the only place it is used), <attachment> color should default to system blue.
* rendering/RenderThemeIOS.mm:
(WebCore::attachmentActionColor):
(WebCore::AttachmentInfo::AttachmentInfo):
Make use of the <attachment>'s CSS color for the action text.
This is a little weird because there are multiple bits of text in an
<attachment>, but only the action text ever changes color.
* fast/attachment/attachment-action-expected.html: Added.
* fast/attachment/attachment-action.html: Added.
* platform/ios-simulator/fast/attachment/attachment-label-highlight-expected.txt:
* platform/ios-simulator/fast/attachment/attachment-progress-expected.txt:
* platform/ios-simulator/fast/attachment/attachment-rendering-expected.txt:
* platform/ios-simulator/fast/attachment/attachment-select-on-click-expected.txt:
* platform/ios-simulator/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt:
* platform/ios-simulator/fast/attachment/attachment-subtitle-expected.txt:
* platform/ios-simulator/fast/attachment/attachment-title-expected.txt:
Rebaseline some tests and add one that action text matches the requested color.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastattachmentattachmentdisabledrenderingexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-disabled-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastattachmentattachmentlabelhighlightexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-label-highlight-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastattachmentattachmentprogressexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-progress-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastattachmentattachmentrenderingexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-rendering-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastattachmentattachmentselectonclickexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastattachmentattachmentselectonclickinsideuserselectallexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastattachmentattachmentsubtitleexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-subtitle-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorfastattachmentattachmenttitleexpectedtxt">trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-title-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastattachmentattachmentactionexpectedhtml">trunk/LayoutTests/fast/attachment/attachment-action-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastattachmentattachmentactionhtml">trunk/LayoutTests/fast/attachment/attachment-action.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/LayoutTests/ChangeLog 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-15 Tim Horton <timothy_horton@apple.com>
+
+ iOS <attachment> element should allow customization of action text color
+ https://bugs.webkit.org/show_bug.cgi?id=155513
+ <rdar://problem/24805991>
+
+ Reviewed by Simon Fraser.
+
+ * fast/attachment/attachment-action-expected.html: Added.
+ * fast/attachment/attachment-action.html: Added.
+ * platform/ios-simulator/fast/attachment/attachment-label-highlight-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-progress-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-rendering-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-select-on-click-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-subtitle-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-title-expected.txt:
+ Rebaseline some tests and add one that action text matches the requested color.
+
</ins><span class="cx"> 2016-03-15 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r198148.
</span></span></pre></div>
<a id="trunkLayoutTestsfastattachmentattachmentactionexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/attachment/attachment-action-expected.html (0 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/attachment/attachment-action-expected.html (rev 0)
+++ trunk/LayoutTests/fast/attachment/attachment-action-expected.html 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<script>
+if (window.internals)
+ window.internals.settings.setAttachmentElementEnabled(true);
+</script>
+<style>
+div {
+ width: 300px;
+ height: 300px;
+}
+</style>
+<body>
+ <div style="background-color: -apple-system-blue;"><attachment action=" "></attachment></div>
+ <div style="background-color: -apple-system-green;"><attachment action=" "></attachment></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastattachmentattachmentactionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/attachment/attachment-action.html (0 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/attachment/attachment-action.html (rev 0)
+++ trunk/LayoutTests/fast/attachment/attachment-action.html 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<script>
+if (window.internals)
+ window.internals.settings.setAttachmentElementEnabled(true);
+</script>
+<style>
+div {
+ width: 300px;
+ height: 300px;
+}
+</style>
+<body>
+ <div style="background-color: -apple-system-blue;"><attachment action="Default Action"></attachment></div>
+ <div style="background-color: -apple-system-green;"><attachment action="Destructive Action" style="color: -apple-system-green;"></attachment></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastattachmentattachmentdisabledrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-disabled-rendering-expected.txt (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-disabled-rendering-expected.txt 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-disabled-rendering-expected.txt 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -7,5 +7,5 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 766x19
</span><span class="cx"> text run at (0,0) width 766: "This tests that attachments don't have a custom renderer when they are disabled. This test must be run in the test runner."
</span><span class="cx"> RenderBlock (anonymous) at (0,36) size 784x0
</span><del>- RenderBlock {ATTACHMENT} at (0,0) size 0x0
</del><ins>+ RenderBlock {ATTACHMENT} at (0,0) size 0x0 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastattachmentattachmentlabelhighlightexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-label-highlight-expected.txt (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-label-highlight-expected.txt 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-label-highlight-expected.txt 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -3,12 +3,12 @@
</span><span class="cx"> layer at (0,0) size 800x284
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x284
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x268
</span><del>- RenderAttachment {ATTACHMENT} at (0,15) size 160x119
- RenderAttachment {ATTACHMENT} at (160,15) size 160x119
- RenderAttachment {ATTACHMENT} at (320,15) size 160x119
- RenderAttachment {ATTACHMENT} at (480,15) size 160x119
- RenderAttachment {ATTACHMENT} at (0,149) size 160x119
- RenderAttachment {ATTACHMENT} at (160,149) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (0,15) size 160x119 [color=#007AFF]
+ RenderAttachment {ATTACHMENT} at (160,15) size 160x119 [color=#007AFF]
+ RenderAttachment {ATTACHMENT} at (320,15) size 160x119 [color=#007AFF]
+ RenderAttachment {ATTACHMENT} at (480,15) size 160x119 [color=#007AFF]
+ RenderAttachment {ATTACHMENT} at (0,149) size 160x119 [color=#007AFF]
+ RenderAttachment {ATTACHMENT} at (160,149) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> selection start: position 0 of child 2 {ATTACHMENT} of body
</span><span class="cx"> selection end: position 1 of child 7 {ATTACHMENT} of body
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastattachmentattachmentprogressexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-progress-expected.txt (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-progress-expected.txt 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-progress-expected.txt 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -3,27 +3,27 @@
</span><span class="cx"> layer at (0,0) size 800x284
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x284
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x268
</span><del>- RenderAttachment {ATTACHMENT} at (0,15) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (0,15) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (160,0) size 4x19
</span><span class="cx"> text run at (160,0) width 4: " "
</span><del>- RenderAttachment {ATTACHMENT} at (164,15) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (164,15) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (324,0) size 4x19
</span><span class="cx"> text run at (324,0) width 4: " "
</span><del>- RenderAttachment {ATTACHMENT} at (328,15) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (328,15) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (488,0) size 4x19
</span><span class="cx"> text run at (488,0) width 4: " "
</span><del>- RenderAttachment {ATTACHMENT} at (492,15) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (492,15) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (652,0) size 4x19
</span><span class="cx"> text run at (652,0) width 4: " "
</span><del>- RenderAttachment {ATTACHMENT} at (0,149) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (0,149) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (160,134) size 4x19
</span><span class="cx"> text run at (160,134) width 4: " "
</span><del>- RenderAttachment {ATTACHMENT} at (164,149) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (164,149) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (324,134) size 4x19
</span><span class="cx"> text run at (324,134) width 4: " "
</span><del>- RenderAttachment {ATTACHMENT} at (328,149) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (328,149) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (488,134) size 4x19
</span><span class="cx"> text run at (488,134) width 4: " "
</span><del>- RenderAttachment {ATTACHMENT} at (492,149) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (492,149) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastattachmentattachmentrenderingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-rendering-expected.txt (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-rendering-expected.txt 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-rendering-expected.txt 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -7,5 +7,5 @@
</span><span class="cx"> RenderText {#text} at (0,0) size 326x19
</span><span class="cx"> text run at (0,0) width 326: "This tests that attachments have a custom renderer."
</span><span class="cx"> RenderBlock (anonymous) at (0,36) size 784x119
</span><del>- RenderAttachment {ATTACHMENT} at (0,0) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (0,0) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastattachmentattachmentselectonclickexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-expected.txt (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-expected.txt 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-expected.txt 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -6,6 +6,6 @@
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 784x134
</span><span class="cx"> RenderText {#text} at (0,0) size 73x19
</span><span class="cx"> text run at (0,0) width 73: "text before "
</span><del>- RenderAttachment {ATTACHMENT} at (72,15) size 161x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (72,15) size 161x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (232,0) size 63x19
</span><span class="cx"> text run at (232,0) width 63: " text after"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastattachmentattachmentselectonclickinsideuserselectallexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -6,6 +6,6 @@
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 784x134
</span><span class="cx"> RenderText {#text} at (0,0) size 73x19
</span><span class="cx"> text run at (0,0) width 73: "text before "
</span><del>- RenderAttachment {ATTACHMENT} at (72,15) size 161x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (72,15) size 161x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (232,0) size 63x19
</span><span class="cx"> text run at (232,0) width 63: " text after"
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastattachmentattachmentsubtitleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-subtitle-expected.txt (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-subtitle-expected.txt 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-subtitle-expected.txt 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -3,6 +3,6 @@
</span><span class="cx"> layer at (0,0) size 800x150
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x150
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x134
</span><del>- RenderAttachment {ATTACHMENT} at (0,15) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (0,15) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorfastattachmentattachmenttitleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-title-expected.txt (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-title-expected.txt 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-title-expected.txt 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -3,6 +3,6 @@
</span><span class="cx"> layer at (0,0) size 800x150
</span><span class="cx"> RenderBlock {HTML} at (0,0) size 800x150
</span><span class="cx"> RenderBody {BODY} at (8,8) size 784x134
</span><del>- RenderAttachment {ATTACHMENT} at (0,15) size 160x119
</del><ins>+ RenderAttachment {ATTACHMENT} at (0,15) size 160x119 [color=#007AFF]
</ins><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span><span class="cx"> RenderText {#text} at (0,0) size 0x0
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/Source/WebCore/ChangeLog 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-03-15 Tim Horton <timothy_horton@apple.com>
+
+ iOS <attachment> element should allow customization of action text color
+ https://bugs.webkit.org/show_bug.cgi?id=155513
+ <rdar://problem/24805991>
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/attachment/attachment-action.html
+
+ * css/html.css:
+ (attachment):
+ On iOS (the only place it is used), <attachment> color should default to system blue.
+
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::attachmentActionColor):
+ (WebCore::AttachmentInfo::AttachmentInfo):
+ Make use of the <attachment>'s CSS color for the action text.
+ This is a little weird because there are multiple bits of text in an
+ <attachment>, but only the action text ever changes color.
+
</ins><span class="cx"> 2016-03-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Delay HTMLFormControlElement::focus() call until after layout is finished.
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/Source/WebCore/css/html.css 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -1236,6 +1236,9 @@
</span><span class="cx"> #if defined(ENABLE_ATTACHMENT_ELEMENT) && ENABLE_ATTACHMENT_ELEMENT
</span><span class="cx"> attachment {
</span><span class="cx"> -webkit-appearance: attachment;
</span><ins>+#if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
+ color: -apple-system-blue;
+#endif
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (198238 => 198239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-03-15 23:10:26 UTC (rev 198238)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-03-15 23:13:34 UTC (rev 198239)
</span><span class="lines">@@ -1357,8 +1357,12 @@
</span><span class="cx"> }));
</span><span class="cx"> return adoptCF(CTFontCreateWithFontDescriptor(emphasizedFontDescriptor.get(), 0, nullptr));
</span><span class="cx"> }
</span><del>-static UIColor *attachmentActionColor() { return [getUIColorClass() systemBlueColor]; }
</del><span class="cx">
</span><ins>+static UIColor *attachmentActionColor(const RenderAttachment& attachment)
+{
+ return [getUIColorClass() colorWithCGColor:cachedCGColor(attachment.style().visitedDependentColor(CSSPropertyColor))];
+}
+
</ins><span class="cx"> static RetainPtr<CTFontRef> attachmentTitleFont()
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(kCTUIFontTextStyleShortCaption1, RenderThemeIOS::contentSizeCategory(), 0));
</span><span class="lines">@@ -1560,7 +1564,7 @@
</span><span class="cx"> yOffset += iconRect.height() + attachmentItemMargin;
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- buildSingleLine(action, attachmentActionFont().get(), attachmentActionColor());
</del><ins>+ buildSingleLine(action, attachmentActionFont().get(), attachmentActionColor(attachment));
</ins><span class="cx">
</span><span class="cx"> buildTitleLines(attachment);
</span><span class="cx"> buildSingleLine(subtitle, attachmentSubtitleFont().get(), attachmentSubtitleColor());
</span></span></pre>
</div>
</div>
</body>
</html>