<!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>[180780] 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/180780">180780</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-02-27 13:56:43 -0800 (Fri, 27 Feb 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>&lt;attachment&gt;'s label baseline should match that of the surrounding text
https://bugs.webkit.org/show_bug.cgi?id=142099
rdar://problem/19982495

Reviewed by Dan Bernstein.

* rendering/RenderAttachment.cpp:
(WebCore::RenderAttachment::baselinePosition):
* rendering/RenderAttachment.h:
Override baselinePosition and retrieve it from RenderTheme.

* rendering/RenderTheme.h:
(WebCore::RenderTheme::attachmentBaseline):
* rendering/RenderThemeMac.h:
* rendering/RenderThemeMac.mm:
(WebCore::AttachmentLayout::AttachmentLayout):
(WebCore::RenderThemeMac::attachmentBaseline):
Plumb the label baseline from AttachmentLayout to RenderAttachment.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderAttachmentcpp">trunk/Source/WebCore/rendering/RenderAttachment.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderAttachmenth">trunk/Source/WebCore/rendering/RenderAttachment.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeh">trunk/Source/WebCore/rendering/RenderTheme.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMach">trunk/Source/WebCore/rendering/RenderThemeMac.h</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 (180779 => 180780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-02-27 21:42:31 UTC (rev 180779)
+++ trunk/Source/WebCore/ChangeLog        2015-02-27 21:56:43 UTC (rev 180780)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-02-27  Timothy Horton  &lt;timothy_horton@apple.com&gt;
+
+        &lt;attachment&gt;'s label baseline should match that of the surrounding text
+        https://bugs.webkit.org/show_bug.cgi?id=142099
+        rdar://problem/19982495
+
+        Reviewed by Dan Bernstein.
+
+        * rendering/RenderAttachment.cpp:
+        (WebCore::RenderAttachment::baselinePosition):
+        * rendering/RenderAttachment.h:
+        Override baselinePosition and retrieve it from RenderTheme.
+
+        * rendering/RenderTheme.h:
+        (WebCore::RenderTheme::attachmentBaseline):
+        * rendering/RenderThemeMac.h:
+        * rendering/RenderThemeMac.mm:
+        (WebCore::AttachmentLayout::AttachmentLayout):
+        (WebCore::RenderThemeMac::attachmentBaseline):
+        Plumb the label baseline from AttachmentLayout to RenderAttachment.
+
</ins><span class="cx"> 2015-02-27  Commit Queue  &lt;commit-queue@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r180752.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderAttachmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderAttachment.cpp (180779 => 180780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderAttachment.cpp        2015-02-27 21:42:31 UTC (rev 180779)
+++ trunk/Source/WebCore/rendering/RenderAttachment.cpp        2015-02-27 21:56:43 UTC (rev 180780)
</span><span class="lines">@@ -80,6 +80,11 @@
</span><span class="cx">     repaint();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+int RenderAttachment::baselinePosition(FontBaseline, bool, LineDirectionMode, LinePositionMode) const
+{
+    return document().page()-&gt;theme().attachmentBaseline(*this);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderAttachmenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderAttachment.h (180779 => 180780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderAttachment.h        2015-02-27 21:42:31 UTC (rev 180779)
+++ trunk/Source/WebCore/rendering/RenderAttachment.h        2015-02-27 21:56:43 UTC (rev 180780)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx"> 
</span><span class="cx">     bool isSelected() const;
</span><span class="cx">     bool isFocused() const;
</span><ins>+
+    virtual int baselinePosition(FontBaseline, bool, LineDirectionMode, LinePositionMode) const;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (180779 => 180780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h        2015-02-27 21:42:31 UTC (rev 180779)
+++ trunk/Source/WebCore/rendering/RenderTheme.h        2015-02-27 21:56:43 UTC (rev 180780)
</span><span class="lines">@@ -252,6 +252,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx">     virtual LayoutSize attachmentIntrinsicSize(const RenderAttachment&amp;) const { return LayoutSize(); }
</span><ins>+    virtual int attachmentBaseline(const RenderAttachment&amp;) const { return -1; }
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (180779 => 180780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h        2015-02-27 21:42:31 UTC (rev 180779)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h        2015-02-27 21:56:43 UTC (rev 180780)
</span><span class="lines">@@ -170,6 +170,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx">     virtual LayoutSize attachmentIntrinsicSize(const RenderAttachment&amp;) const override;
</span><ins>+    virtual int attachmentBaseline(const RenderAttachment&amp;) const override;
</ins><span class="cx">     virtual bool paintAttachment(const RenderObject&amp;, const PaintInfo&amp;, const IntRect&amp;) override;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (180779 => 180780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm        2015-02-27 21:42:31 UTC (rev 180779)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm        2015-02-27 21:56:43 UTC (rev 180780)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #import &quot;CSSValueKeywords.h&quot;
</span><span class="cx"> #import &quot;CSSValueList.h&quot;
</span><span class="cx"> #import &quot;ColorMac.h&quot;
</span><ins>+#import &quot;CoreGraphicsSPI.h&quot;
</ins><span class="cx"> #import &quot;Document.h&quot;
</span><span class="cx"> #import &quot;Element.h&quot;
</span><span class="cx"> #import &quot;ExceptionCodePlaceholder.h&quot;
</span><span class="lines">@@ -2096,6 +2097,8 @@
</span><span class="cx">     FloatRect iconBackgroundRect;
</span><span class="cx">     FloatRect attachmentRect;
</span><span class="cx"> 
</span><ins>+    int baseline;
+
</ins><span class="cx">     RetainPtr&lt;CTFontRef&gt; labelFont;
</span><span class="cx">     FontCascade labelFontCascade;
</span><span class="cx">     std::unique_ptr&lt;TextRun&gt; labelTextRun;
</span><span class="lines">@@ -2117,6 +2120,8 @@
</span><span class="cx">     float textHeight = labelFontCascade.fontMetrics().height();
</span><span class="cx">     float xOffset = (attachmentIconBackgroundSize / 2) - (textWidth / 2);
</span><span class="cx"> 
</span><ins>+    baseline = CGRound(attachmentIconBackgroundSize + attachmentIconToLabelMargin + labelFontCascade.fontMetrics().ascent());
+
</ins><span class="cx">     textRect = FloatRect(xOffset, attachmentIconBackgroundSize + attachmentIconToLabelMargin, textWidth, textHeight);
</span><span class="cx">     textBackgroundRect = textRect;
</span><span class="cx">     textBackgroundRect.inflateX(attachmentLabelBackgroundPadding);
</span><span class="lines">@@ -2140,6 +2145,12 @@
</span><span class="cx">     return LayoutSize(layout.attachmentRect.size());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+int RenderThemeMac::attachmentBaseline(const RenderAttachment&amp; attachment) const
+{
+    AttachmentLayout layout(attachment);
+    return layout.baseline;
+}
+
</ins><span class="cx"> static void paintAttachmentIconBackground(const RenderAttachment&amp;, GraphicsContext&amp; context, AttachmentLayout&amp; layout)
</span><span class="cx"> {
</span><span class="cx">     // FIXME: Finder has a discontinuous behavior here when you have a background color other than white,
</span></span></pre>
</div>
</div>

</body>
</html>