Enabling Skia / Moterm to build with PNaCl Newlib toolchain

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_
 
 // The platform-specific device will include the necessary platform headers
 // to get the surface type.
 #include "base/basictypes.h"
@@ skipping 17 matching lines @@
 //  To allow the caller to handle the failure, every Create... factory takes an
 //  enum as its last parameter. The default value is kCrashOnFailure. If the
 //  caller passes kReturnNullOnFailure, then the caller is responsible to check
 //  the return result.
 //
 enum OnFailureType {
   CRASH_ON_FAILURE,
   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,
                                         int height,
                                         bool is_opaque,
                                         HANDLE shared_section,
                                         OnFailureType failure_type);
 
   // Draws the top layer of the canvas into the specified HDC. Only works
   // with a PlatformCanvas with a BitmapPlatformDevice.
   SK_API void DrawToNativeContext(SkCanvas* canvas,
                                   HDC hdc,
                                   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,
                                         bool is_opaque,
                                         OnFailureType failure_type);
 
   SK_API SkCanvas* CreatePlatformCanvas(int width,
                                         int height,
                                         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
   // first. @data must be, at least, @height * StrideForWidth(@width) bytes.
   SK_API SkCanvas* CreatePlatformCanvas(int width,
                                         int height,
                                         bool is_opaque,
                                         uint8_t* data,
                                         OnFailureType failure_type);
 #endif
@@ skipping 100 matching lines @@
   SkBitmap bitmap_;
   PlatformSurface surface_;  // initialized to 0
   intptr_t platform_extra_;  // platform specific, initialized to 0
 
   DISALLOW_COPY_AND_ASSIGN(PlatformBitmap);
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_PLATFORM_CANVAS_H_