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

skia/ext/image_operations_unittest.cc

Index: skia/ext/image_operations_unittest.cc
===================================================================
--- skia/ext/image_operations_unittest.cc	(revision 6142)
+++ skia/ext/image_operations_unittest.cc	(working copy)
@@ -4,7 +4,8 @@
 
 #include <stdlib.h>
 
-#include "base/gfx/image_operations.h"
+#include "skia/ext/image_operations.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 #include "SkBitmap.h"
 
@@ -67,8 +68,8 @@
   FillDataToBitmap(src_w, src_h, &src);
 
   // Do a halving of the full bitmap.
-  SkBitmap actual_results = gfx::ImageOperations::Resize(
-      src, gfx::ImageOperations::RESIZE_BOX, gfx::Size(src_w / 2, src_h / 2));
+  SkBitmap actual_results = skia::ImageOperations::Resize(
+      src, skia::ImageOperations::RESIZE_BOX, gfx::Size(src_w / 2, src_h / 2));
   ASSERT_EQ(src_w / 2, actual_results.width());
   ASSERT_EQ(src_h / 2, actual_results.height());
 
@@ -96,16 +97,16 @@
   FillDataToBitmap(src_w, src_h, &src);
 
   // Do a halving of the full bitmap.
-  SkBitmap full_results = gfx::ImageOperations::Resize(
-      src, gfx::ImageOperations::RESIZE_BOX, gfx::Size(src_w / 2, src_h / 2));
+  SkBitmap full_results = skia::ImageOperations::Resize(
+      src, skia::ImageOperations::RESIZE_BOX, gfx::Size(src_w / 2, src_h / 2));
   ASSERT_EQ(src_w / 2, full_results.width());
   ASSERT_EQ(src_h / 2, full_results.height());
 
   // Now do a halving of a a subset, recall the destination subset is in the
   // destination coordinate system (max = half of the original image size).
   gfx::Rect subset_rect(2, 3, 3, 6);
-  SkBitmap subset_results = gfx::ImageOperations::Resize(
-      src, gfx::ImageOperations::RESIZE_BOX,
+  SkBitmap subset_results = skia::ImageOperations::Resize(
+      src, skia::ImageOperations::RESIZE_BOX,
       gfx::Size(src_w / 2, src_h / 2), subset_rect);
   ASSERT_EQ(subset_rect.width(), subset_results.width());
   ASSERT_EQ(subset_rect.height(), subset_results.height());
@@ -132,8 +133,8 @@
 
   // Do a resize of the full bitmap to the same size. The lanczos filter is good
   // enough that we should get exactly the same image for output.
-  SkBitmap results = gfx::ImageOperations::Resize(
-      src, gfx::ImageOperations::RESIZE_LANCZOS3, gfx::Size(src_w, src_h));
+  SkBitmap results = skia::ImageOperations::Resize(
+      src, skia::ImageOperations::RESIZE_LANCZOS3, gfx::Size(src_w, src_h));
   ASSERT_EQ(src_w, results.width());
   ASSERT_EQ(src_h, results.height());
 
Property changes on: skia\ext\image_operations_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/gfx/image_operations_unittest.cc:r69-2775