Move the "platform" wrappers in skia/ext to the skia namespace.

skia/ext/vector_canvas_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 "skia/ext/vector_canvas.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
 #include "base/gfx/size.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "SkDashPathEffect.h"
 
+namespace skia {
+
 namespace {
 
 const wchar_t* const kGenerateSwitch = L"vector-canvas-generate";
 
 // Base class for unit test that uses data. It initializes a directory path
 // based on the test's name.
 class DataUnitTest : public testing::Test {
  public:
   DataUnitTest(const std::wstring& base_path) : base_path_(base_path) { }
 
@@ skipping 99 matching lines @@
     int w;
     int h;
     EXPECT_TRUE(PNGDecoder::Decode(
         reinterpret_cast<const unsigned char*>(compressed.c_str()),
         compressed.size(), PNGDecoder::FORMAT_BGRA, &data_, &w, &h));
     size_.SetSize(w, h);
     row_length_ = w * sizeof(uint32);
   }
 
   // Loads the image from a canvas.
-  Image(const gfx::PlatformCanvasWin& canvas) : ignore_alpha_(true) {
+  Image(const skia::PlatformCanvasWin& canvas) : ignore_alpha_(true) {
     // Use a different way to access the bitmap. The normal way would be to
     // query the SkBitmap.
     HDC context = canvas.getTopPlatformDevice().getBitmapDC();
     HGDIOBJ bitmap = GetCurrentObject(context, OBJ_BITMAP);
     EXPECT_TRUE(bitmap != NULL);
     // Initialize the clip region to the entire bitmap.
     BITMAP bitmap_data;
     EXPECT_EQ(GetObject(bitmap, sizeof(BITMAP), &bitmap_data),
               sizeof(BITMAP));
     size_.SetSize(bitmap_data.bmWidth, bitmap_data.bmHeight);
@@ skipping 118 matching lines @@
     if (action_ == GENERATE) {
       // Make sure the directory exist.
       file_util::CreateDirectory(test_dir());
     }
   }
 
   // Compares or saves the bitmap currently loaded in the context, depending on
   // kGenerating value. Returns 0 on success or any positive value between ]0,
   // 100] on failure. The return value is the percentage of difference between
   // the image in the file and the image in the canvas.
-  double ProcessCanvas(const gfx::PlatformCanvasWin& canvas,
+  double ProcessCanvas(const skia::PlatformCanvasWin& canvas,
                        std::wstring filename) const {
     filename +=  L".png";
     switch (action_) {
       case GENERATE:
         SaveImage(canvas, filename);
         return 0.;
       case COMPARE:
         return CompareImage(canvas, filename);
       case NOOP:
         return 0;
       default:
         // Invalid state, returns that the image is 100 different.
         return 100.;
     }
   }
 
   // Compares the bitmap currently loaded in the context with the file. Returns
   // the percentage of pixel difference between both images, between 0 and 100.
-  double CompareImage(const gfx::PlatformCanvasWin& canvas,
-                    const std::wstring& filename) const {
+  double CompareImage(const skia::PlatformCanvasWin& canvas,
+                      const std::wstring& filename) const {
     Image image1(canvas);
     Image image2(test_file(filename));
     double diff = image1.PercentageDifferent(image2);
     return diff;
   }
 
   // Saves the bitmap currently loaded in the context into the file.
-  void SaveImage(const gfx::PlatformCanvasWin& canvas,
+  void SaveImage(const skia::PlatformCanvasWin& canvas,
                  const std::wstring& filename) const {
     Image(canvas).SaveToFile(test_file(filename));
   }
 
   ProcessAction action_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ImageTest);
 };
 
 // Premultiply the Alpha channel on the R, B and G channels.
@@ skipping 69 matching lines @@
     delete context_;
     context_ = NULL;
 
     parent::TearDown();
   }
 
   void Init(int size) {
     size_ = size;
     context_ = new Context();
     bitmap_ = new Bitmap(*context_, size_, size_);
-    vcanvas_ = new gfx::VectorCanvas(context_->context(), size_, size_);
-    pcanvas_ = new gfx::PlatformCanvasWin(size_, size_, false);
+    vcanvas_ = new VectorCanvas(context_->context(), size_, size_);
+    pcanvas_ = new PlatformCanvasWin(size_, size_, false);
 
     // Clear white.
     vcanvas_->drawARGB(255, 255, 255, 255, SkPorterDuff::kSrc_Mode);
     pcanvas_->drawARGB(255, 255, 255, 255, SkPorterDuff::kSrc_Mode);
   }
 
   // Compares both canvas and returns the pixel difference in percentage between
   // both images. 0 on success and ]0, 100] on failure.
   double ProcessImage(const std::wstring& filename) {
     std::wstring number(StringPrintf(L"%02d_", number_++));
@@ skipping 20 matching lines @@
   // Current image number in the current test. Used to number of test files.
   int number_;
 
   // A temporary HDC to draw into.
   Context* context_;
 
   // Bitmap created inside context_.
   Bitmap* bitmap_;
 
   // Vector based canvas.
-  gfx::VectorCanvas* vcanvas_;
+  VectorCanvas* vcanvas_;
 
   // Pixel based canvas.
-  gfx::PlatformCanvasWin* pcanvas_;
+  PlatformCanvasWin* pcanvas_;
 
   // When true (default), vcanvas_ and pcanvas_ contents are compared and
   // verified to be identical.
   bool compare_canvas_;
 };
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // Actual tests
 
 TEST_F(VectorCanvasTest, Uninitialized) {
   // Do a little mubadumba do get uninitialized stuff.
   VectorCanvasTest::TearDown();
 
   // The goal is not to verify that have the same uninitialized data.
   compare_canvas_ = false;
 
   context_ = new Context();
   bitmap_ = new Bitmap(*context_, size_, size_);
-  vcanvas_ = new gfx::VectorCanvas(context_->context(), size_, size_);
-  pcanvas_ = new gfx::PlatformCanvasWin(size_, size_, false);
+  vcanvas_ = new VectorCanvas(context_->context(), size_, size_);
+  pcanvas_ = new PlatformCanvasWin(size_, size_, false);
 
   // VectorCanvas default initialization is black.
   // PlatformCanvas default initialization is almost white 0x01FFFEFD (invalid
   // Skia color) in both Debug and Release. See magicTransparencyColor in
   // platform_device.cc
   EXPECT_EQ(0., ProcessImage(L"empty"));
 }
 
 TEST_F(VectorCanvasTest, BasicDrawing) {
   EXPECT_EQ(Image(*vcanvas_).PercentageDifferent(Image(*pcanvas_)), 0.)
@@ skipping 525 matching lines @@
 
   {
     vcanvas_->rotate(67);
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(L"rotate"));
   }
 }
 
+}  // namespace skia