merge with changes for GPU backend



git-svn-id: http://skia.googlecode.com/svn/trunk@637 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/utils/mac/SkCGUtils.h b/include/utils/mac/SkCGUtils.h
index 3b74b55..b1263f4 100644
--- a/include/utils/mac/SkCGUtils.h
+++ b/include/utils/mac/SkCGUtils.h
@@ -1,10 +1,18 @@
 #ifndef SkCGUtils_DEFINED
 #define SkCGUtils_DEFINED
 
-#include <Carbon/Carbon.h>
+#include "SkTypes.h"
+
+#ifdef SK_BUILD_FOR_MAC
+    #include <Carbon/Carbon.h>
+#else
+    #include <CoreGraphics/CoreGraphics.h>
+#endif
 
 class SkBitmap;
 
 CGImageRef SkCreateCGImageRef(const SkBitmap&);
 
+void SkCGDrawBitmap(CGContextRef, const SkBitmap&, float x, float y);
+
 #endif