Move convolver, image_operations, and skia_utils from base/gfx to skia/ext....

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/bookmark_bar_view.h"
 
 #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"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/drag_utils.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/history/history.h"
@@ skipping 17 matching lines @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/chrome_menu.h"
 #include "chrome/views/menu_button.h"
 #include "chrome/views/tooltip_manager.h"
 #include "chrome/views/view_constants.h"
 #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;
 using views::MenuButton;
 using views::MenuItemView;
 using views::View;
 
 // Margins around the content.
 static const int kTopMargin = 2;
 static const int kBottomMargin = 3;
@@ skipping 190 matching lines @@
   static void PaintAnimation(views::View* view,
                              ChromeCanvas* canvas,
                              double animation_value) {
     // Since we can't change the alpha of the button (it contains un-alphable
     // text), we paint the bar background over the front of the button. As the
     // bar background is a gradient, we have to paint the gradient at the
     // size of the parent (hence all the margin math below). We can't use
     // 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();
     canvas->FillRectInt(0, -kTopMargin, view->width(),
                         view->height() + kTopMargin + kBottomMargin, paint);
   }
 
  private:
   const GURL& url_;
   Profile* profile_;
@@ skipping 327 matching lines @@
 
 // TODO(sky/glen): this is temporary, need to decide on what this should
 // look like.
 class ButtonSeparatorView : public views::View {
  public:
   ButtonSeparatorView() {}
   virtual ~ButtonSeparatorView() {}
 
   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();
     SkRect rc_down = {
         SkIntToScalar(kSeparatorStartX),  SkIntToScalar(height() / 2),
         SkIntToScalar(1), SkIntToScalar(height() - 1) };
     canvas->drawRect(rc_down, paint_down);
   }
 
   virtual gfx::Size GetPreferredSize() {
@@ skipping 271 matching lines @@
              SkDoubleToScalar(v_padding - 0.5),
              SkDoubleToScalar(width() - h_padding - 0.5),
              SkDoubleToScalar(height() - v_padding - 0.5));
 
     double roundness = static_cast<double>
         (kNewtabBarRoundness) * current_state;
 
     // 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),
                           SkDoubleToScalar(roundness), paint);
 
     // Draw border
     SkPaint border_paint;
     border_paint.setColor(kNewtabBorderColor);
     border_paint.setStyle(SkPaint::kStroke_Style);
     border_paint.setAntiAlias(true);
 
     canvas->drawRoundRect(rect,
                           SkDoubleToScalar(roundness),
                           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);
     canvas->FillRectInt(kBottomBorderColor, 0, height() - 1, width(), 1);
   }
 }
 
 void BookmarkBarView::PaintChildren(ChromeCanvas* canvas) {
   View::PaintChildren(canvas);
 
@@ skipping 896 matching lines @@
 }
 
 void BookmarkBarView::StopThrobbing(bool immediate) {
   if (!throbbing_view_)
     return;
 
   // If not immediate, cycle through 2 more complete cycles.
   throbbing_view_->StartThrobbing(immediate ? 0 : 4);
   throbbing_view_ = NULL;
 }