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

skia/ext/image_operations.h

Index: skia/ext/image_operations.h
===================================================================
--- skia/ext/image_operations.h	(revision 6142)
+++ skia/ext/image_operations.h	(working copy)
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_GFX_IMAGE_OPERATIONS_H__
-#define BASE_GFX_IMAGE_OPERATIONS_H__
+#ifndef SKIA_EXT_IMAGE_OPERATIONS_H_
+#define SKIA_EXT_IMAGE_OPERATIONS_H_
 
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 
 class SkBitmap;
 
-namespace gfx {
+namespace skia {
 
 class ImageOperations {
  public:
@@ -37,14 +37,14 @@
   // The destination subset must be smaller than the destination image.
   static SkBitmap Resize(const SkBitmap& source,
                          ResizeMethod method,
-                         const Size& dest_size,
-                         const Rect& dest_subset);
+                         const gfx::Size& dest_size,
+                         const gfx::Rect& dest_subset);
 
   // Alternate version for resizing and returning the entire bitmap rather than
   // a subset.
   static SkBitmap Resize(const SkBitmap& source,
                          ResizeMethod method,
-                         const Size& dest_size);
+                         const gfx::Size& dest_size);
 
 
   // Create a bitmap that is a blend of two others. The alpha argument
@@ -57,7 +57,7 @@
   ImageOperations();  // Class for scoping only.
 };
 
-}  // namespace gfx
+}  // namespace skia
 
-#endif  // BASE_GFX_IMAGE_OPERATIONS_H__
+#endif  // SKIA_EXT_IMAGE_OPERATIONS_H_
 
Property changes on: skia\ext\image_operations.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/gfx/image_operations.h:r69-2775