<!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>[180784] 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/180784">180784</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-02-27 15:00:03 -0800 (Fri, 27 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre><attachment> should have an inactive style (gray in background)
https://bugs.webkit.org/show_bug.cgi?id=142103
<rdar://problem/19982486>
Reviewed by Dan Bernstein.
* rendering/RenderThemeMac.mm:
(WebCore::attachmentLabelInactiveBackgroundColor):
(WebCore::attachmentLabelInactiveTextColor):
(WebCore::RenderThemeMac::paintAttachmentLabelBackground):
(WebCore::RenderThemeMac::paintAttachmentLabel):
Use a gray background and gray text when the selection containing the
attachment isn't focused and active.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180783 => 180784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-02-27 22:50:03 UTC (rev 180783)
+++ trunk/Source/WebCore/ChangeLog        2015-02-27 23:00:03 UTC (rev 180784)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-02-27 Timothy Horton <timothy_horton@apple.com>
+
+ <attachment> should have an inactive style (gray in background)
+ https://bugs.webkit.org/show_bug.cgi?id=142103
+ <rdar://problem/19982486>
+
+ Reviewed by Dan Bernstein.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::attachmentLabelInactiveBackgroundColor):
+ (WebCore::attachmentLabelInactiveTextColor):
+ (WebCore::RenderThemeMac::paintAttachmentLabelBackground):
+ (WebCore::RenderThemeMac::paintAttachmentLabel):
+ Use a gray background and gray text when the selection containing the
+ attachment isn't focused and active.
+
</ins><span class="cx"> 2015-02-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a "block-cookies" rule to the user content filter.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (180783 => 180784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm        2015-02-27 22:50:03 UTC (rev 180783)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm        2015-02-27 23:00:03 UTC (rev 180784)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "FloatRoundedRect.h"
</span><span class="cx"> #import "FocusController.h"
</span><span class="cx"> #import "Frame.h"
</span><ins>+#import "FrameSelection.h"
</ins><span class="cx"> #import "FrameView.h"
</span><span class="cx"> #import "GraphicsContextCG.h"
</span><span class="cx"> #import "HTMLAttachmentElement.h"
</span><span class="lines">@@ -2086,6 +2087,9 @@
</span><span class="cx"> const CGFloat attachmentLabelBackgroundRadius = 3;
</span><span class="cx"> const CGFloat attachmentLabelBackgroundPadding = 3;
</span><span class="cx">
</span><ins>+static Color attachmentLabelInactiveBackgroundColor() { return Color(204, 204, 204, 255); }
+static Color attachmentLabelInactiveTextColor() { return Color(100, 100, 100, 255); }
+
</ins><span class="cx"> const CGFloat attachmentMargin = 3;
</span><span class="cx">
</span><span class="cx"> struct AttachmentLayout {
</span><span class="lines">@@ -2198,20 +2202,36 @@
</span><span class="cx"> context.drawNativeImage(icon.get(), iconSizeInPoints, ColorSpaceDeviceRGB, layout.iconRect, FloatRect(FloatPoint(), iconSizeInPoints));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeMac::paintAttachmentLabelBackground(const RenderAttachment&, GraphicsContext& context, AttachmentLayout& layout) const
</del><ins>+void RenderThemeMac::paintAttachmentLabelBackground(const RenderAttachment& attachment, GraphicsContext& context, AttachmentLayout& layout) const
</ins><span class="cx"> {
</span><span class="cx"> Path backgroundPath;
</span><span class="cx"> backgroundPath.addRoundedRect(layout.textBackgroundRect, FloatSize(attachmentLabelBackgroundRadius, attachmentLabelBackgroundRadius));
</span><del>- context.setFillColor(convertNSColorToColor([NSColor alternateSelectedControlColor]), ColorSpaceDeviceRGB);
</del><ins>+
+ Color backgroundColor;
+ if (attachment.frame().selection().isFocusedAndActive())
+ backgroundColor = convertNSColorToColor([NSColor alternateSelectedControlColor]);
+ else
+ backgroundColor = attachmentLabelInactiveBackgroundColor();
+
+ context.setFillColor(backgroundColor, ColorSpaceDeviceRGB);
</ins><span class="cx"> context.fillPath(backgroundPath);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeMac::paintAttachmentLabel(const RenderAttachment&, GraphicsContext& context, AttachmentLayout& layout, bool useSelectedStyle) const
</del><ins>+void RenderThemeMac::paintAttachmentLabel(const RenderAttachment& attachment, GraphicsContext& context, AttachmentLayout& layout, bool useSelectedStyle) const
</ins><span class="cx"> {
</span><span class="cx"> FloatPoint textLocation = layout.textRect.minXMaxYCorner();
</span><span class="cx"> textLocation.move(0, -layout.labelFontCascade.fontMetrics().descent());
</span><span class="cx">
</span><del>- context.setFillColor(useSelectedStyle ? convertNSColorToColor([NSColor alternateSelectedControlTextColor]) : Color::black, ColorSpaceDeviceRGB);
</del><ins>+ Color textColor;
+ if (useSelectedStyle) {
+ if (attachment.frame().selection().isFocusedAndActive())
+ textColor = convertNSColorToColor([NSColor alternateSelectedControlTextColor]);
+ else
+ textColor = attachmentLabelInactiveTextColor();
+ } else
+ textColor = Color::black;
+
+ context.setFillColor(textColor, ColorSpaceDeviceRGB);
</ins><span class="cx"> context.drawBidiText(layout.labelFontCascade, *layout.labelTextRun, textLocation);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>