Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5039)

Unified Diff: chrome/views/table_view.cc

Issue 12842: Move convolver, image_operations, and skia_utils from base/gfx to skia/ext.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/views/tabbed_pane.cc ('k') | chrome/views/text_field.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/views/table_view.cc
===================================================================
--- chrome/views/table_view.cc (revision 6142)
+++ chrome/views/table_view.cc (working copy)
@@ -9,7 +9,6 @@
#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"
@@ -18,6 +17,7 @@
#include "chrome/views/hwnd_view.h"
#include "SkBitmap.h"
#include "SkColorFilter.h"
+#include "skia/ext/skia_utils_win.h"
namespace views {
@@ -1175,10 +1175,10 @@
custom_cell_font_ = CreateFontIndirect(&logfont);
SelectObject(draw_info->nmcd.hdc, custom_cell_font_);
draw_info->clrText = foreground.color_is_set
- ? gfx::SkColorToCOLORREF(foreground.color)
+ ? skia::SkColorToCOLORREF(foreground.color)
: CLR_DEFAULT;
draw_info->clrTextBk = background.color_is_set
- ? gfx::SkColorToCOLORREF(background.color)
+ ? skia::SkColorToCOLORREF(background.color)
: CLR_DEFAULT;
return CDRF_NEWFONT;
}
@@ -1228,7 +1228,7 @@
// background (or rather windows paints background, then invokes
// this twice). As such, we always fill in the background.
canvas.drawColor(
- gfx::COLORREFToSkColor(GetSysColor(bg_color_index)),
+ skia::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).
« no previous file with comments | « chrome/views/tabbed_pane.cc ('k') | chrome/views/text_field.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698