summaryrefslogtreecommitdiffstats
path: root/chrome/views
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-03 01:11:58 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-03 01:11:58 +0000
commitae615162135445eb0b94365b1a1cfa511e7f4be4 (patch)
treea32c9ad049aa25b3c40038713d546c3521d3d20e /chrome/views
parent693f8e4af78b0bb38cb56cd913c8774c75b43067 (diff)
downloadchromium_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')
-rw-r--r--chrome/views/background.cc4
-rw-r--r--chrome/views/button.cc4
-rw-r--r--chrome/views/chrome_menu.cc1
-rw-r--r--chrome/views/single_split_view.cc4
-rw-r--r--chrome/views/tabbed_pane.cc1
-rw-r--r--chrome/views/table_view.cc8
-rw-r--r--chrome/views/text_field.cc5
7 files changed, 15 insertions, 12 deletions
diff --git a/chrome/views/background.cc b/chrome/views/background.cc
index 1aa631e..72352b7 100644
--- a/chrome/views/background.cc
+++ b/chrome/views/background.cc
@@ -4,11 +4,11 @@
#include "chrome/views/background.h"
+#include "base/gfx/skia_utils.h"
#include "base/logging.h"
#include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/views/painter.h"
#include "chrome/views/view.h"
-#include "skia/ext/skia_utils_win.h"
#include "skia/include/SkPaint.h"
namespace views {
@@ -68,7 +68,7 @@ Background::~Background() {
void Background::SetNativeControlColor(SkColor color) {
DeleteObject(native_control_brush_);
- native_control_brush_ = CreateSolidBrush(skia::SkColorToCOLORREF(color));
+ native_control_brush_ = CreateSolidBrush(gfx::SkColorToCOLORREF(color));
}
//static
diff --git a/chrome/views/button.cc b/chrome/views/button.cc
index 36c228a..93e2e3c 100644
--- a/chrome/views/button.cc
+++ b/chrome/views/button.cc
@@ -7,12 +7,12 @@
#include <atlbase.h>
#include <atlapp.h>
+#include "base/gfx/image_operations.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/common/l10n_util.h"
#include "chrome/common/throb_animation.h"
#include "chrome/views/event.h"
-#include "skia/ext/image_operations.h"
#include "generated_resources.h"
@@ -105,7 +105,7 @@ SkBitmap Button::GetImageToPaint() {
SkBitmap img;
if (!images_[BS_HOT].isNull() && hover_animation_->IsAnimating()) {
- img = skia::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL],
+ img = gfx::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL],
images_[BS_HOT], hover_animation_->GetCurrentValue());
} else {
img = images_[GetState()];
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc
index 4d12f3b..549bedf 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/chrome_menu.cc
@@ -10,6 +10,7 @@
#include "base/base_drag_source.h"
#include "base/gfx/native_theme.h"
+#include "base/gfx/skia_utils.h"
#include "base/message_loop.h"
#include "base/task.h"
#include "base/timer.h"
diff --git a/chrome/views/single_split_view.cc b/chrome/views/single_split_view.cc
index a7832b6..2550c57 100644
--- a/chrome/views/single_split_view.cc
+++ b/chrome/views/single_split_view.cc
@@ -4,9 +4,9 @@
#include "chrome/views/single_split_view.h"
+#include "base/gfx/skia_utils.h"
#include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/views/background.h"
-#include "skia/ext/skia_utils_win.h"
namespace views {
@@ -19,7 +19,7 @@ SingleSplitView::SingleSplitView(View* leading, View* trailing)
AddChildView(trailing);
set_background(
views::Background::CreateSolidBackground(
- skia::COLORREFToSkColor(GetSysColor(COLOR_3DFACE))));
+ gfx::COLORREFToSkColor(GetSysColor(COLOR_3DFACE))));
}
void SingleSplitView::Layout() {
diff --git a/chrome/views/tabbed_pane.cc b/chrome/views/tabbed_pane.cc
index 4a63b47..2638972 100644
--- a/chrome/views/tabbed_pane.cc
+++ b/chrome/views/tabbed_pane.cc
@@ -7,6 +7,7 @@
#include <vssym32.h>
#include "base/gfx/native_theme.h"
+#include "base/gfx/skia_utils.h"
#include "base/logging.h"
#include "chrome/common/gfx/chrome_canvas.h"
#include "chrome/common/gfx/chrome_font.h"
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).
diff --git a/chrome/views/text_field.cc b/chrome/views/text_field.cc
index 92797a4..24fdc5a 100644
--- a/chrome/views/text_field.cc
+++ b/chrome/views/text_field.cc
@@ -12,6 +12,7 @@
#include <vsstyle.h>
#include "base/gfx/native_theme.h"
+#include "base/gfx/skia_utils.h"
#include "base/scoped_clipboard_writer.h"
#include "base/string_util.h"
#include "base/win_util.h"
@@ -24,8 +25,8 @@
#include "chrome/views/hwnd_view.h"
#include "chrome/views/menu.h"
#include "chrome/views/widget.h"
+
#include "generated_resources.h"
-#include "skia/ext/skia_utils_win.h"
using gfx::NativeTheme;
@@ -1086,7 +1087,7 @@ void TextField::UpdateEditBackgroundColor() {
COLORREF bg_color;
if (!use_default_background_color_)
- bg_color = skia::SkColorToCOLORREF(background_color_);
+ bg_color = gfx::SkColorToCOLORREF(background_color_);
else
bg_color = GetSysColor(read_only_ ? COLOR_3DFACE : COLOR_WINDOW);
edit_->SetBackgroundColor(bg_color);
generated by cgit v1.1 at 2025-03-09 03:14:17 +0000