Fix win32 error checking in platform_canvas_skia.cc by moving code into ...

skia/ext/platform_canvas.h

 // 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.
 
 #ifndef SKIA_EXT_PLATFORM_CANVAS_H_
 #define SKIA_EXT_PLATFORM_CANVAS_H_
 #pragma once
 
 // The platform-specific device will include the necessary platform headers
 // to get the surface type.
 #include "skia/ext/platform_device.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace skia {
 
+#if defined(WIN32)
+typedef HANDLE PlatformData;
+#else

[Alexei Svitkine (slow), 2012/04/16 19:01:44]

Shouldn't you have this:

#elif defined(__APPLE__)
typedef CGContextRef PlatformData;

Instead of the #if defined(__APPLE__) section below?

+typedef uint8_t* PlatformData;
+#endif
+
 // This class is a specialization of the regular SkCanvas that is designed to
 // work with a PlatformDevice to manage platform-specific drawing. It allows
 // using both Skia operations and platform-specific operations.
 class SK_API PlatformCanvas : public SkCanvas {
  public:
   // If you use the version with no arguments, you MUST call initialize()
   PlatformCanvas();
   // Set is_opaque if you are going to erase the bitmap and not use
   // transparency: this will enable some optimizations.
   PlatformCanvas(int width, int height, bool is_opaque);
 
-#if defined(WIN32)
-  // The shared_section parameter is passed to gfx::PlatformDevice::create.
-  // See it for details.
-  PlatformCanvas(int width, int height, bool is_opaque, HANDLE shared_section);
-#elif defined(__APPLE__)
-  PlatformCanvas(int width, int height, bool is_opaque,
-                 CGContextRef context);
-  PlatformCanvas(int width, int height, bool is_opaque, uint8_t* context);
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-      defined(__sun) || defined(ANDROID)
-  // Linux ---------------------------------------------------------------------
+  // Construct a canvas from the given platform specific data. The data is
+  // not cleared first. @data must be, at least,
+  // @height * StrideForWidth(@width) bytes.

[Alexei Svitkine (slow), 2012/04/16 19:01:44]

Nit: Use pairs of |'s instead of @'s for param names. Also, place the the third
sentence on a new line - otherwise the line breaking looks strange.

+  PlatformCanvas(int width, int height, bool is_opaque, PlatformData data);
 
-  // Construct a canvas from the given memory region. The memory is not cleared
-  // first. @data must be, at least, @height * StrideForWidth(@width) bytes.
-  PlatformCanvas(int width, int height, bool is_opaque, uint8_t* data);
+#if defined(__APPLE__)
+  PlatformCanvas(int width, int height, bool is_opaque, CGContextRef context);
 #endif
 
   virtual ~PlatformCanvas();
 
-#if defined(WIN32)
-  // For two-part init, call if you use the no-argument constructor above. Note
-  // that we want this to optionally match the Linux initialize if you only
-  // pass 3 arguments, hence the evil default argument.
+  // For two-part init, call if you use the no-argument constructor above
   bool initialize(int width, int height, bool is_opaque,
-                  HANDLE shared_section = NULL);
-#elif defined(__APPLE__)
+                  PlatformData data = NULL);
+
+#if defined(__APPLE__)
   // For two-part init, call if you use the no-argument constructor above
   bool initialize(CGContextRef context, int width, int height, bool is_opaque);
-  bool initialize(int width, int height, bool is_opaque, uint8_t* data = NULL);
-
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-      defined(__sun) || defined(ANDROID)
-  // For two-part init, call if you use the no-argument constructor above
-  bool initialize(int width, int height, bool is_opaque, uint8_t* data = NULL);
 #endif
 
   // Shared --------------------------------------------------------------------
 
   // Return the stride (length of a line in bytes) for the given width. Because
   // we use 32-bits per pixel, this will be roughly 4*width. However, for
   // alignment reasons we may wish to increase that.
   static size_t StrideForWidth(unsigned width);
 
   // Allow callers to see the non-virtual function even though we have an
@@ skipping 85 matching lines @@
   PlatformSurface platform_surface_;
 
   // Disallow copy and assign
   ScopedPlatformPaint(const ScopedPlatformPaint&);
   ScopedPlatformPaint& operator=(const ScopedPlatformPaint&);
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_PLATFORM_CANVAS_H_