From f912b6f62505f60109e7300787c93111dbd70560 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 17 Dec 2009 13:32:53 +0000 Subject: Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android. Skia is used by Chromium, which defines PLATFORM(SKIA). Android also uses Skia, but currently defines PLATFORM(SGL) to account for platform-specific differences between Android and Chromum. We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL). Platform-specific differences are achieved with PLATFORM(ANDROID) guards. This reduces our diff with webkit.org. Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb --- WebCore/platform/graphics/FloatPoint.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebCore/platform/graphics/FloatPoint.h') diff --git a/WebCore/platform/graphics/FloatPoint.h b/WebCore/platform/graphics/FloatPoint.h index 7d32bcf..45a1e83 100644 --- a/WebCore/platform/graphics/FloatPoint.h +++ b/WebCore/platform/graphics/FloatPoint.h @@ -100,7 +100,7 @@ public: operator BPoint() const; #endif -#if (PLATFORM(SKIA) || PLATFORM(SGL)) +#if PLATFORM(SKIA) operator SkPoint() const; FloatPoint(const SkPoint&); #endif -- cgit v1.1