Changeset 20675 in webkit

Timestamp:

Apr 2, 2007 10:54:33 PM (17 years ago)

Author:

adele

Message:

Reviewed by Maciej.

Fix for <rdar://problem/5107095> REGRESSION: disabled text color calculations are slowing down launchtime measurements

Hardcode disabled text colors for the most common cases- black and white.

• rendering/RenderTextControl.cpp: (WebCore::disabledTextColor):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTextControl.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-04-02  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Maciej.
+
+        Fix for <rdar://problem/5107095> REGRESSION: disabled text color calculations are slowing down launchtime measurements
+
+        Hardcode disabled text colors for the most common cases- black and white.
+
+        * rendering/RenderTextControl.cpp: (WebCore::disabledTextColor):
+
 2007-04-02  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/rendering/RenderTextControl.cpp

@@ -104 +104 @@
 }
 
+// Hardcode these common cases for speed.
+const unsigned blackDisabledColor = 0xFF545454;
+const unsigned whiteDisabledColor = 0xFFABABAB;
 static Color disabledTextColor(const Color& textColor, const Color& backgroundColor)
 {
     if (differenceSquared(textColor, Color::white) > differenceSquared(backgroundColor, Color::white))
-        return textColor.light();
-    return textColor.dark();
+        return textColor == Color::black ? Color(blackDisabledColor) : textColor.light();
+    return textColor == Color::white ? Color(whiteDisabledColor) : textColor.dark();
 }