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

8 files changed, 37 insertions, 26 deletions

diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 49d817b..aaca5af 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -7,6 +7,7 @@
 #include <limits>
 
 #include "base/base_drag_source.h"
+#include "base/gfx/skia_utils.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -44,7 +45,6 @@
 #include "chrome/views/widget.h"
 #include "chrome/views/window.h"
 #include "generated_resources.h"
-#include "skia/ext/skia_utils.h"
 
 using views::BaseButton;
 using views::DropTargetEvent;
@@ -255,7 +255,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(skia::CreateGradientShader(0,
+    paint.setShader(gfx::CreateGradientShader(0,
         view->height() + kTopMargin + kBottomMargin,
         kTopBorderColor,
         kBackgroundColor))->safeUnref();
@@ -603,16 +603,16 @@ class ButtonSeparatorView : public views::View {
 
   virtual void Paint(ChromeCanvas* canvas) {
     SkPaint paint;
-    paint.setShader(skia::CreateGradientShader(0,
-                                               height() / 2,
-                                               kTopBorderColor,
-                                               kSeparatorColor))->safeUnref();
+    paint.setShader(gfx::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(skia::CreateGradientShader(height() / 2,
+    paint_down.setShader(gfx::CreateGradientShader(height() / 2,
         height(),
         kSeparatorColor,
         kBackgroundColor))->safeUnref();
@@ -904,10 +904,10 @@ void BookmarkBarView::Paint(ChromeCanvas* canvas) {
     // Draw our background.
     SkPaint paint;
     paint.setAntiAlias(true);
-    paint.setShader(skia::CreateGradientShader(0,
-                                               height(),
-                                               kTopBorderColor,
-                                               kBackgroundColor))->safeUnref();
+    paint.setShader(gfx::CreateGradientShader(0,
+                                              height(),
+                                              kTopBorderColor,
+                                              kBackgroundColor))->safeUnref();
 
     canvas->drawRoundRect(rect,
                           SkDoubleToScalar(roundness),
@@ -924,10 +924,10 @@ void BookmarkBarView::Paint(ChromeCanvas* canvas) {
                           SkDoubleToScalar(roundness), border_paint);
   } else {
     SkPaint paint;
-    paint.setShader(skia::CreateGradientShader(0,
-                                               height(),
-                                               kTopBorderColor,
-                                               kBackgroundColor))->safeUnref();
+    paint.setShader(gfx::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 684c252..c0c307e 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/gfx/skia_utils.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
@@ -30,8 +31,8 @@
 #include "chrome/views/menu_button.h"
 #include "chrome/views/single_split_view.h"
 #include "chrome/views/window.h"
+
 #include "generated_resources.h"
-#include "skia/ext/skia_utils.h"
 
 // If non-null, there is an open editor and this is the window it is contained
 // in it.
@@ -298,7 +299,7 @@ void BookmarkManagerView::PaintBackground(ChromeCanvas* canvas) {
   canvas->drawColor(kBackgroundColorBottom, SkPorterDuff::kSrc_Mode);
 
   SkPaint paint;
-  paint.setShader(skia::CreateGradientShader(0, kBackgroundGradientHeight,
+  paint.setShader(gfx::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 a534a4b..e4e443d 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -11,6 +11,7 @@
 
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
+#include "base/gfx/skia_utils.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/shell_dialogs.h"
@@ -30,7 +31,6 @@
 #include "chrome/views/text_field.h"
 #include "chrome/views/widget.h"
 #include "generated_resources.h"
-#include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkBitmap.h"
 
 namespace {
@@ -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,
-      skia::SkColorToCOLORREF(text_field_background_color_), true, true);
+      gfx::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/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index d73191b..b41fb55 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -10,6 +10,7 @@
 
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
+#include "base/gfx/skia_utils.h"
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/app/locales/locale_settings.h"
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index e9a1e8b..118ac10 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -11,6 +11,7 @@
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/gfx/native_theme.h"
+#include "base/gfx/skia_utils.h"
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index 9ff07f5..bdf76ea 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/views/options/options_group_view.h"
 
 #include "base/gfx/native_theme.h"
+#include "base/gfx/skia_utils.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/chrome_font.h"
diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc
index e22aea2..7b34bcb 100644
--- a/chrome/browser/views/sad_tab_view.cc
+++ b/chrome/browser/views/sad_tab_view.cc
@@ -10,7 +10,6 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "generated_resources.h"
-#include "skia/ext/skia_utils.h"
 #include "skia/include/SkGradientShader.h"
 
 static const int kSadTabOffset = -64;
@@ -35,9 +34,17 @@ SadTabView::SadTabView() {
   InitClass();
 }
 
+static SkShader* CreateGradientShader(int end_point) {
+  SkColor grad_colors[2] = { kBackgroundColor, kBackgroundEndColor };
+  SkPoint grad_points[2];
+  grad_points[0].set(SkIntToScalar(0), SkIntToScalar(0));
+  grad_points[1].set(SkIntToScalar(0), SkIntToScalar(end_point));
+  return SkGradientShader::CreateLinear(
+      grad_points, grad_colors, NULL, 2, SkShader::kRepeat_TileMode);
+}
+
 void SadTabView::Paint(ChromeCanvas* canvas) {
-  SkShader* background_shader = skia::CreateGradientShader(
-      0, height(), kBackgroundColor, kBackgroundEndColor);
+  SkShader* background_shader = CreateGradientShader(height());
   SkPaint paint;
   paint.setShader(background_shader);
   background_shader->unref();
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index 4581f6d..f1d00b3 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -6,6 +6,7 @@
 
 #include "chrome/browser/views/tabs/tab_renderer.h"
 
+#include "base/gfx/image_operations.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
@@ -16,7 +17,6 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
 #include "generated_resources.h"
-#include "skia/ext/image_operations.h"
 
 static const int kLeftPadding = 16;
 static const int kTopPadding = 6;
@@ -586,13 +586,13 @@ void TabRenderer::PaintActiveTabBackground(ChromeCanvas* canvas) {
 void TabRenderer::PaintHoverTabBackground(ChromeCanvas* canvas,
                                           double opacity) {
   bool is_otr = data_.off_the_record;
-  SkBitmap left = skia::ImageOperations::CreateBlendedBitmap(
+  SkBitmap left = gfx::ImageOperations::CreateBlendedBitmap(
                   (is_otr ? *tab_inactive_otr_l : *tab_inactive_l),
                   *tab_hover_l, opacity);
-  SkBitmap center = skia::ImageOperations::CreateBlendedBitmap(
+  SkBitmap center = gfx::ImageOperations::CreateBlendedBitmap(
                    (is_otr ? *tab_inactive_otr_c : *tab_inactive_c),
                     *tab_hover_c, opacity);
-  SkBitmap right = skia::ImageOperations::CreateBlendedBitmap(
+  SkBitmap right = gfx::ImageOperations::CreateBlendedBitmap(
                    (is_otr ? *tab_inactive_otr_r : *tab_inactive_r),
                    *tab_hover_r, opacity);