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

webkit/port/platform/graphics/skia/ImageSkia.cpp

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 199 matching lines @@
         canvas.drawBitmapRect(resampled, 0, destRect, &paint);
     } else {
         // We should only resize the exposed part of the bitmap to do the
         // minimal possible work.
         gfx::Rect destBitmapSubset(destBitmapSubsetSkI.fLeft,
                                    destBitmapSubsetSkI.fTop,
                                    destBitmapSubsetSkI.width(),
                                    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
         // may be smaller than the original, we have to shift it over by the
         // same amount that we cut off the top and left.
         SkRect offsetDestRect = {
             destBitmapSubset.x() + destRect.fLeft,
             destBitmapSubset.y() + destRect.fTop,
             destBitmapSubset.right() + destRect.fLeft,
             destBitmapSubset.bottom() + destRect.fTop };
@@ skipping 110 matching lines @@
       resampling = computeResamplingMode(*bitmap,
                                          srcRect.width(), srcRect.height(),
                                          dest_bitmap_width, dest_bitmap_height);
     }
 
     // Load the transform WebKit requested.
     SkMatrix matrix(patternTransform);
 
     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);
 
         // Since we just resized the bitmap, we need to undo the scale set in
         // the image transform.
         matrix.setScaleX(SkIntToScalar(1));
         matrix.setScaleY(SkIntToScalar(1));
     } else {
         // No need to do nice resampling.
         shader = SkShader::CreateBitmapShader(
@@ skipping 80 matching lines @@
 PassRefPtr<BitmapImageSingleFrameSkia> BitmapImageSingleFrameSkia::create(
     const SkBitmap& bitmap)
 {
     RefPtr<BitmapImageSingleFrameSkia> image(new BitmapImageSingleFrameSkia());
     if (!bitmap.copyTo(&image->m_nativeImage, bitmap.config()))
         return 0;
     return image.release();
 }
 
 }  // namespace WebCore