<!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>[168769] branches/safari-538.34-branch/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/168769">168769</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-05-13 20:11:00 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/168728">r168728</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53834branchSourceWebCoreChangeLog">branches/safari-538.34-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53834branchSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp">branches/safari-538.34-branch/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp</a></li>
<li><a href="#branchessafari53834branchSourceWebCorehtmlshadowmacimageControlsMaccss">branches/safari-538.34-branch/Source/WebCore/html/shadow/mac/imageControlsMac.css</a></li>
<li><a href="#branchessafari53834branchSourceWebCorerenderingRenderThemeh">branches/safari-538.34-branch/Source/WebCore/rendering/RenderTheme.h</a></li>
<li><a href="#branchessafari53834branchSourceWebCorerenderingRenderThemeMach">branches/safari-538.34-branch/Source/WebCore/rendering/RenderThemeMac.h</a></li>
<li><a href="#branchessafari53834branchSourceWebCorerenderingRenderThemeMacmm">branches/safari-538.34-branch/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53834branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (168768 => 168769)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 01:09:38 UTC (rev 168768)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-14 03:11:00 UTC (rev 168769)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-05-13 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r168728
+
+ 2014-05-13 Brady Eidson <beidson@apple.com>
+
+ Update positioning/drawing of the image controls button.
+ <rdar://problem/16885077> and https://bugs.webkit.org/show_bug.cgi?id=132883
+
+ Reviewed by Tim Horton.
+
+ * html/shadow/mac/ImageControlsButtonElementMac.cpp:
+ (WebCore::ImageControlsButtonElementMac::maybeCreate): Add inline style for top/right
+ positioning based on the metrics from the render theme.
+
+ * html/shadow/mac/imageControlsMac.css:
+ (.x-webkit-image-controls-button): Can’t hard code any positioning.
+
+ * rendering/RenderTheme.h:
+ (WebCore::RenderTheme::imageControlsButtonPositionOffset):
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::servicesRolloverButtonCell):
+ (WebCore::RenderThemeMac::imageControlsButtonPositionOffset):
+
</ins><span class="cx"> 2014-05-13 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168442
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp (168768 => 168769)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-05-14 01:09:38 UTC (rev 168768)
+++ branches/safari-538.34-branch/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2014-05-14 03:11:00 UTC (rev 168769)
</span><span class="lines">@@ -97,6 +97,12 @@
</span><span class="cx"> RefPtr<ImageControlsButtonElementMac> button = adoptRef(new ImageControlsButtonElementMac(document));
</span><span class="cx"> button->setAttribute(HTMLNames::classAttr, "x-webkit-image-controls-button");
</span><span class="cx">
</span><ins>+ IntSize positionOffset = document.page()->theme().imageControlsButtonPositionOffset();
+ button->setInlineStyleProperty(CSSPropertyTop, String::format("%ipx", positionOffset.height()));
+
+ // FIXME: Why is right: 0px off the right edge of the parent?
+ button->setInlineStyleProperty(CSSPropertyRight, String::format("%ipx", positionOffset.width()));
+
</ins><span class="cx"> return button.release();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCorehtmlshadowmacimageControlsMaccss"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/html/shadow/mac/imageControlsMac.css (168768 => 168769)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/html/shadow/mac/imageControlsMac.css 2014-05-14 01:09:38 UTC (rev 168768)
+++ branches/safari-538.34-branch/Source/WebCore/html/shadow/mac/imageControlsMac.css 2014-05-14 03:11:00 UTC (rev 168769)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx">
</span><span class="cx"> .x-webkit-image-controls-button {
</span><span class="cx"> position: absolute;
</span><del>- right: 18px; /* FIXME: Why is right: 0px off the right edge of the parent? */
</del><span class="cx">
</span><span class="cx"> -webkit-appearance: image-controls-button;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/rendering/RenderTheme.h (168768 => 168769)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/rendering/RenderTheme.h 2014-05-14 01:09:38 UTC (rev 168768)
+++ branches/safari-538.34-branch/Source/WebCore/rendering/RenderTheme.h 2014-05-14 03:11:00 UTC (rev 168769)
</span><span class="lines">@@ -250,6 +250,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> virtual IntSize imageControlsButtonSize(const RenderObject&) const { return IntSize(); }
</span><ins>+ virtual IntSize imageControlsButtonPositionOffset() const { return IntSize(); }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/rendering/RenderThemeMac.h (168768 => 168769)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/rendering/RenderThemeMac.h 2014-05-14 01:09:38 UTC (rev 168768)
+++ branches/safari-538.34-branch/Source/WebCore/rendering/RenderThemeMac.h 2014-05-14 03:11:00 UTC (rev 168769)
</span><span class="lines">@@ -231,6 +231,8 @@
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> virtual bool paintImageControlsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><span class="cx"> virtual IntSize imageControlsButtonSize(const RenderObject&) const override;
</span><ins>+ virtual IntSize imageControlsButtonPositionOffset() const override;
+
</ins><span class="cx"> NSServicesRolloverButtonCell *servicesRolloverButtonCell() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/rendering/RenderThemeMac.mm (168768 => 168769)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/rendering/RenderThemeMac.mm 2014-05-14 01:09:38 UTC (rev 168768)
+++ branches/safari-538.34-branch/Source/WebCore/rendering/RenderThemeMac.mm 2014-05-14 03:11:00 UTC (rev 168769)
</span><span class="lines">@@ -2030,7 +2030,10 @@
</span><span class="cx"> #if HAVE(APPKIT_SERVICE_CONTROLS_SUPPORT)
</span><span class="cx"> if (!m_servicesRolloverButton) {
</span><span class="cx"> m_servicesRolloverButton = [NSServicesRolloverButtonCell serviceRolloverButtonCellForStyle:NSSharingServicePickerStyleRollover];
</span><del>- [m_servicesRolloverButton setBordered:NO];
</del><ins>+ [m_servicesRolloverButton setBezelStyle:NSRoundedDisclosureBezelStyle];
+ [m_servicesRolloverButton setButtonType:NSPushOnPushOffButton];
+ [m_servicesRolloverButton setImagePosition:NSImageOnly];
+ [m_servicesRolloverButton setState:NO];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return m_servicesRolloverButton.get();
</span><span class="lines">@@ -2071,7 +2074,22 @@
</span><span class="cx"> return IntSize();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+IntSize RenderThemeMac::imageControlsButtonPositionOffset() const
+{
+#if HAVE(APPKIT_SERVICE_CONTROLS_SUPPORT)
+ // FIXME: Currently the offsets will always be the same no matter what image rect you try with.
+ // This may not always be true in the future.
+ static const int dummyDimension = 100;
+ IntRect dummyImageRect(0, 0, dummyDimension, dummyDimension);
+ NSRect bounds = [servicesRolloverButtonCell() rectForBounds:dummyImageRect preferredEdge:NSMinYEdge];
+
+ return IntSize(dummyDimension - bounds.origin.x, bounds.origin.y);
+#else
+ return IntSize();
</ins><span class="cx"> #endif
</span><ins>+}
+#endif
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>