From ae615162135445eb0b94365b1a1cfa511e7f4be4 Mon Sep 17 00:00:00 2001 From: "brettw@google.com" Date: Wed, 3 Dec 2008 01:11:58 +0000 Subject: Revert my skia file moves because of layout test failures. Review URL: http://codereview.chromium.org/12892 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6266 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/port/rendering/RenderThemeWin.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'webkit/port/rendering/RenderThemeWin.cpp') diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp index 48a8947..907a6e4 100644 --- a/webkit/port/rendering/RenderThemeWin.cpp +++ b/webkit/port/rendering/RenderThemeWin.cpp @@ -37,8 +37,9 @@ #include "SkiaUtils.h" #include "ThemeHelperWin.h" -#include "base/gfx/native_theme.h" // TODO(brettw) fix this dependency. -#include "base/win_util.h" // TODO(brettw) fix this dependency. +#include "base/gfx/native_theme.h" +#include "base/gfx/skia_utils.h" +#include "base/win_util.h" namespace { @@ -571,7 +572,7 @@ bool RenderThemeWin::paintTextFieldInternal(RenderObject* o, gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas(); HDC hdc = canvas->beginPlatformPaint(); - COLORREF clr = o->style()->backgroundColor().rgb() & 0xFFFFFF; + COLORREF clr = gfx::SkColorToCOLORREF(o->style()->backgroundColor().rgb()); RECT renderRect = helper.rect(); gfx::NativeTheme::instance()->PaintTextField(hdc, -- cgit v1.1