Bug 620658: Add nsRegion::Contains(nsRegion). sr=roc

gfx/src/nsRegion.cpp

@@ -1013,6 +1013,18 @@ PRBool nsRegion::Contains (const nsRect& aRect) const
   return tmpRgn.IsEmpty();
 }
 
+PRBool nsRegion::Contains (const nsRegion& aRgn) const
+{
+  // XXX this could be made faster
+  nsRegionRectIterator iter(aRgn);
+  while (const nsRect* r = iter.Next()) {
+    if (!Contains (*r)) {
+      return PR_FALSE;
+    }
+  }
+  return PR_TRUE;
+}
+
 PRBool nsRegion::Intersects (const nsRect& aRect) const
 {
   if (aRect.IsEmpty() || IsEmpty())

gfx/src/nsRegion.h

@@ -160,6 +160,7 @@ public:
   }
 
   PRBool Contains (const nsRect& aRect) const;
+  PRBool Contains (const nsRegion& aRgn) const;
   PRBool Intersects (const nsRect& aRect) const;
 
   void MoveBy (PRInt32 aXOffset, PRInt32 aYOffset)
@@ -400,6 +401,10 @@ public:
   {
     return mImpl.Contains (ToRect (aRect));
   }
+  PRBool Contains (const nsIntRegion& aRgn) const
+  {
+    return mImpl.Contains (aRgn.mImpl);
+  }
   PRBool Intersects (const nsIntRect& aRect) const
   {
     return mImpl.Intersects (ToRect (aRect));