Make WebKitGraphics able to handle grayscale colors

 WebCore:

         Add a Color(CGColorRef) constructor

         Reviewed by Darin.

         * platform/graphics/Color.h:
         * platform/graphics/cg/ColorCG.cpp:
         (WebCore::Color::Color): Added.

 WebKit/win:

         Take advantage of the new Color constructor that takes a CGColorRef

         This lets us handle grayscale colors (which only have 2 components).

         Reviewed by Darin.

         * WebKitGraphics.cpp:
         (DrawTextAtPoint):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28067 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e4a8a6dc44ebd74d14d43d98e06a740bf8c6f0ea..3a0f95be3b33bb10e71211736b6c9331ca2283cc 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-26  Adam Roben  <aroben@apple.com>
+
+        Add a Color(CGColorRef) constructor
+
+        Reviewed by Darin.
+
+        * platform/graphics/Color.h:
+        * platform/graphics/cg/ColorCG.cpp:
+        (WebCore::Color::Color): Added.
+
 2007-11-26  Adele Peterson  <adele@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/platform/graphics/Color.h b/WebCore/platform/graphics/Color.h
index dcca6a54841389a9ab042b4b65c4cd5f43303ee8..5706c6f84cbe8dbf6317203f32f5d7e3c3f912e6 100644 (file)
--- a/WebCore/platform/graphics/Color.h
+++ b/WebCore/platform/graphics/Color.h
@@ -105,6 +105,10 @@ public:
     operator wxColour() const;
 #endif
 
+#if PLATFORM(CG)
+    Color(CGColorRef);
+#endif
+
     static bool parseHexColor(const String& name, RGBA32& rgb);
 
     static const RGBA32 black = 0xFF000000;

diff --git a/WebCore/platform/graphics/cg/ColorCG.cpp b/WebCore/platform/graphics/cg/ColorCG.cpp
index 9dfa93c5271e555c62c9d857a9c8fcba7d474b07..48ce9f25ee7792c76430d0900c3f9939cbbb28ba 100644 (file)
--- a/WebCore/platform/graphics/cg/ColorCG.cpp
+++ b/WebCore/platform/graphics/cg/ColorCG.cpp
@@ -33,6 +33,40 @@
 
 namespace WebCore {
 
+Color::Color(CGColorRef color)
+{
+    if (!color) {
+        m_color = 0;
+        m_valid = false;
+        return;
+    }
+
+    size_t numComponents = CGColorGetNumberOfComponents(color);
+    const CGFloat* components = CGColorGetComponents(color);
+
+    float r = 0;
+    float g = 0;
+    float b = 0;
+    float a = 0;
+
+    switch (numComponents) {
+    case 2:
+        r = g = b = components[0];
+        a = components[1];
+        break;
+    case 4:
+        r = components[0];
+        g = components[1];
+        b = components[2];
+        a = components[3];
+        break;
+    default:
+        ASSERT_NOT_REACHED();
+    }
+
+    m_color = makeRGBA(r * 255, g * 255, b * 255, a * 255);
+}
+
 #if !PLATFORM(MAC)
 
 CGColorRef cgColor(const Color& c)

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 952e7a998a870dd9ac6753a87516de7c699fc550..924cadca654c8dfb3401ac2b52523ad14941bfd9 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-26  Adam Roben  <aroben@apple.com>
+
+        Take advantage of the new Color constructor that takes a CGColorRef
+
+        This lets us handle grayscale colors (which only have 2 components).
+
+        Reviewed by Darin.
+
+        * WebKitGraphics.cpp:
+        (DrawTextAtPoint):
+
 2007-11-26  Steve Falkenburg  <sfalken@apple.com>
 
         Build fix.

diff --git a/WebKit/win/WebKitGraphics.cpp b/WebKit/win/WebKitGraphics.cpp
index 66ec08e706abd316626ae4942832f2b48f6d7c5f..5953644ecc6b6de4d1d89393e4eb4e0b6b127733 100644 (file)
--- a/WebKit/win/WebKitGraphics.cpp
+++ b/WebKit/win/WebKitGraphics.cpp
@@ -74,14 +74,10 @@ void DrawTextAtPoint(CGContextRef cgContext, LPCTSTR text, int length, POINT poi
 {
     GraphicsContext context(cgContext);
 
-    ASSERT(CGColorGetNumberOfComponents(color) == 4);   // this code assumes the CGColorRef has 4 components
-    const CGFloat* components = CGColorGetComponents(color);
-    Color textColor((int)(components[0] * 255), (int)(components[1] * 255), (int)(components[2] * 255), (int)(components[3] * 255));
-
     String drawString(text, length);
     if (drawAsPassword)
         drawString = drawString.impl()->secure(WebCore::bullet);
-    WebCoreDrawTextAtPoint(context, drawString, point, makeFont(description), textColor, underlinedIndex);
+    WebCoreDrawTextAtPoint(context, drawString, point, makeFont(description), color, underlinedIndex);
 }
 
 void WebDrawText(WebTextRenderInfo* info)