Changeset 29728 in webkit

Timestamp:

Jan 22, 2008 8:01:09 PM (16 years ago)

Author:

mitz@apple.com

Message:

Reviewed by Adele Peterson.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=16905 <rdar://problem/5692407> REGRESSION (3.0.4-TOT): "menu" pseudocolor is badly chosen

The regression test for this is fast/css/css2-system-color.html which
is currently disabled.

• rendering/RenderThemeMac.mm: (WebCore::menuBackgroundColor): Added. Uses HIThemeDrawMenuBackground to draw the menu item background into a bitmap graphics context and returns the color of the pixel at (0, 0). (WebCore::RenderThemeMac::systemColor): Changed to call menuBackgroundColor for the CSS2 menu color.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderThemeMac.mm (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Adele Peterson.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=16905
+          <rdar://problem/5692407> REGRESSION (3.0.4-TOT): "menu" pseudocolor is badly chosen
+
+        The regression test for this is fast/css/css2-system-color.html which
+        is currently disabled.
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::menuBackgroundColor): Added. Uses HIThemeDrawMenuBackground
+        to draw the menu item background into a bitmap graphics context and
+        returns the color of the pixel at (0, 0).
+        (WebCore::RenderThemeMac::systemColor): Changed to call
+        menuBackgroundColor for the CSS2 menu color.
+
 2008-01-22  Darin Adler  <darin@apple.com>
 

trunk/WebCore/rendering/RenderThemeMac.mm

@@ -38 +38 @@
 #import "SharedBuffer.h"
 #import "WebCoreSystemInterface.h"
+#import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #import <wtf/RetainPtr.h>
@@ -241 +242 @@
 }
 
+static RGBA32 menuBackgroundColor()
+{
+    NSBitmapImageRep *offscreenRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:nil
+                                                                             pixelsWide:1
+                                                                             pixelsHigh:1
+                                                                          bitsPerSample:8
+                                                                        samplesPerPixel:4
+                                                                               hasAlpha:YES
+                                                                               isPlanar:NO
+                                                                         colorSpaceName:NSCalibratedRGBColorSpace
+                                                                            bytesPerRow:4
+                                                                           bitsPerPixel:32];
+
+    CGContextRef context = static_cast<CGContextRef>([[NSGraphicsContext graphicsContextWithBitmapImageRep:offscreenRep] graphicsPort]);
+    CGRect rect = CGRectMake(0, 0, 1, 1);
+    HIThemeMenuDrawInfo drawInfo;
+    drawInfo.version =  0;
+    drawInfo.menuType = kThemeMenuTypePopUp;
+    HIThemeDrawMenuBackground(&rect, &drawInfo, context, kHIThemeOrientationInverted);
+
+    NSUInteger pixel[4];
+    [offscreenRep getPixel:pixel atX:0 y:0];
+
+    [offscreenRep release];
+
+    return makeRGB(pixel[0], pixel[1], pixel[2]);
+}
+
 void RenderThemeMac::platformColorsDidChange()
 {
@@ -309 +338 @@
             break;
         case CSS_VAL_MENU:
-            color = convertNSColorToColor([NSColor selectedMenuItemColor]);
+            color = menuBackgroundColor();
             break;
         case CSS_VAL_MENUTEXT: