Reverting 6709,6708,6706.

Review URL: http://codereview.chromium.org/13345

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

1 files changed, 10 insertions, 7 deletions

diff --git a/skia/ext/image_operations.h b/skia/ext/image_operations.h
index 22d5320..73c6b53 100644
--- a/skia/ext/image_operations.h
+++ b/skia/ext/image_operations.h
@@ -5,10 +5,12 @@
 #ifndef SKIA_EXT_IMAGE_OPERATIONS_H_
 #define SKIA_EXT_IMAGE_OPERATIONS_H_
 
+#include "base/basictypes.h"
+#include "base/gfx/rect.h"
+
 class SkBitmap;
-struct SkIRect;
 
-namespace skia {
+namespace gfx {
 
 class ImageOperations {
  public:
@@ -35,14 +37,14 @@ class ImageOperations {
   // The destination subset must be smaller than the destination image.
   static SkBitmap Resize(const SkBitmap& source,
                          ResizeMethod method,
-                         int dest_width, int dest_height,
-                         const SkIRect& dest_subset);
+                         const Size& dest_size,
+                         const Rect& dest_subset);
 
   // Alternate version for resizing and returning the entire bitmap rather than
   // a subset.
   static SkBitmap Resize(const SkBitmap& source,
                          ResizeMethod method,
-                         int dest_width, int dest_height);
+                         const Size& dest_size);
 
 
   // Create a bitmap that is a blend of two others. The alpha argument
@@ -55,6 +57,7 @@ class ImageOperations {
   ImageOperations();  // Class for scoping only.
 };
 
-}  // namespace skia
+}  // namespace gfx
+
+#endif  // SKIA_EXT_IMAGE_OPERATIONS_H__
 
-#endif  // SKIA_EXT_IMAGE_OPERATIONS_H_