Patch for Solaris support, mostly ifdefs and header files, plus adds libevent configuration.

BUG=30101
TEST=compiles

Review URL: http://codereview.chromium.org/7238021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90494 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 15 insertions, 15 deletions

diff --git a/skia/ext/bitmap_platform_device.h b/skia/ext/bitmap_platform_device.h
index 69bf407..8063173 100644
--- a/skia/ext/bitmap_platform_device.h
+++ b/skia/ext/bitmap_platform_device.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -13,7 +13,7 @@
 #include "skia/ext/bitmap_platform_device_win.h"
 #elif defined(__APPLE__)
 #include "skia/ext/bitmap_platform_device_mac.h"
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
 #include "skia/ext/bitmap_platform_device_linux.h"
 #endif
 
diff --git a/skia/ext/bitmap_platform_device_data.h b/skia/ext/bitmap_platform_device_data.h
index ff9b74f..81e81ed7 100644
--- a/skia/ext/bitmap_platform_device_data.h
+++ b/skia/ext/bitmap_platform_device_data.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -12,7 +12,7 @@ namespace skia {
 class BitmapPlatformDevice::BitmapPlatformDeviceData :
 #if defined(WIN32) || defined(__APPLE__)
     public SkRefCnt {
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
     // These objects are reference counted and own a Cairo surface. The surface
     // is the backing store for a Skia bitmap and we reference count it so that
     // we can copy BitmapPlatformDevice objects without having to copy all the
@@ -25,13 +25,13 @@ class BitmapPlatformDevice::BitmapPlatformDeviceData :
   typedef HBITMAP PlatformContext;
 #elif defined(__APPLE__)
   typedef CGContextRef PlatformContext;
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
   typedef cairo_t* PlatformContext;
 #endif
 
 #if defined(WIN32) || defined(__APPLE__)
   explicit BitmapPlatformDeviceData(PlatformContext bitmap);
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
   explicit BitmapPlatformDeviceData(cairo_surface_t* surface);
 #endif
 
@@ -64,7 +64,7 @@ class BitmapPlatformDevice::BitmapPlatformDeviceData :
   }
 
  private:
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
   friend class base::RefCounted<BitmapPlatformDeviceData>;
 #endif
   virtual ~BitmapPlatformDeviceData();
@@ -75,7 +75,7 @@ class BitmapPlatformDevice::BitmapPlatformDeviceData :
 #if defined(WIN32)
   // Lazily-created DC used to draw into the bitmap, see GetBitmapDC().
   HDC hdc_;
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
   cairo_surface_t *const surface_;
 #endif
 
diff --git a/skia/ext/canvas_paint.h b/skia/ext/canvas_paint.h
index de7c244..f052fb5 100644
--- a/skia/ext/canvas_paint.h
+++ b/skia/ext/canvas_paint.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -13,7 +13,7 @@
 #include "skia/ext/canvas_paint_win.h"
 #elif defined(__APPLE__)
 #include "skia/ext/canvas_paint_mac.h"
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
 #include "skia/ext/canvas_paint_linux.h"
 #endif
 
diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h
index d9afb77..7197ae93 100644
--- a/skia/ext/platform_canvas.h
+++ b/skia/ext/platform_canvas.h
@@ -34,7 +34,7 @@ class SK_API PlatformCanvas : public SkCanvas {
                  CGContextRef context);
   PlatformCanvas(int width, int height, bool is_opaque, uint8_t* context);
 #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-      defined(__Solaris__)
+      defined(__sun)
   // Linux ---------------------------------------------------------------------
 
   // Construct a canvas from the given memory region. The memory is not cleared
@@ -56,7 +56,7 @@ class SK_API PlatformCanvas : public SkCanvas {
   bool initialize(int width, int height, bool is_opaque, uint8_t* data = NULL);
 
 #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-      defined(__Solaris__)
+      defined(__sun)
   // 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
diff --git a/skia/ext/platform_device.h b/skia/ext/platform_device.h
index 81e475d..6b3afb1 100644
--- a/skia/ext/platform_device.h
+++ b/skia/ext/platform_device.h
@@ -20,7 +20,7 @@
 class SkDevice;
 struct SkIRect;
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
 typedef struct _cairo cairo_t;
 typedef struct _cairo_rectangle cairo_rectangle_t;
 #elif defined(__APPLE__)
@@ -35,7 +35,7 @@ class PlatformDevice;
 #if defined(WIN32)
 typedef HDC PlatformSurface;
 typedef RECT PlatformRect;
-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
 typedef cairo_t* PlatformSurface;
 typedef cairo_rectangle_t PlatformRect;
 #elif defined(__APPLE__)
@@ -66,7 +66,7 @@ SK_API PlatformDevice* GetPlatformDevice(SkDevice* device);
 #elif defined(__APPLE__)
 #include "skia/ext/platform_device_mac.h"
 #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-      defined(__Solaris__)
+      defined(__sun)
 #include "skia/ext/platform_device_linux.h"
 #endif