summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/gfx/native_theme.cc10
-rw-r--r--chrome/browser/views/bookmark_bar_view.cc28
-rw-r--r--chrome/browser/views/bookmark_manager_view.cc2
-rw-r--r--chrome/browser/views/options/content_page_view.cc2
-rw-r--r--chrome/browser/views/sad_tab_view.cc6
-rw-r--r--chrome/common/gfx/color_utils.cc2
-rw-r--r--chrome/views/background.cc2
-rw-r--r--chrome/views/single_split_view.cc2
-rw-r--r--chrome/views/table_view.cc6
-rw-r--r--chrome/views/text_field.cc2
-rw-r--r--skia/ext/platform_device_win.cc3
-rw-r--r--skia/ext/skia_utils.cc4
-rw-r--r--skia/ext/skia_utils.h4
-rw-r--r--skia/ext/skia_utils_win.cc4
-rw-r--r--skia/ext/skia_utils_win.h4
-rw-r--r--skia/ext/vector_device.cc3
-rw-r--r--webkit/port/platform/graphics/chromium/FontChromiumWin.cpp4
-rw-r--r--webkit/port/rendering/RenderThemeWin.cpp2
18 files changed, 48 insertions, 42 deletions
diff --git a/base/gfx/native_theme.cc b/base/gfx/native_theme.cc
index 24a5e37..8c7914d 100644
--- a/base/gfx/native_theme.cc
+++ b/base/gfx/native_theme.cc
@@ -213,8 +213,8 @@ HRESULT NativeTheme::PaintScrollbarTrack(HDC hdc,
} else {
// Create a 2x2 checkerboard pattern using the 3D face and highlight
// colors.
- SkColor face = COLORREFToSkColor(color3DFace);
- SkColor highlight = COLORREFToSkColor(GetSysColor(COLOR_3DHILIGHT));
+ SkColor face = skia::COLORREFToSkColor(color3DFace);
+ SkColor highlight = skia::COLORREFToSkColor(GetSysColor(COLOR_3DHILIGHT));
SkColor buffer[] = { face, highlight, highlight, face };
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kARGB_8888_Config, 2, 2);
@@ -232,7 +232,7 @@ HRESULT NativeTheme::PaintScrollbarTrack(HDC hdc,
shader->setLocalMatrix(matrix);
SkPaint paint;
paint.setShader(shader)->unref();
- canvas->drawIRect(RECTToSkIRect(*target_rect), paint);
+ canvas->drawIRect(skia::RECTToSkIRect(*target_rect), paint);
}
if (classic_state & DFCS_PUSHED)
InvertRect(hdc, target_rect);
@@ -466,7 +466,7 @@ HRESULT NativeTheme::GetThemeColor(ThemeName theme,
COLORREF color_ref;
if (get_theme_color_(handle, part_id, state_id, prop_id, &color_ref) ==
S_OK) {
- *color = gfx::COLORREFToSkColor(color_ref);
+ *color = skia::COLORREFToSkColor(color_ref);
return S_OK;
}
}
@@ -480,7 +480,7 @@ SkColor NativeTheme::GetThemeColorWithDefault(ThemeName theme,
int default_sys_color) const {
SkColor color;
if (GetThemeColor(theme, part_id, state_id, prop_id, &color) != S_OK)
- color = gfx::COLORREFToSkColor(GetSysColor(default_sys_color));
+ color = skia::COLORREFToSkColor(GetSysColor(default_sys_color));
return color;
}
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index f2f2506..e1327ac 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -259,7 +259,7 @@ class BookmarkButton : public views::TextButton {
// the parent's actual bounds because they differ from what is painted.
SkPaint paint;
paint.setAlpha(static_cast<int>((1.0 - animation_value) * 255));
- paint.setShader(gfx::CreateGradientShader(0,
+ paint.setShader(skia::CreateGradientShader(0,
view->height() + kTopMargin + kBottomMargin,
kTopBorderColor,
kBackgroundColor))->safeUnref();
@@ -607,16 +607,16 @@ class ButtonSeparatorView : public views::View {
virtual void Paint(ChromeCanvas* canvas) {
SkPaint paint;
- paint.setShader(gfx::CreateGradientShader(0,
- height() / 2,
- kTopBorderColor,
- kSeparatorColor))->safeUnref();
+ paint.setShader(skia::CreateGradientShader(0,
+ height() / 2,
+ kTopBorderColor,
+ kSeparatorColor))->safeUnref();
SkRect rc = {SkIntToScalar(kSeparatorStartX), SkIntToScalar(0),
SkIntToScalar(1), SkIntToScalar(height() / 2) };
canvas->drawRect(rc, paint);
SkPaint paint_down;
- paint_down.setShader(gfx::CreateGradientShader(height() / 2,
+ paint_down.setShader(skia::CreateGradientShader(height() / 2,
height(),
kSeparatorColor,
kBackgroundColor))->safeUnref();
@@ -908,10 +908,10 @@ void BookmarkBarView::Paint(ChromeCanvas* canvas) {
// Draw our background.
SkPaint paint;
paint.setAntiAlias(true);
- paint.setShader(gfx::CreateGradientShader(0,
- height(),
- kTopBorderColor,
- kBackgroundColor))->safeUnref();
+ paint.setShader(skia::CreateGradientShader(0,
+ height(),
+ kTopBorderColor,
+ kBackgroundColor))->safeUnref();
canvas->drawRoundRect(rect,
SkDoubleToScalar(roundness),
@@ -928,10 +928,10 @@ void BookmarkBarView::Paint(ChromeCanvas* canvas) {
SkDoubleToScalar(roundness), border_paint);
} else {
SkPaint paint;
- paint.setShader(gfx::CreateGradientShader(0,
- height(),
- kTopBorderColor,
- kBackgroundColor))->safeUnref();
+ paint.setShader(skia::CreateGradientShader(0,
+ height(),
+ kTopBorderColor,
+ kBackgroundColor))->safeUnref();
canvas->FillRectInt(0, 0, width(), height(), paint);
canvas->FillRectInt(kTopBorderColor, 0, 0, width(), 1);
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 4971019..10fa423 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -304,7 +304,7 @@ void BookmarkManagerView::PaintBackground(ChromeCanvas* canvas) {
canvas->drawColor(kBackgroundColorBottom, SkPorterDuff::kSrc_Mode);
SkPaint paint;
- paint.setShader(gfx::CreateGradientShader(0, kBackgroundGradientHeight,
+ paint.setShader(skia::CreateGradientShader(0, kBackgroundGradientHeight,
kBackgroundColorTop,
kBackgroundColorBottom))->safeUnref();
canvas->FillRectInt(0, 0, width(), kBackgroundGradientHeight, paint);
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 627c387..a534a4b 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -102,7 +102,7 @@ void FileDisplayArea::Paint(ChromeCanvas* canvas) {
RECT rect = { 0, 0, width(), height() };
gfx::NativeTheme::instance()->PaintTextField(
dc, EP_EDITTEXT, ETS_READONLY, 0, &rect,
- gfx::SkColorToCOLORREF(text_field_background_color_), true, true);
+ skia::SkColorToCOLORREF(text_field_background_color_), true, true);
canvas->endPlatformPaint();
canvas->DrawBitmapInt(default_folder_icon_, icon_bounds_.x(),
icon_bounds_.y());
diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc
index 26d7f5f..7ec0ec1 100644
--- a/chrome/browser/views/sad_tab_view.cc
+++ b/chrome/browser/views/sad_tab_view.cc
@@ -37,9 +37,9 @@ SadTabView::SadTabView() {
void SadTabView::Paint(ChromeCanvas* canvas) {
SkPaint paint;
- paint.setShader(gfx::CreateGradientShader(0, height(),
- kBackgroundColor,
- kBackgroundEndColor))->safeUnref();
+ paint.setShader(skia::CreateGradientShader(0, height(),
+ kBackgroundColor,
+ kBackgroundEndColor))->safeUnref();
paint.setStyle(SkPaint::kFill_Style);
canvas->drawRectCoords(0, 0,
SkIntToScalar(width()), SkIntToScalar(height()),
diff --git a/chrome/common/gfx/color_utils.cc b/chrome/common/gfx/color_utils.cc
index 1ab1849..cdb4c0c 100644
--- a/chrome/common/gfx/color_utils.cc
+++ b/chrome/common/gfx/color_utils.cc
@@ -255,7 +255,7 @@ SkColor SetColorAlpha(SkColor c, SkAlpha alpha) {
SkColor GetSysSkColor(int which) {
#if defined(OS_WIN)
- return gfx::COLORREFToSkColor(::GetSysColor(which));
+ return skia::COLORREFToSkColor(::GetSysColor(which));
#else
NOTIMPLEMENTED();
return SK_ColorLTGRAY;
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);
diff --git a/skia/ext/platform_device_win.cc b/skia/ext/platform_device_win.cc
index a712791..5a94efa 100644
--- a/skia/ext/platform_device_win.cc
+++ b/skia/ext/platform_device_win.cc
@@ -13,6 +13,9 @@
namespace gfx {
+// TODO(brettw) remove this when this file is moved into the Skia namespace.
+using namespace skia;
+
PlatformDeviceWin::PlatformDeviceWin(const SkBitmap& bitmap)
: SkDevice(bitmap) {
}
diff --git a/skia/ext/skia_utils.cc b/skia/ext/skia_utils.cc
index b2ea44f..80386e6 100644
--- a/skia/ext/skia_utils.cc
+++ b/skia/ext/skia_utils.cc
@@ -6,7 +6,7 @@
#include "SkGradientShader.h"
-namespace gfx {
+namespace skia {
SkShader* CreateGradientShader(int start_point,
int end_point,
@@ -21,5 +21,5 @@ SkShader* CreateGradientShader(int start_point,
grad_points, grad_colors, NULL, 2, SkShader::kRepeat_TileMode);
}
-} // namespace gfx
+} // namespace skia
diff --git a/skia/ext/skia_utils.h b/skia/ext/skia_utils.h
index d2ed5db..86cb8f54 100644
--- a/skia/ext/skia_utils.h
+++ b/skia/ext/skia_utils.h
@@ -8,7 +8,7 @@
#include "SkColor.h"
#include "SkShader.h"
-namespace gfx {
+namespace skia {
// Creates a vertical gradient shader. The caller owns the shader.
// Example usage to avoid leaks:
@@ -21,7 +21,7 @@ SkShader* CreateGradientShader(int start_point,
SkColor start_color,
SkColor end_color);
-} // namespace gfx
+} // namespace skia
#endif // SKIA_EXT_SKIA_UTILS_H_
diff --git a/skia/ext/skia_utils_win.cc b/skia/ext/skia_utils_win.cc
index 05f0692..f6c8006 100644
--- a/skia/ext/skia_utils_win.cc
+++ b/skia/ext/skia_utils_win.cc
@@ -22,7 +22,7 @@ COMPILE_ASSERT(sizeof(RECT) == sizeof(SkIRect), o9);
} // namespace
-namespace gfx {
+namespace skia {
POINT SkPointToPOINT(const SkPoint& point) {
POINT win_point = { SkScalarRound(point.fX), SkScalarRound(point.fY) };
@@ -57,5 +57,5 @@ COLORREF SkColorToCOLORREF(SkColor color) {
#endif
}
-} // namespace gfx
+} // namespace skia
diff --git a/skia/ext/skia_utils_win.h b/skia/ext/skia_utils_win.h
index fa94507..677892e 100644
--- a/skia/ext/skia_utils_win.h
+++ b/skia/ext/skia_utils_win.h
@@ -15,7 +15,7 @@ typedef DWORD COLORREF;
typedef struct tagPOINT POINT;
typedef struct tagRECT RECT;
-namespace gfx {
+namespace skia {
// Converts a Skia point to a Windows POINT.
POINT SkPointToPOINT(const SkPoint& point);
@@ -43,7 +43,7 @@ SkColor COLORREFToSkColor(COLORREF color);
// Converts ARGB to COLORREFs (0BGR).
COLORREF SkColorToCOLORREF(SkColor color);
-} // namespace gfx
+} // namespace skia
#endif // SKIA_EXT_SKIA_UTILS_WIN_H_
diff --git a/skia/ext/vector_device.cc b/skia/ext/vector_device.cc
index 32449ad..bf52462 100644
--- a/skia/ext/vector_device.cc
+++ b/skia/ext/vector_device.cc
@@ -13,6 +13,9 @@
namespace gfx {
+// TODO(brettw) remove this when all the namespaces are moved to skia.
+using namespace skia;
+
VectorDevice* VectorDevice::create(HDC dc, int width, int height) {
InitializeDC(dc);
diff --git a/webkit/port/platform/graphics/chromium/FontChromiumWin.cpp b/webkit/port/platform/graphics/chromium/FontChromiumWin.cpp
index 6726a83..3dde8d3 100644
--- a/webkit/port/platform/graphics/chromium/FontChromiumWin.cpp
+++ b/webkit/port/platform/graphics/chromium/FontChromiumWin.cpp
@@ -69,7 +69,7 @@ void Font::drawGlyphs(GraphicsContext* graphicsContext,
color = SkColorSetRGB(SkColorGetR(color),
SkColorGetG(color),
SkColorGetB(color));
- SetTextColor(hdc, gfx::SkColorToCOLORREF(color));
+ SetTextColor(hdc, skia::SkColorToCOLORREF(color));
SetBkMode(hdc, TRANSPARENT);
// Windows needs the characters and the advances in nice contiguous
@@ -168,7 +168,7 @@ void Font::drawComplexText(GraphicsContext* graphicsContext,
color = SkColorSetRGB(SkColorGetR(color),
SkColorGetG(color),
SkColorGetB(color));
- SetTextColor(hdc, gfx::SkColorToCOLORREF(color));
+ SetTextColor(hdc, skia::SkColorToCOLORREF(color));
SetBkMode(hdc, TRANSPARENT);
// Uniscribe counts the coordinates from the upper left, while WebKit uses
diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp
index d081b2e..792c237 100644
--- a/webkit/port/rendering/RenderThemeWin.cpp
+++ b/webkit/port/rendering/RenderThemeWin.cpp
@@ -586,7 +586,7 @@ bool RenderThemeWin::paintTextFieldInternal(RenderObject* o,
gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
HDC hdc = canvas->beginPlatformPaint();
- COLORREF clr = gfx::SkColorToCOLORREF(o->style()->backgroundColor().rgb());
+ COLORREF clr = skia::SkColorToCOLORREF(o->style()->backgroundColor().rgb());
RECT renderRect = helper.rect();
gfx::NativeTheme::instance()->PaintTextField(hdc,
generated by cgit v1.1 at 2025-02-01 01:25:37 +0000