Move Image operations and convolver to the skia namespace and clean up a few ...

skia/ext/image_operations_unittest.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 <stdlib.h>
 
 #include "skia/ext/image_operations.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "SkBitmap.h"
 
@@ skipping 49 matching lines @@
 
 // Makes the bitmap 50% the size as the original using a box filter. This is
 // an easy operation that we can check the results for manually.
 TEST(ImageOperations, Halve) {
   // Make our source bitmap.
   int src_w = 30, src_h = 38;
   SkBitmap src;
   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, src_w / 2, src_h / 2);
   ASSERT_EQ(src_w / 2, actual_results.width());
   ASSERT_EQ(src_h / 2, actual_results.height());
 
   // Compute the expected values & compare.
   SkAutoLockPixels lock(actual_results);
   for (int y = 0; y < actual_results.height(); y++) {
     for (int x = 0; x < actual_results.width(); x++) {
       int first_x = std::max(0, x * 2 - 1);
       int last_x = std::min(src_w - 1, x * 2);
 
       int first_y = std::max(0, y * 2 - 1);
       int last_y = std::min(src_h - 1, y * 2);
 
       uint32_t expected_color = AveragePixel(src,
                                              first_x, last_x, first_y, last_y);
       EXPECT_TRUE(ColorsClose(expected_color, *actual_results.getAddr32(x, y)));
     }
   }
 }
 
 TEST(ImageOperations, HalveSubset) {
   // Make our source bitmap.
   int src_w = 16, src_h = 34;
   SkBitmap src;
   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, 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,
-      gfx::Size(src_w / 2, src_h / 2), subset_rect);
+  SkBitmap subset_results = skia::ImageOperations::Resize(
+      src, skia::ImageOperations::RESIZE_BOX,
+      src_w / 2, src_h / 2, subset_rect);
   ASSERT_EQ(subset_rect.width(), subset_results.width());
   ASSERT_EQ(subset_rect.height(), subset_results.height());
 
   // The computed subset and the corresponding subset of the original image
   // should be the same.
   SkAutoLockPixels full_lock(full_results);
   SkAutoLockPixels subset_lock(subset_results);
   for (int y = 0; y < subset_rect.height(); y++) {
     for (int x = 0; x < subset_rect.width(); x++) {
       ASSERT_EQ(
@@ skipping 19 matching lines @@
 
   SkAutoLockPixels src_lock(src);
   SkAutoLockPixels results_lock(results);
   for (int y = 0; y < src_h; y++) {
     for (int x = 0; x < src_w; x++) {
       EXPECT_EQ(*src.getAddr32(x, y), *results.getAddr32(x, y));
     }
   }
 }