<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[20685] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20685">20685</a></dd>
<dt>Author</dt> <dd>adele</dd>
<dt>Date</dt> <dd>2007-04-03 12:22:22 -0700 (Tue, 03 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by Darin.
Updated fix for <rdar://problem/5107095> REGRESSION: disabled text color calculations are slowing down launchtime measurements
* platform/graphics/Color.cpp: Moved optimization for lightening black and darkening white into the Color class.
(WebCore::Color::light):
(WebCore::Color::dark):
* rendering/RenderTextControl.cpp: (WebCore::disabledTextColor): Skip the difference calculation for black text, which will always be lightened.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformgraphicsColorcpp">trunk/WebCore/platform/graphics/Color.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderTextControlcpp">trunk/WebCore/rendering/RenderTextControl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (20684 => 20685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-04-03 18:35:35 UTC (rev 20684)
+++ trunk/WebCore/ChangeLog 2007-04-03 19:22:22 UTC (rev 20685)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2007-04-03 Adele Peterson <adele@apple.com>
+
+ Reviewed by Darin.
+
+ Updated fix for <rdar://problem/5107095> REGRESSION: disabled text color calculations are slowing down launchtime measurements
+
+ * platform/graphics/Color.cpp: Moved optimization for lightening black and darkening white into the Color class.
+ (WebCore::Color::light):
+ (WebCore::Color::dark):
+ * rendering/RenderTextControl.cpp: (WebCore::disabledTextColor): Skip the difference calculation for black text, which will always be lightened.
+
</ins><span class="cx"> 2007-04-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Tim.
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicsColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/Color.cpp (20684 => 20685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/Color.cpp 2007-04-03 18:35:35 UTC (rev 20684)
+++ trunk/WebCore/platform/graphics/Color.cpp 2007-04-03 19:22:22 UTC (rev 20685)
</span><span class="lines">@@ -38,6 +38,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+const RGBA32 lightenedBlack = 0xFF545454;
+const RGBA32 darkenedWhite = 0xFFABABAB;
+
</ins><span class="cx"> RGBA32 makeRGB(int r, int g, int b)
</span><span class="cx"> {
</span><span class="cx"> return 0xFF000000 | max(0, min(r, 255)) << 16 | max(0, min(g, 255)) << 8 | max(0, min(b, 255));
</span><span class="lines">@@ -227,6 +230,10 @@
</span><span class="cx">
</span><span class="cx"> Color Color::light() const
</span><span class="cx"> {
</span><ins>+ // Hardcode this common case for speed.
+ if (m_color == black)
+ return lightenedBlack;
+
</ins><span class="cx"> const float scaleFactor = nextafterf(256.0f, 0.0f);
</span><span class="cx">
</span><span class="cx"> float r, g, b, a, h, s, v;
</span><span class="lines">@@ -242,6 +249,10 @@
</span><span class="cx">
</span><span class="cx"> Color Color::dark() const
</span><span class="cx"> {
</span><ins>+ // Hardcode this common case for speed.
+ if (m_color == white)
+ return darkenedWhite;
+
</ins><span class="cx"> const float scaleFactor = nextafterf(256.0f, 0.0f);
</span><span class="cx">
</span><span class="cx"> float r, g, b, a, h, s, v;
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderTextControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderTextControl.cpp (20684 => 20685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderTextControl.cpp 2007-04-03 18:35:35 UTC (rev 20684)
+++ trunk/WebCore/rendering/RenderTextControl.cpp 2007-04-03 19:22:22 UTC (rev 20685)
</span><span class="lines">@@ -103,14 +103,13 @@
</span><span class="cx"> setReplaced(isInline());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Hardcode these common cases for speed.
-const unsigned blackDisabledColor = 0xFF545454;
-const unsigned whiteDisabledColor = 0xFFABABAB;
</del><span class="cx"> static Color disabledTextColor(const Color& textColor, const Color& backgroundColor)
</span><span class="cx"> {
</span><del>- if (differenceSquared(textColor, Color::white) > differenceSquared(backgroundColor, Color::white))
- return textColor == Color::black ? Color(blackDisabledColor) : textColor.light();
- return textColor == Color::white ? Color(whiteDisabledColor) : textColor.dark();
</del><ins>+ // The explcit check for black is an optimization for the 99% case (black on white).
+ // This also means that black on black will turn into grey on black when disabled.
+ if (textColor.rgb() == Color::black || differenceSquared(textColor, Color::white) > differenceSquared(backgroundColor, Color::white))
+ return textColor.light();
+ return textColor.dark();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderStyle* RenderTextControl::createInnerBlockStyle(RenderStyle* startStyle)
</span></span></pre>
</div>
</div>
</body>
</html>