diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-03 01:11:58 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-03 01:11:58 +0000 |
| commit | ae615162135445eb0b94365b1a1cfa511e7f4be4 (patch) | |
| tree | a32c9ad049aa25b3c40038713d546c3521d3d20e /chrome/views/table_view.cc | |
| parent | 693f8e4af78b0bb38cb56cd913c8774c75b43067 (diff) | |
| download | chromium_src-ae615162135445eb0b94365b1a1cfa511e7f4be4.zip chromium_src-ae615162135445eb0b94365b1a1cfa511e7f4be4.tar.gz chromium_src-ae615162135445eb0b94365b1a1cfa511e7f4be4.tar.bz2 | |
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
Diffstat (limited to 'chrome/views/table_view.cc')
| -rw-r--r-- | chrome/views/table_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/views/table_view.cc b/chrome/views/table_view.cc index 73f456f1..8298cf6 100644 --- a/chrome/views/table_view.cc +++ b/chrome/views/table_view.cc @@ -9,6 +9,7 @@ #include "base/string_util.h" #include "base/win_util.h" +#include "base/gfx/skia_utils.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/favicon_size.h" #include "chrome/common/gfx/icon_util.h" @@ -17,7 +18,6 @@ #include "chrome/views/hwnd_view.h" #include "SkBitmap.h" #include "SkColorFilter.h" -#include "skia/ext/skia_utils_win.h" namespace views { @@ -1203,10 +1203,10 @@ LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) { custom_cell_font_ = CreateFontIndirect(&logfont); SelectObject(draw_info->nmcd.hdc, custom_cell_font_); draw_info->clrText = foreground.color_is_set - ? skia::SkColorToCOLORREF(foreground.color) + ? gfx::SkColorToCOLORREF(foreground.color) : CLR_DEFAULT; draw_info->clrTextBk = background.color_is_set - ? skia::SkColorToCOLORREF(background.color) + ? gfx::SkColorToCOLORREF(background.color) : CLR_DEFAULT; return CDRF_NEWFONT; } @@ -1256,7 +1256,7 @@ LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) { // background (or rather windows paints background, then invokes // this twice). As such, we always fill in the background. canvas.drawColor( - skia::COLORREFToSkColor(GetSysColor(bg_color_index)), + gfx::COLORREFToSkColor(GetSysColor(bg_color_index)), SkPorterDuff::kSrc_Mode); // + 1 for padding (we declared the image as 18x18 in the list- // view when they are 16x16 so we get an extra pixel of padding). |