<!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>[169778] tags/Safari-538.39.40/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/169778">169778</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-06-10 15:50:56 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/169681">r169681</a>. <rdar://problem/16850492></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari5383940SourceWebCoreChangeLog">tags/Safari-538.39.40/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari5383940SourceWebCoreplatformgraphicsmacGraphicsContextMacmm">tags/Safari-538.39.40/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm</a></li>
<li><a href="#tagsSafari5383940SourceWebCoreplatformmacThemeMacmm">tags/Safari-538.39.40/Source/WebCore/platform/mac/ThemeMac.mm</a></li>
<li><a href="#tagsSafari5383940SourceWebCorerenderingRenderThemeMach">tags/Safari-538.39.40/Source/WebCore/rendering/RenderThemeMac.h</a></li>
<li><a href="#tagsSafari5383940SourceWebCorerenderingRenderThemeMacmm">tags/Safari-538.39.40/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari5383940SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.39.40/Source/WebCore/ChangeLog (169777 => 169778)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.39.40/Source/WebCore/ChangeLog 2014-06-10 22:47:02 UTC (rev 169777)
+++ tags/Safari-538.39.40/Source/WebCore/ChangeLog 2014-06-10 22:50:56 UTC (rev 169778)
</span><span class="lines">@@ -1,5 +1,46 @@
</span><span class="cx"> 2014-06-10 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r169681.
+
+ 2014-06-07 Dean Jackson <dino@apple.com>
+
+ Regression r168397 - Form layout is incorrect on OS X Yosemite
+ https://bugs.webkit.org/show_bug.cgi?id=133612
+ <rdar://problem/16850492>
+ <rdar://problem/17016914>
+
+ Reviewed by Anders Carlson.
+
+ Revision 168397 introduced a new animated style of form controls. Part of
+ it included extending the margins for the controls to take into account the
+ focus ring that animates in from a large radius to a small radius. This
+ caused two problems:
+
+ - the incorrect margins broke many layouts
+ - despite increased margins, there were still some areas
+ that did not repaint correctly.
+
+ Restore the old margins and (temporarily) turn off focus ring animation.
+ Bad layout is much worse than a missing animation. Another benefit
+ of this is that we will use less memory.
+
+ * platform/graphics/mac/GraphicsContextMac.mm:
+ (WebCore::drawFocusRingToContextAtTime): Pass in a time far far far in the future to
+ get the static rendering.
+ * platform/mac/ThemeMac.mm:
+ (WebCore::checkboxMargins): Restore correct margins.
+ (WebCore::radioMargins): Ditto.
+ (WebCore::drawCellFocusRing): New method that calls WKSI with a future time.
+ (WebCore::paintToggleButton): Call the new wrapper.
+ (WebCore::buttonMargins): Restore correct margins.
+ (WebCore::paintButton): Call the new wrapper.
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintMenuList): Use a future time.
+ (WebCore::RenderThemeMac::platformFocusRingMaxWidth): Deleted. Use old outline value.
+
+2014-06-10 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r169685.
</span><span class="cx">
</span><span class="cx"> 2014-06-08 Dean Jackson <dino@apple.com>
</span></span></pre></div>
<a id="tagsSafari5383940SourceWebCoreplatformgraphicsmacGraphicsContextMacmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.39.40/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm (169777 => 169778)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.39.40/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2014-06-10 22:47:02 UTC (rev 169777)
+++ tags/Safari-538.39.40/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2014-06-10 22:50:56 UTC (rev 169778)
</span><span class="lines">@@ -65,9 +65,10 @@
</span><span class="cx">
</span><span class="cx"> static bool drawFocusRingToContextAtTime(CGContextRef context, CGPathRef focusRingPath, double timeOffset)
</span><span class="cx"> {
</span><ins>+ UNUSED_PARAM(timeOffset);
</ins><span class="cx"> CGContextBeginPath(context);
</span><span class="cx"> CGContextAddPath(context, focusRingPath);
</span><del>- return wkDrawFocusRingAtTime(context, timeOffset);
</del><ins>+ return wkDrawFocusRingAtTime(context, std::numeric_limits<double>::max());
</ins><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari5383940SourceWebCoreplatformmacThemeMacmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.39.40/Source/WebCore/platform/mac/ThemeMac.mm (169777 => 169778)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.39.40/Source/WebCore/platform/mac/ThemeMac.mm 2014-06-10 22:47:02 UTC (rev 169777)
+++ tags/Safari-538.39.40/Source/WebCore/platform/mac/ThemeMac.mm 2014-06-10 22:50:56 UTC (rev 169778)
</span><span class="lines">@@ -282,16 +282,10 @@
</span><span class="cx"> {
</span><span class="cx"> static const int margins[3][4] =
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
- { 7, 8, 8, 6 },
- { 8, 7, 7, 7 },
- { 8, 7, 7, 7 },
-#else
</del><span class="cx"> // top left right bottom
</span><span class="cx"> { 3, 4, 4, 2 },
</span><span class="cx"> { 4, 3, 3, 3 },
</span><span class="cx"> { 4, 3, 3, 3 },
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx"> return margins[controlSize];
</span><span class="cx"> }
</span><span class="lines">@@ -328,16 +322,10 @@
</span><span class="cx"> {
</span><span class="cx"> static const int margins[3][4] =
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
- { 6, 6, 8, 6 },
- { 7, 6, 7, 6 },
- { 5, 4, 6, 4 },
-#else
</del><span class="cx"> // top left right bottom
</span><span class="cx"> { 2, 2, 4, 2 },
</span><span class="cx"> { 3, 2, 3, 2 },
</span><span class="cx"> { 1, 0, 2, 0 },
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx"> return margins[controlSize];
</span><span class="cx"> }
</span><span class="lines">@@ -407,7 +395,13 @@
</span><span class="cx"> configureToggleButton(checkboxCell, CheckboxPart, states, zoomedRect, zoomFactor, false);
</span><span class="cx"> return checkboxCell;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+static bool drawCellFocusRing(NSCell *cell, NSRect cellFrame, NSView *controlView)
+{
+ wkDrawCellFocusRingWithFrameAtTime(cell, cellFrame, controlView, std::numeric_limits<double>::max());
+ return false;
+}
+
</ins><span class="cx"> static void paintToggleButton(ControlPart buttonType, ControlStates* controlStates, GraphicsContext* context, const IntRect& zoomedRect, float zoomFactor, ScrollView* scrollView)
</span><span class="cx"> {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="lines">@@ -439,7 +433,7 @@
</span><span class="cx"> zoomedSize.setHeight(zoomedSize.height() * zoomFactor);
</span><span class="cx"> const int* controlMargins = buttonType == CheckboxPart ? checkboxMargins(controlSize) : radioMargins(controlSize);
</span><span class="cx"> IntRect inflatedRect = inflateRect(zoomedRect, zoomedSize, controlMargins, zoomFactor);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (zoomFactor != 1.0f) {
</span><span class="cx"> inflatedRect.setWidth(inflatedRect.width() / zoomFactor);
</span><span class="cx"> inflatedRect.setHeight(inflatedRect.height() / zoomFactor);
</span><span class="lines">@@ -470,9 +464,9 @@
</span><span class="cx">
</span><span class="cx"> bool needsRepaint = false;
</span><span class="cx"> if (controlStates->states() & ControlStates::FocusState)
</span><del>- needsRepaint = wkDrawCellFocusRingWithFrameAtTime(toggleButtonCell, inflatedRect, view, controlStates->timeSinceControlWasFocused());
</del><ins>+ needsRepaint = drawCellFocusRing(toggleButtonCell, inflatedRect, view);
</ins><span class="cx"> [toggleButtonCell setControlView:nil];
</span><del>-
</del><ins>+
</ins><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</span><span class="cx"> needsRepaint |= [toggleButtonCell _stateAnimationRunning];
</span><span class="cx"> #endif
</span><span class="lines">@@ -482,7 +476,7 @@
</span><span class="cx">
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Buttons
</span><span class="cx">
</span><span class="cx"> // Buttons really only constrain height. They respect width.
</span><span class="lines">@@ -496,15 +490,9 @@
</span><span class="cx"> {
</span><span class="cx"> static const int margins[3][4] =
</span><span class="cx"> {
</span><del>-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
- { 8, 10, 11, 10 },
- { 8, 9, 10, 9 },
- { 4, 5, 5, 5 },
-#else
</del><span class="cx"> { 4, 6, 7, 6 },
</span><span class="cx"> { 4, 5, 6, 5 },
</span><span class="cx"> { 0, 1, 1, 1 },
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx"> return margins[controlSize];
</span><span class="cx"> }
</span><span class="lines">@@ -600,7 +588,7 @@
</span><span class="cx"> [buttonCell drawWithFrame:NSRect(inflatedRect) inView:view];
</span><span class="cx"> bool needsRepaint = false;
</span><span class="cx"> if (states & ControlStates::FocusState)
</span><del>- needsRepaint = wkDrawCellFocusRingWithFrameAtTime(buttonCell, inflatedRect, view, controlStates->timeSinceControlWasFocused());
</del><ins>+ needsRepaint = drawCellFocusRing(buttonCell, inflatedRect, view);
</ins><span class="cx">
</span><span class="cx"> controlStates->setNeedsRepaint(needsRepaint);
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari5383940SourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.39.40/Source/WebCore/rendering/RenderThemeMac.h (169777 => 169778)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.39.40/Source/WebCore/rendering/RenderThemeMac.h 2014-06-10 22:47:02 UTC (rev 169777)
+++ tags/Safari-538.39.40/Source/WebCore/rendering/RenderThemeMac.h 2014-06-10 22:50:56 UTC (rev 169778)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> virtual Color platformInactiveListBoxSelectionBackgroundColor() const;
</span><span class="cx"> virtual Color platformInactiveListBoxSelectionForegroundColor() const;
</span><span class="cx"> virtual Color platformFocusRingColor() const;
</span><del>- virtual int platformFocusRingMaxWidth() const;
</del><span class="cx">
</span><span class="cx"> virtual ScrollbarControlSize scrollbarControlSizeForPart(ControlPart) { return SmallScrollbar; }
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari5383940SourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.39.40/Source/WebCore/rendering/RenderThemeMac.mm (169777 => 169778)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.39.40/Source/WebCore/rendering/RenderThemeMac.mm 2014-06-10 22:47:02 UTC (rev 169777)
+++ tags/Safari-538.39.40/Source/WebCore/rendering/RenderThemeMac.mm 2014-06-10 22:50:56 UTC (rev 169778)
</span><span class="lines">@@ -302,15 +302,6 @@
</span><span class="cx"> return systemColor(CSSValueWebkitFocusRingColor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeMac::platformFocusRingMaxWidth() const
-{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
- return 9;
-#else
- return 0;
-#endif
-}
-
</del><span class="cx"> Color RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor() const
</span><span class="cx"> {
</span><span class="cx"> return platformInactiveSelectionBackgroundColor();
</span><span class="lines">@@ -934,8 +925,7 @@
</span><span class="cx"> NSView *view = documentViewFor(o);
</span><span class="cx"> [popupButton drawWithFrame:inflatedRect inView:view];
</span><span class="cx"> if (isFocused(o) && o.style().outlineStyleIsAuto()) {
</span><del>- double timeSinceFocused = o.document().page()->focusController().timeSinceFocusWasSet();
- if (wkDrawCellFocusRingWithFrameAtTime(popupButton, inflatedRect, view, timeSinceFocused))
</del><ins>+ if (wkDrawCellFocusRingWithFrameAtTime(popupButton, inflatedRect, view, std::numeric_limits<double>::max()))
</ins><span class="cx"> o.document().page()->focusController().setFocusedElementNeedsRepaint();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>