From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 2 Jun 2011 12:07:03 +0100
Subject: Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
---
 Source/WebCore/platform/graphics/Path.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Source/WebCore/platform/graphics/Path.h')

diff --git a/Source/WebCore/platform/graphics/Path.h b/Source/WebCore/platform/graphics/Path.h
index c2ca576..9c07247 100644
--- a/Source/WebCore/platform/graphics/Path.h
+++ b/Source/WebCore/platform/graphics/Path.h
@@ -28,10 +28,11 @@
 #ifndef Path_h
 #define Path_h
 
+#include "RoundedIntRect.h"
 #include <wtf/FastAllocBase.h>
 #include <wtf/Forward.h>
 
-#if PLATFORM(CG)
+#if USE(CG)
 typedef struct CGPath PlatformPath;
 #elif PLATFORM(OPENVG)
 namespace WebCore {
@@ -44,7 +45,7 @@ typedef QPainterPath PlatformPath;
 #elif PLATFORM(WX) && USE(WXGC)
 class wxGraphicsPath;
 typedef wxGraphicsPath PlatformPath;
-#elif PLATFORM(CAIRO)
+#elif USE(CAIRO)
 namespace WebCore {
 class CairoPath;
 }
@@ -137,6 +138,7 @@ namespace WebCore {
         void addEllipse(const FloatRect&);
         void addRoundedRect(const FloatRect&, const FloatSize& roundingRadii);
         void addRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
+        void addRoundedRect(const RoundedIntRect&);
 
         void translate(const FloatSize&);
 
-- 
cgit v1.1