diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/platform/graphics/FloatRect.h | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/platform/graphics/FloatRect.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/FloatRect.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/FloatRect.h b/Source/WebCore/platform/graphics/FloatRect.h index bd23476..493c068 100644 --- a/Source/WebCore/platform/graphics/FloatRect.h +++ b/Source/WebCore/platform/graphics/FloatRect.h @@ -29,7 +29,7 @@ #include "FloatPoint.h" -#if PLATFORM(CG) +#if USE(CG) || USE(SKIA_ON_MAC_CHROME) typedef struct CGRect CGRect; #endif @@ -59,7 +59,7 @@ class BRect; struct SkRect; #endif -#if PLATFORM(CAIRO) +#if USE(CAIRO) typedef struct _cairo_rectangle cairo_rectangle_t; #endif @@ -112,6 +112,7 @@ public: void intersect(const FloatRect&); void unite(const FloatRect&); + void uniteIfNonZero(const FloatRect&); // Note, this doesn't match what IntRect::contains(IntPoint&) does; the int version // is really checking for containment of 1x1 rect, but that doesn't make sense with floats. @@ -136,7 +137,7 @@ public: void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2); void fitToPoints(const FloatPoint& p0, const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& p3); -#if PLATFORM(CG) +#if USE(CG) || USE(SKIA_ON_MAC_CHROME) FloatRect(const CGRect&); operator CGRect() const; #endif @@ -172,7 +173,7 @@ public: operator VGRect() const; #endif -#if PLATFORM(CAIRO) +#if USE(CAIRO) FloatRect(const cairo_rectangle_t&); operator cairo_rectangle_t() const; #endif |