From f13c6e113c3fb6ada5ca10686733ad1fa53967fe Mon Sep 17 00:00:00 2001 From: "reed@android.com" Date: Mon, 19 Jan 2009 19:10:24 +0000 Subject: [PATCH] Remove unneeded SK_BUILD_FOR_... checks in SkBitmap.h git-svn-id: http://skia.googlecode.com/svn/trunk@72 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkBitmap.h | 19 ------------------- src/ports/SkFontHost_mac.cpp | 2 ++ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 02c8cd962..96c804d20 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -22,10 +22,6 @@ #include "SkPoint.h" #include "SkRefCnt.h" -#if defined(SK_BUILD_FOR_MAC) -#include -#endif - struct SkIRect; class SkColorTable; class SkPaint; @@ -358,21 +354,6 @@ public: */ inline SkPMColor getIndex8Color(int x, int y) const; - // OS-specific helpers -#ifndef SK_USE_WXWIDGETS -#ifdef SK_BUILD_FOR_WIN - /** On Windows and PocketPC builds, this will draw the SkBitmap onto the - specified HDC - */ - void drawToHDC(HDC, int left, int top) const; -#elif defined(SK_BUILD_FOR_MAC) - /** On Mac OS X and Carbon builds, this will draw the SkBitmap onto the - specified WindowRef - */ - void drawToPort(WindowRef, CGContextRef) const; -#endif -#endif - /** Set dst to be a setset of this bitmap. If possible, it will share the pixel memory, and just point into a subset of it. However, if the config does not support this, a local copy will be made and associated with diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index 4f51dea9d..969808e46 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -14,8 +14,10 @@ ** limitations under the License. */ +#include #include "SkFontHost.h" #include "SkDescriptor.h" +#include "SkPoint.h" // Give 1MB font cache budget #define FONT_CACHE_MEMORY_BUDGET (1024 * 1024)