<!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>[178321] releases/WebKitGTK/webkit-2.6</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/178321">178321</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-13 00:14:20 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176816">r176816</a> - Groove/inset/outset borders show solid if the color is black
https://bugs.webkit.org/show_bug.cgi?id=58608
Reviewed by Simon Fraser.
Source/WebCore:
Test: fast/borders/mixed-border-style2.html
This patch will lighten/darken the border side colors, handling
border decoration in a similar way as Firefox does.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::drawLineForBoxSide):
(WebCore::RenderObject::calculateBorderStyleColor):
* rendering/RenderObject.h:
LayoutTests:
* fast/borders/mixed-border-style2.html: Added.
* platform/mac-mavericks/fast/borders/mixed-border-style2-expected.png: Added.
* platform/mac-mavericks/fast/borders/mixed-border-style2-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderObjectcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderObjecth">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderObject.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastbordersmixedborderstyle2html">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/borders/mixed-border-style2.html</a></li>
<li>releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac-mavericks/</li>
<li>releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac-mavericks/fast/</li>
<li>releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac-mavericks/fast/borders/</li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsplatformmacmavericksfastbordersmixedborderstyle2expectedpng">releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac-mavericks/fast/borders/mixed-border-style2-expected.png</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsplatformmacmavericksfastbordersmixedborderstyle2expectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac-mavericks/fast/borders/mixed-border-style2-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (178320 => 178321)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2015-01-13 08:05:38 UTC (rev 178320)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2015-01-13 08:14:20 UTC (rev 178321)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-12-04 Adenilson Cavalcanti <cavalcantii@gmail.com>
+
+ Groove/inset/outset borders show solid if the color is black
+ https://bugs.webkit.org/show_bug.cgi?id=58608
+
+ Reviewed by Simon Fraser.
+
+ * fast/borders/mixed-border-style2.html: Added.
+ * platform/mac-mavericks/fast/borders/mixed-border-style2-expected.png: Added.
+ * platform/mac-mavericks/fast/borders/mixed-border-style2-expected.txt: Added.
+
</ins><span class="cx"> 2014-12-03 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> List markers in RTL languages do not draw the first character.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastbordersmixedborderstyle2html"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/borders/mixed-border-style2.html (0 => 178321)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/borders/mixed-border-style2.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/borders/mixed-border-style2.html 2015-01-13 08:14:20 UTC (rev 178321)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ .box {
+ width: 153px;
+ height: 153px;
+ margin: 10px;
+ border-width: 20px;
+ border-color: black;
+ border-style: groove;
+ }
+ </style>
+ </head>
+<body>
+ <!-- Test mixed border styles. Expect a square with borders with
+ 2 colors (dark/lighter), it fails if it has a solid dark border.
+ -->
+ <div class="box"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsplatformmacmavericksfastbordersmixedborderstyle2expectedpng"></a>
<div class="binary"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac-mavericks/fast/borders/mixed-border-style2-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac-mavericks/fast/borders/mixed-border-style2-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsplatformmacmavericksfastbordersmixedborderstyle2expectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac-mavericks/fast/borders/mixed-border-style2-expected.txt (0 => 178321)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac-mavericks/fast/borders/mixed-border-style2-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac-mavericks/fast/borders/mixed-border-style2-expected.txt 2015-01-13 08:14:20 UTC (rev 178321)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x213
+ RenderBlock {HTML} at (0,0) size 800x213
+ RenderBody {BODY} at (8,10) size 784x193
+ RenderBlock {DIV} at (10,0) size 193x193 [border: (20px groove #000000)]
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (178320 => 178321)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 08:05:38 UTC (rev 178320)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-01-13 08:14:20 UTC (rev 178321)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-04 Adenilson Cavalcanti <cavalcantii@gmail.com>
+
+ Groove/inset/outset borders show solid if the color is black
+ https://bugs.webkit.org/show_bug.cgi?id=58608
+
+ Reviewed by Simon Fraser.
+
+ Test: fast/borders/mixed-border-style2.html
+
+ This patch will lighten/darken the border side colors, handling
+ border decoration in a similar way as Firefox does.
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::drawLineForBoxSide):
+ (WebCore::RenderObject::calculateBorderStyleColor):
+ * rendering/RenderObject.h:
+
</ins><span class="cx"> 2014-12-04 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Serialization of MapData object provides unsafe access to internal types
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderObject.cpp (178320 => 178321)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderObject.cpp 2015-01-13 08:05:38 UTC (rev 178320)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderObject.cpp 2015-01-13 08:14:20 UTC (rev 178321)
</span><span class="lines">@@ -907,14 +907,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case INSET:
</span><del>- // FIXME: Maybe we should lighten the colors on one side like Firefox.
- // https://bugs.webkit.org/show_bug.cgi?id=58608
- if (side == BSTop || side == BSLeft)
- color = color.dark();
- FALLTHROUGH;
</del><span class="cx"> case OUTSET:
</span><del>- if (borderStyle == OUTSET && (side == BSBottom || side == BSRight))
- color = color.dark();
</del><ins>+ calculateBorderStyleColor(borderStyle, side, color);
</ins><span class="cx"> FALLTHROUGH;
</span><span class="cx"> case SOLID: {
</span><span class="cx"> StrokeStyle oldStrokeStyle = graphicsContext->strokeStyle();
</span><span class="lines">@@ -2605,6 +2599,25 @@
</span><span class="cx"> return containingBlock ? containingBlock->flowThreadContainingBlock() : nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderObject::calculateBorderStyleColor(const EBorderStyle& style, const BoxSide& side, Color& color)
+{
+ // This values were derived empirically.
+ const RGBA32 baseDarkColor = 0xFF202020;
+ const RGBA32 baseLightColor = 0xFFEBEBEB;
+ enum Operation { Darken, Lighten };
+
+ Operation operation = (side == BSTop || side == BSLeft) == (style == INSET) ? Darken : Lighten;
+
+ // Here we will darken the border decoration color when needed. This will yield a similar behavior as in FF.
+ if (operation == Darken) {
+ if (differenceSquared(color, Color::black) > differenceSquared(baseDarkColor, Color::black))
+ color = color.dark();
+ } else {
+ if (differenceSquared(color, Color::white) > differenceSquared(baseLightColor, Color::white))
+ color = color.light();
+ }
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderObject.h (178320 => 178321)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderObject.h 2015-01-13 08:05:38 UTC (rev 178320)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderObject.h 2015-01-13 08:14:20 UTC (rev 178321)
</span><span class="lines">@@ -897,6 +897,7 @@
</span><span class="cx"> Color selectionColor(int colorProperty) const;
</span><span class="cx"> PassRefPtr<RenderStyle> selectionPseudoStyle() const;
</span><span class="cx">
</span><ins>+ static void calculateBorderStyleColor(const EBorderStyle&, const BoxSide&, Color&);
</ins><span class="cx"> Node* generatingPseudoHostElement() const;
</span><span class="cx">
</span><span class="cx"> virtual bool isWBR() const { ASSERT_NOT_REACHED(); return false; }
</span></span></pre>
</div>
</div>
</body>
</html>