Move Image operations and convolver to the skia namespace and clean up a few (but not all) base types.

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

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

2 files changed, 9 insertions, 9 deletions

diff --git a/webkit/port/platform/graphics/skia/ImageSkia.cpp b/webkit/port/platform/graphics/skia/ImageSkia.cpp
index 4936502..4d3ee12 100644
--- a/webkit/port/platform/graphics/skia/ImageSkia.cpp
+++ b/webkit/port/platform/graphics/skia/ImageSkia.cpp
@@ -217,9 +217,9 @@ void drawResampledBitmap(SkCanvas& canvas,
                                    destBitmapSubsetSkI.height());
 
         // Resample the needed part of the image.
-        SkBitmap resampled = gfx::ImageOperations::Resize(subset,
-            gfx::ImageOperations::RESIZE_LANCZOS3,
-            gfx::Size(destRectRounded.width(), destRectRounded.height()),
+        SkBitmap resampled = skia::ImageOperations::Resize(subset,
+            skia::ImageOperations::RESIZE_LANCZOS3,
+            destRectRounded.width(), destRectRounded.height(),
             destBitmapSubset);
 
         // Compute where the new bitmap should be drawn. Since our new bitmap
@@ -350,10 +350,10 @@ void Image::drawPattern(GraphicsContext* context,
 
     if (resampling == RESAMPLE_AWESOME) {
         // Do nice resampling.
-        SkBitmap resampled = gfx::ImageOperations::Resize(src_subset,
-            gfx::ImageOperations::RESIZE_LANCZOS3,
-            gfx::Size(static_cast<int>(dest_bitmap_width),
-                      static_cast<int>(dest_bitmap_height)));
+        SkBitmap resampled = skia::ImageOperations::Resize(src_subset,
+            skia::ImageOperations::RESIZE_LANCZOS3,
+            static_cast<int>(dest_bitmap_width),
+            static_cast<int>(dest_bitmap_height));
         shader = SkShader::CreateBitmapShader(
             resampled, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode);
 
diff --git a/webkit/port/platform/graphics/skia/NativeImageSkia.cpp b/webkit/port/platform/graphics/skia/NativeImageSkia.cpp
index 72bbcc4..fa4ce86 100644
--- a/webkit/port/platform/graphics/skia/NativeImageSkia.cpp
+++ b/webkit/port/platform/graphics/skia/NativeImageSkia.cpp
@@ -61,8 +61,8 @@ bool NativeImageSkia::hasResizedBitmap(int w, int h) const {
 
 SkBitmap NativeImageSkia::resizedBitmap(int w, int h) const {
     if (m_resizedImage.width() != w || m_resizedImage.height() != h) {
-        m_resizedImage = gfx::ImageOperations::Resize(*this,
-            gfx::ImageOperations::RESIZE_LANCZOS3, gfx::Size(w, h));
+        m_resizedImage = skia::ImageOperations::Resize(*this,
+            skia::ImageOperations::RESIZE_LANCZOS3, w, h);
     }
     return m_resizedImage;
 }