Enabling Skia / Moterm to build with PNaCl Newlib toolchain

skia/ext/platform_canvas.h

Index: skia/ext/platform_canvas.h
diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h
index 75458b5dd5401c63e4341395cd9e0bdf47ae4591..c305116bc38e9eac1c3ce5cc8d5dba23dae6d5a9 100644
--- a/skia/ext/platform_canvas.h
+++ b/skia/ext/platform_canvas.h
@@ -35,7 +35,7 @@ enum OnFailureType {
   RETURN_NULL_ON_FAILURE
 };
 
-#if defined(WIN32)
+#if defined(SK_BUILD_FOR_WIN32)

[Mark Seaborn, 2015/12/16 21:20:37]

Nit: you might need to #include include/core/SkPreConfig.h to ensure these are
#defined (to #include-what-you-use).

Or using OS_BLAH rather than SK_BUILD_FOR_BLAH might be preferred for this
non-Skia-repo code.

[Sean Klein, 2015/12/16 22:34:03]

Going with the "#include" option for now.

   // The shared_section parameter is passed to gfx::PlatformDevice::create.
   // See it for details.
   SK_API SkCanvas* CreatePlatformCanvas(int width,
@@ -51,7 +51,7 @@ enum OnFailureType {
                                   int x,
                                   int y,
                                   const RECT* src_rect);
-#elif defined(__APPLE__)
+#elif defined(SK_BUILD_FOR_MAC)
   SK_API SkCanvas* CreatePlatformCanvas(CGContextRef context,
                                         int width,
                                         int height,
@@ -63,8 +63,7 @@ enum OnFailureType {
                                         bool is_opaque,
                                         uint8_t* context,
                                         OnFailureType failure_type);
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-      defined(__sun) || defined(ANDROID)
+#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_UNIX)
   // Linux ---------------------------------------------------------------------
 
   // Construct a canvas from the given memory region. The memory is not cleared