Removal of dependencies on PlatformDevice classes.

skia/ext/vector_canvas_unittest.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 #if !defined(OS_WIN)
 #include <unistd.h>
 #endif
 
@@ skipping 78 matching lines @@
     EXPECT_TRUE(compressed.size());
 
     SkBitmap bitmap;
     EXPECT_TRUE(gfx::PNGCodec::Decode(
         reinterpret_cast<const unsigned char*>(compressed.data()),
         compressed.size(), &bitmap));
     SetSkBitmap(bitmap);
   }
 
   // Loads the image from a canvas.
-  Image(const skia::PlatformCanvas& canvas) : ignore_alpha_(true) {
+  Image(skia::PlatformCanvas& canvas) : ignore_alpha_(true) {
     // Use a different way to access the bitmap. The normal way would be to
     // query the SkBitmap.
-    HDC context = canvas.beginPlatformPaint();
+    skia::ScopedPlatformPaint scoped_platform_paint(&canvas);
+    HDC context = scoped_platform_paint.GetPlatformSurface();
     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));
     width_ = bitmap_data.bmWidth;
     height_ = bitmap_data.bmHeight;
     row_length_ = bitmap_data.bmWidthBytes;
     size_t size = row_length_ * height_;
     data_.resize(size);
     memcpy(&*data_.begin(), bitmap_data.bmBits, size);
-    canvas.endPlatformPaint();
   }
 
   // Loads the image from a canvas.
   Image(const SkBitmap& bitmap) : ignore_alpha_(true) {
     SetSkBitmap(bitmap);
   }
 
   int width() const { return width_; }
   int height() const { return height_; }
   int row_length() const { return row_length_; }
@@ skipping 135 matching lines @@
     for (size_t i = 0; i < tmp.size(); ++i)
       tmp[i] = base::ToLowerASCII(tmp[i]);
 
     return test_dir_.AppendASCII(tmp);
   }
 
   // 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 skia::PlatformCanvas& canvas,
+  double ProcessCanvas(skia::PlatformCanvas& canvas,
                        FilePath::StringType filename) const {
     filename = filename + FILE_PATH_LITERAL(".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 skia::PlatformCanvas& canvas,
+  double CompareImage(skia::PlatformCanvas& canvas,
                       const FilePath::StringType& 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 skia::PlatformCanvas& canvas,
+  void SaveImage(skia::PlatformCanvas& canvas,
                  const FilePath::StringType& filename) const {
     Image(canvas).SaveToFile(test_file(filename));
   }
 
   ProcessAction action_;
 
   // Path to directory used to contain the test data.
   FilePath test_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageTest);
@@ skipping 661 matching lines @@
   {
     vcanvas_->rotate(67);
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(FILE_PATH_LITERAL("rotate")));
   }
 }
 
 }  // namespace skia