Move functions from skia/ext to app/gfx where possible: most of skia_utils.* and image_operations.* can be moved because they are not used by WebKit code.

This also fixes the spelling of "Convolusion" to "Convolution" and updates some copyrights.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/207059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26975 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 7 deletions

diff --git a/views/controls/button/image_button.cc b/views/controls/button/image_button.cc
index 50a8f59..adb4bc9 100644
--- a/views/controls/button/image_button.cc
+++ b/views/controls/button/image_button.cc
@@ -1,12 +1,12 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "views/controls/button/image_button.h"
 
 #include "app/gfx/canvas.h"
+#include "app/gfx/skbitmap_operations.h"
 #include "app/throb_animation.h"
-#include "skia/ext/image_operations.h"
 
 namespace views {
 
@@ -41,9 +41,8 @@ void ImageButton::SetBackground(SkColor color,
     return;
   }
 
-  background_image_ = skia::ImageOperations::CreateButtonBackground(color,
-                                                                    *image,
-                                                                    *mask);
+  background_image_ =
+      SkBitmapOperations::CreateButtonBackground(color, *image, *mask);
 }
 
 void ImageButton::SetImageAlignment(HorizontalAlignment h_align,
@@ -95,8 +94,8 @@ SkBitmap ImageButton::GetImageToPaint() {
   SkBitmap img;
 
   if (!images_[BS_HOT].isNull() && hover_animation_->IsAnimating()) {
-    img = skia::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL],
-              images_[BS_HOT], hover_animation_->GetCurrentValue());
+    img = SkBitmapOperations::CreateBlendedBitmap(images_[BS_NORMAL],
+        images_[BS_HOT], hover_animation_->GetCurrentValue());
   } else {
     img = images_[state_];
   }