From 0d74f1e8fe44154ab7842812443b3138b2993c8c Mon Sep 17 00:00:00 2001 From: "brettw@google.com" Date: Fri, 12 Dec 2008 23:07:42 +0000 Subject: Move skia_utils into the skia namespace. Review URL: http://codereview.chromium.org/14079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6948 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/views/background.cc | 2 +- chrome/views/single_split_view.cc | 2 +- chrome/views/table_view.cc | 6 +++--- chrome/views/text_field.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'chrome/views') diff --git a/chrome/views/background.cc b/chrome/views/background.cc index 3642924..1aa631e 100644 --- a/chrome/views/background.cc +++ b/chrome/views/background.cc @@ -68,7 +68,7 @@ Background::~Background() { void Background::SetNativeControlColor(SkColor color) { DeleteObject(native_control_brush_); - native_control_brush_ = CreateSolidBrush(gfx::SkColorToCOLORREF(color)); + native_control_brush_ = CreateSolidBrush(skia::SkColorToCOLORREF(color)); } //static diff --git a/chrome/views/single_split_view.cc b/chrome/views/single_split_view.cc index 36e8519..a7832b6 100644 --- a/chrome/views/single_split_view.cc +++ b/chrome/views/single_split_view.cc @@ -19,7 +19,7 @@ SingleSplitView::SingleSplitView(View* leading, View* trailing) AddChildView(trailing); set_background( views::Background::CreateSolidBackground( - gfx::COLORREFToSkColor(GetSysColor(COLOR_3DFACE)))); + skia::COLORREFToSkColor(GetSysColor(COLOR_3DFACE)))); } void SingleSplitView::Layout() { diff --git a/chrome/views/table_view.cc b/chrome/views/table_view.cc index c061951..781f262 100644 --- a/chrome/views/table_view.cc +++ b/chrome/views/table_view.cc @@ -1206,10 +1206,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 - ? 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; } @@ -1259,7 +1259,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( - 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). diff --git a/chrome/views/text_field.cc b/chrome/views/text_field.cc index 14a9305..62ebdc8 100644 --- a/chrome/views/text_field.cc +++ b/chrome/views/text_field.cc @@ -1087,7 +1087,7 @@ void TextField::UpdateEditBackgroundColor() { COLORREF bg_color; if (!use_default_background_color_) - bg_color = gfx::SkColorToCOLORREF(background_color_); + bg_color = skia::SkColorToCOLORREF(background_color_); else bg_color = GetSysColor(read_only_ ? COLOR_3DFACE : COLOR_WINDOW); edit_->SetBackgroundColor(bg_color); -- cgit v1.1