<!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>[178613] trunk</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/178613">178613</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-01-16 16:35:49 -0800 (Fri, 16 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>When border-radius is present, inset/outset/groove/ridge border color changes.
https://bugs.webkit.org/show_bug.cgi?id=140551
Reviewed by Simon Fraser.
This patch applies the same color lighten/darken adjustment on the radius borders
that we use for non-radius border.
Source/WebCore:
Test: fast/borders/wrong-border-color-when-radius-is-present.html
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::drawBoxSideFromPath):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::calculateBorderStyleColor):
* rendering/RenderObject.h:
LayoutTests:
* fast/borders/wrong-border-color-when-radius-is-present-expected.html: Added.
* fast/borders/wrong-border-color-when-radius-is-present.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastborderswrongbordercolorwhenradiusispresentexpectedhtml">trunk/LayoutTests/fast/borders/wrong-border-color-when-radius-is-present-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastborderswrongbordercolorwhenradiusispresenthtml">trunk/LayoutTests/fast/borders/wrong-border-color-when-radius-is-present.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178612 => 178613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-17 00:12:50 UTC (rev 178612)
+++ trunk/LayoutTests/ChangeLog 2015-01-17 00:35:49 UTC (rev 178613)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-01-16 Zalan Bujtas <zalan@apple.com>
+
+ When border-radius is present, inset/outset/groove/ridge border color changes.
+ https://bugs.webkit.org/show_bug.cgi?id=140551
+
+ Reviewed by Simon Fraser.
+
+ This patch applies the same color lighten/darken adjustment on the radius borders
+ that we use for non-radius border.
+
+ * fast/borders/wrong-border-color-when-radius-is-present-expected.html: Added.
+ * fast/borders/wrong-border-color-when-radius-is-present.html: Added.
+
</ins><span class="cx"> 2015-01-16 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the alternative syntax for CSS Selector's descendant combinator (">>")
</span></span></pre></div>
<a id="trunkLayoutTestsfastborderswrongbordercolorwhenradiusispresentexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/borders/wrong-border-color-when-radius-is-present-expected.html (0 => 178613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/borders/wrong-border-color-when-radius-is-present-expected.html (rev 0)
+++ trunk/LayoutTests/fast/borders/wrong-border-color-when-radius-is-present-expected.html 2015-01-17 00:35:49 UTC (rev 178613)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests if borders with border-radius use the same pair of dark, light colors as non-radius borders.</title>
+<style>
+ div {
+ border-color: green;
+ border-width: 2px;
+ width: 50px;
+ height: 50px;
+ margin: 10px;
+ position: relative;
+ }
+
+ .hide {
+ width: 15px;
+ height: 15px;
+ background-color: red;
+ position: absolute;
+ }
+
+</style>
+</head>
+<body>
+ <div style="border-style: inset"><p class=hide style="left: -5px; top: -21px;"></p><p class=hide style="left: 40px; top: -21px;"></p><p class=hide style="left: -5px; top: 24px;"></p><p class=hide style="left: 40px; top: 24px;"></p></div>
+ <div style="border-style: outset"><p class=hide style="left: -5px; top: -21px;"></p><p class=hide style="left: 40px; top: -21px;"></p><p class=hide style="left: -5px; top: 24px;"></p><p class=hide style="left: 40px; top: 24px;"></p></div>
+ <div style="border-style: groove"><p class=hide style="left: -5px; top: -21px;"></p><p class=hide style="left: 40px; top: -21px;"></p><p class=hide style="left: -5px; top: 24px;"></p><p class=hide style="left: 40px; top: 24px;"></p></div>
+ <div style="border-style: ridge"><p class=hide style="left: -5px; top: -21px;"></p><p class=hide style="left: 40px; top: -21px;"></p><p class=hide style="left: -5px; top: 24px;"></p><p class=hide style="left: 40px; top: 24px;"></p></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastborderswrongbordercolorwhenradiusispresenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/borders/wrong-border-color-when-radius-is-present.html (0 => 178613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/borders/wrong-border-color-when-radius-is-present.html (rev 0)
+++ trunk/LayoutTests/fast/borders/wrong-border-color-when-radius-is-present.html 2015-01-17 00:35:49 UTC (rev 178613)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests if borders with border-radius use the same pair of dark, light colors as non-radius borders.</title>
+<style>
+ div {
+ border-radius: 10px;
+ border-color: green;
+ border-width: 2px;
+ width: 50px;
+ height: 50px;
+ margin: 10px;
+ position: relative;
+ }
+
+ .hide {
+ width: 15px;
+ height: 15px;
+ background-color: red;
+ position: absolute;
+ }
+
+</style>
+</head>
+<body>
+ <div style="border-style: inset"><p class=hide style="left: -5px; top: -21px;"></p><p class=hide style="left: 40px; top: -21px;"></p><p class=hide style="left: -5px; top: 24px;"></p><p class=hide style="left: 40px; top: 24px;"></p></div>
+ <div style="border-style: outset"><p class=hide style="left: -5px; top: -21px;"></p><p class=hide style="left: 40px; top: -21px;"></p><p class=hide style="left: -5px; top: 24px;"></p><p class=hide style="left: 40px; top: 24px;"></p></div>
+ <div style="border-style: groove"><p class=hide style="left: -5px; top: -21px;"></p><p class=hide style="left: 40px; top: -21px;"></p><p class=hide style="left: -5px; top: 24px;"></p><p class=hide style="left: 40px; top: 24px;"></p></div>
+ <div style="border-style: ridge"><p class=hide style="left: -5px; top: -21px;"></p><p class=hide style="left: 40px; top: -21px;"></p><p class=hide style="left: -5px; top: 24px;"></p><p class=hide style="left: 40px; top: 24px;"></p></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178612 => 178613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-17 00:12:50 UTC (rev 178612)
+++ trunk/Source/WebCore/ChangeLog 2015-01-17 00:35:49 UTC (rev 178613)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-16 Zalan Bujtas <zalan@apple.com>
+
+ When border-radius is present, inset/outset/groove/ridge border color changes.
+ https://bugs.webkit.org/show_bug.cgi?id=140551
+
+ Reviewed by Simon Fraser.
+
+ This patch applies the same color lighten/darken adjustment on the radius borders
+ that we use for non-radius border.
+
+ Test: fast/borders/wrong-border-color-when-radius-is-present.html
+
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::drawBoxSideFromPath):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::calculateBorderStyleColor):
+ * rendering/RenderObject.h:
+
</ins><span class="cx"> 2015-01-16 Pratik Solanki <psolanki@apple.com>
</span><span class="cx">
</span><span class="cx"> Web pages fail to load using public iOS WebKit; ASSERT(!isMainThread()) in
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (178612 => 178613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-01-17 00:12:50 UTC (rev 178612)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-01-17 00:35:49 UTC (rev 178613)
</span><span class="lines">@@ -2051,12 +2051,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> case INSET:
</span><del>- if (side == BSTop || side == BSLeft)
- color = color.dark();
- break;
</del><span class="cx"> case OUTSET:
</span><del>- if (side == BSBottom || side == BSRight)
- color = color.dark();
</del><ins>+ calculateBorderStyleColor(borderStyle, side, color);
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (178612 => 178613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-01-17 00:12:50 UTC (rev 178612)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-01-17 00:35:49 UTC (rev 178613)
</span><span class="lines">@@ -2458,6 +2458,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderObject::calculateBorderStyleColor(const EBorderStyle& style, const BoxSide& side, Color& color)
</span><span class="cx"> {
</span><ins>+ ASSERT(style == INSET || style == OUTSET);
</ins><span class="cx"> // This values were derived empirically.
</span><span class="cx"> const RGBA32 baseDarkColor = 0xFF202020;
</span><span class="cx"> const RGBA32 baseLightColor = 0xFFEBEBEB;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (178612 => 178613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2015-01-17 00:12:50 UTC (rev 178612)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2015-01-17 00:35:49 UTC (rev 178613)
</span><span class="lines">@@ -869,11 +869,11 @@
</span><span class="cx">
</span><span class="cx"> virtual RenderFlowThread* locateFlowThreadContainingBlock() const;
</span><span class="cx"> void invalidateFlowThreadContainingBlockIncludingDescendants(RenderFlowThread* = nullptr);
</span><ins>+ static void calculateBorderStyleColor(const EBorderStyle&, const BoxSide&, Color&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void removeFromRenderFlowThread();
</span><span class="cx"> void removeFromRenderFlowThreadIncludingDescendants(bool);
</span><del>- static void calculateBorderStyleColor(const EBorderStyle&, const BoxSide&, Color&);
</del><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>