container work

gfx2/src/windows/nsImageContainer.cpp

@@ -31,11 +31,13 @@ nsImageContainer::nsImageContainer()
 {
   NS_INIT_ISUPPORTS();
   /* member initializers and constructor code */
+  mCurrentFrame = 0;
 }
 
 nsImageContainer::~nsImageContainer()
 {
   /* destructor code */
+  mFrames.Clear();
 }
 
 
@@ -72,25 +74,30 @@ NS_IMETHODIMP nsImageContainer::GetHeight(gfx_dimension *aHeight)
 /* readonly attribute nsIImageFrame currentFrame; */
 NS_IMETHODIMP nsImageContainer::GetCurrentFrame(nsIImageFrame * *aCurrentFrame)
 {
-    return NS_ERROR_NOT_IMPLEMENTED;
+  return this->GetFrameAt(mCurrentFrame, aCurrentFrame);
 }
 
 /* readonly attribute unsigned long numFrames; */
 NS_IMETHODIMP nsImageContainer::GetNumFrames(PRUint32 *aNumFrames)
 {
-    return NS_ERROR_NOT_IMPLEMENTED;
+  return mFrames.Count(aNumFrames);
 }
 
 /* nsIImageFrame getFrameAt (in unsigned long index); */
 NS_IMETHODIMP nsImageContainer::GetFrameAt(PRUint32 index, nsIImageFrame **_retval)
 {
-    return NS_ERROR_NOT_IMPLEMENTED;
+  nsISupports *sup = mFrames.ElementAt(index);
+  if (!sup)
+    return NS_ERROR_FAILURE;
+
+  *_retval = NS_REINTERPRET_CAST(nsIImageFrame *, sup);
+  return NS_OK;
 }
 
 /* void appendFrame (in nsIImageFrame item); */
 NS_IMETHODIMP nsImageContainer::AppendFrame(nsIImageFrame *item)
 {
-    return NS_ERROR_NOT_IMPLEMENTED;
+    return mFrames.AppendElement(NS_REINTERPRET_CAST(nsISupports*, item));
 }
 
 /* void removeFrame (in nsIImageFrame item); */
@@ -108,5 +115,5 @@ NS_IMETHODIMP nsImageContainer::Enumerate(nsIEnumerator **_retval)
 /* void clear (); */
 NS_IMETHODIMP nsImageContainer::Clear()
 {
-    return NS_ERROR_NOT_IMPLEMENTED;
+  return mFrames.Clear();
 }

gfx2/src/windows/nsImageContainer.h

@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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 Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsIImageContainer.h"
-
-#include "nsSize2.h"
-
-#define NS_IMAGECONTAINER_CID \
-{ /* aa699204-1dd1-11b2-84a9-a280c268e4fb */         \
-     0xaa699204,                                     \
-     0x1dd1,                                         \
-     0x11b2,                                         \
-    {0x84, 0xa9, 0xa2, 0x80, 0xc2, 0x68, 0xe4, 0xfb} \
-}
-
-class nsImageContainer : public nsIImageContainer
-{
-public:
-  NS_DECL_ISUPPORTS
-  NS_DECL_NSIIMAGECONTAINER
-
-  nsImageContainer();
-  virtual ~nsImageContainer();
-
-private:
-  /* additional members */
-  nsSize2 mSize;
-};
-