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/IntRect.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/IntRect.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/IntRect.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/IntRect.h b/Source/WebCore/platform/graphics/IntRect.h index c413e7a..d2b348b 100644 --- a/Source/WebCore/platform/graphics/IntRect.h +++ b/Source/WebCore/platform/graphics/IntRect.h @@ -29,7 +29,7 @@ #include "IntPoint.h" #include <wtf/Vector.h> -#if PLATFORM(CG) +#if USE(CG) || USE(SKIA_ON_MAC_CHROME) typedef struct CGRect CGRect; #endif @@ -133,6 +133,11 @@ public: setHeight(std::max(0, height() + delta)); } + IntPoint minXMinYCorner() const { return m_location; } // typically topLeft + IntPoint maxXMinYCorner() const { return IntPoint(m_location.x() + m_size.width(), m_location.y()); } // typically topRight + IntPoint minXMaxYCorner() const { return IntPoint(m_location.x(), m_location.y() + m_size.height()); } // typically bottomLeft + IntPoint maxXMaxYCorner() const { return IntPoint(m_location.x() + m_size.width(), m_location.y() + m_size.height()); } // typically bottomRight + bool intersects(const IntRect&) const; bool contains(const IntRect&) const; @@ -144,6 +149,7 @@ public: void intersect(const IntRect&); void unite(const IntRect&); + void uniteIfNonZero(const IntRect&); void inflateX(int dx) { @@ -182,7 +188,7 @@ public: operator Eina_Rectangle() const; #endif -#if PLATFORM(CG) +#if USE(CG) || USE(SKIA_ON_MAC_CHROME) operator CGRect() const; #endif @@ -228,7 +234,7 @@ inline bool operator!=(const IntRect& a, const IntRect& b) return a.location() != b.location() || a.size() != b.size(); } -#if PLATFORM(CG) +#if USE(CG) || USE(SKIA_ON_MAC_CHROME) IntRect enclosingIntRect(const CGRect&); #endif |