#301064

r=mkaply, sr=mkaply (OS/2 only)
Patch from Andy Willis - add _declspec(dllexport/dllimport) for OS/2
Instead of adding NS_GFX to nsRegionImpl, moving region code into OS/2 (we're the only consumer)

gfx/src/Makefile.in

@@ -123,7 +123,7 @@ ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
 REQUIRES += uconv
 endif
 
-ifneq (,$(filter gtk gtk2 xlib os2,$(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += \
         nsRegionImpl.cpp \
         $(NULL)

gfx/src/os2/nsRegionOS2.cpp

@@ -34,22 +34,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsGfxDefs.h"
 #include "nsRegionOS2.h"
-
-
-NS_IMPL_ISUPPORTS1(nsRegionOS2, nsIRegion)
+#include "nsGfxDefs.h"
 
 nsRegionOS2::nsRegionOS2() 
 {  
 }
 
-// Do not use GetNativeRegion on OS/2. Regions are device specific. Use GetHRGN () instead.
-nsresult nsRegionOS2::GetNativeRegion (void *&aRegion) const
-{
-  aRegion = (void*)RGN_ERROR;
-  return NS_OK;
-}
+NS_IMPL_ISUPPORTS1(nsRegionOS2, nsIRegion)
 
 PRUint32 nsRegionOS2::NumOfRects (HPS aPS, HRGN aRegion) const
 {
@@ -117,3 +109,162 @@ nsresult nsRegionOS2::InitWithHRGN (HRGN SrcRegion, PRUint32 SrcHeight, HPS SrcP
 
   return NS_OK;
 }
+
+nsresult nsRegionOS2::Init (void)
+{
+  mRegion.SetEmpty ();
+  return NS_OK;
+}
+
+void nsRegionOS2::SetTo (const nsIRegion &aRegion)
+{
+  const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion);
+  mRegion = pRegion->mRegion;
+}
+
+void nsRegionOS2::SetTo (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  mRegion = nsRect (aX, aY, aWidth, aHeight);
+}
+
+void nsRegionOS2::Intersect (const nsIRegion &aRegion)
+{
+  const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion);
+  mRegion.And (mRegion, pRegion->mRegion);
+}
+
+void nsRegionOS2::Intersect (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  mRegion.And (mRegion, nsRect (aX, aY, aWidth, aHeight));
+}
+
+void nsRegionOS2::Union (const nsIRegion &aRegion)
+{
+  const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion);
+  mRegion.Or (mRegion, pRegion->mRegion);
+}
+
+void nsRegionOS2::Union (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  mRegion.Or (mRegion, nsRect (aX, aY, aWidth, aHeight));
+}
+
+void nsRegionOS2::Subtract (const nsIRegion &aRegion)
+{
+  const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion);
+  mRegion.Sub (mRegion, pRegion->mRegion);
+}
+
+void nsRegionOS2::Subtract (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  mRegion.Sub (mRegion, nsRect (aX, aY, aWidth, aHeight));
+}
+
+PRBool nsRegionOS2::IsEmpty (void)
+{
+  return mRegion.IsEmpty ();
+}
+
+PRBool nsRegionOS2::IsEqual (const nsIRegion &aRegion)
+{
+  const nsRegionOS2* pRegion = NS_STATIC_CAST (const nsRegionOS2*, &aRegion);
+  return mRegion.IsEqual (pRegion->mRegion);
+}
+
+void nsRegionOS2::GetBoundingBox (PRInt32 *aX, PRInt32 *aY, PRInt32 *aWidth, PRInt32 *aHeight)
+{
+  const nsRect& BoundRect = mRegion.GetBounds();
+  *aX = BoundRect.x;
+  *aY = BoundRect.y;
+  *aWidth  = BoundRect.width;
+  *aHeight = BoundRect.height;
+}
+
+void nsRegionOS2::Offset (PRInt32 aXOffset, PRInt32 aYOffset)
+{
+  mRegion.MoveBy (aXOffset, aYOffset);
+}
+
+PRBool nsRegionOS2::ContainsRect (PRInt32 aX, PRInt32 aY, PRInt32 aWidth, PRInt32 aHeight)
+{
+  nsRegion TmpRegion;
+  TmpRegion.And (mRegion, nsRect (aX, aY, aWidth, aHeight));
+  return (!TmpRegion.IsEmpty ());
+}
+
+nsresult nsRegionOS2::GetRects (nsRegionRectSet **aRects)
+{
+  if (!aRects)
+    return NS_ERROR_NULL_POINTER;
+
+  nsRegionRectSet* pRegionSet = *aRects;
+  PRUint32 NumRects = mRegion.GetNumRects ();
+
+  if (!pRegionSet)                          // Not yet allocated
+  {
+    PRUint8* pBuf = new PRUint8 [sizeof (nsRegionRectSet) + NumRects * sizeof (nsRegionRect)];
+    pRegionSet = NS_REINTERPRET_CAST (nsRegionRectSet*, pBuf);
+    pRegionSet->mRectsLen = NumRects + 1;
+  } else                                    // Already allocated in previous call
+  {
+    if (NumRects > pRegionSet->mRectsLen)   // passed array is not big enough - reallocate it.
+    {
+      delete [] NS_REINTERPRET_CAST (PRUint8*, pRegionSet);
+      PRUint8* pBuf = new PRUint8 [sizeof (nsRegionRectSet) + NumRects * sizeof (nsRegionRect)];
+      pRegionSet = NS_REINTERPRET_CAST (nsRegionRectSet*, pBuf);
+      pRegionSet->mRectsLen = NumRects + 1;
+    }
+  }
+  pRegionSet->mNumRects = NumRects;
+  *aRects = pRegionSet;
+
+
+  nsRegionRectIterator ri (mRegion);
+  nsRegionRect* pDest = &pRegionSet->mRects [0];
+  const nsRect* pSrc;
+
+  while ((pSrc = ri.Next ()) != nsnull)
+  {
+    pDest->x = pSrc->x;
+    pDest->y = pSrc->y;
+    pDest->width  = pSrc->width;
+    pDest->height = pSrc->height;
+
+    ++pDest;
+  }
+
+  return NS_OK;
+}
+
+nsresult nsRegionOS2::FreeRects (nsRegionRectSet *aRects)
+{
+  if (!aRects)
+    return NS_ERROR_NULL_POINTER;
+
+  delete [] NS_REINTERPRET_CAST (PRUint8*, aRects);
+  return NS_OK;
+}
+
+nsresult nsRegionOS2::GetNativeRegion (void *&aRegion) const
+{
+  aRegion = RGN_ERROR;
+  return NS_OK;
+}
+
+nsresult nsRegionOS2::GetRegionComplexity (nsRegionComplexity &aComplexity) const
+{
+  switch (mRegion.GetNumRects ())
+  {
+    case 0:   aComplexity = eRegionComplexity_empty;    break;
+    case 1:   aComplexity = eRegionComplexity_rect;     break;
+    default:  aComplexity = eRegionComplexity_complex;  break;
+  }
+
+  return NS_OK;
+}
+
+nsresult nsRegionOS2::GetNumRects (PRUint32 *aRects) const
+{
+  *aRects = mRegion.GetNumRects ();
+  return NS_OK;
+}

gfx/src/os2/nsRegionOS2.h

@@ -1,63 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Dainis Jonitis, <Dainis_Jonitis@swh-t.lv>.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-#ifndef _nsRegionOS2_h
-#define _nsRegionOS2_h
-
-#include "nsRegionImpl.h"
-
-
-class nsRegionOS2 : public nsRegionImpl
-{
-  PRUint32 NumOfRects (HPS aPS, HRGN aRegion) const;
-
-public:
-  nsRegionOS2 ();
-
-  NS_DECL_ISUPPORTS
-
-  NS_IMETHOD GetNativeRegion(void *&aRegion) const;    // Don't use this on OS/2 - Use GetHRGN () instead
- 
-  // OS/2 specific
-  // get region in widget's coord space for given device
-  HRGN GetHRGN (PRUint32 ulHeight, HPS hps);
-
-  // copy from another region defined in aWidget's space for a given device
-  nsresult InitWithHRGN (HRGN copy, PRUint32 ulHeight, HPS hps);
-};
-
-#endif