From 269180e1b0159da91dd87080cd768d0f5aad443b Mon Sep 17 00:00:00 2001
From: "pavlov%netscape.com" <pavlov%netscape.com>
Date: Tue, 23 Jan 2001 20:46:36 +0000
Subject: [PATCH] adding imageframe/container to xlib

---
 gfx2/src/xlib/Makefile.in                     | 55 -------------------
 gfx2/src/xlib/nsGfxFactory.cpp                | 42 --------------
 .../{nsImage.cpp => nsImageContainer.cpp}     |  0
 .../xlib/{nsImage.h => nsImageContainer.h}    |  0
 gfx2/src/xlib/nsImageFrame.cpp                |  0
 gfx2/src/xlib/nsImageFrame.h                  |  0
 6 files changed, 97 deletions(-)
 rename gfx2/src/xlib/{nsImage.cpp => nsImageContainer.cpp} (100%)
 rename gfx2/src/xlib/{nsImage.h => nsImageContainer.h} (100%)
 create mode 100644 gfx2/src/xlib/nsImageFrame.cpp
 create mode 100644 gfx2/src/xlib/nsImageFrame.h

diff --git a/gfx2/src/xlib/Makefile.in b/gfx2/src/xlib/Makefile.in
index 2d71ddeccf8..e69de29bb2d 100644
--- a/gfx2/src/xlib/Makefile.in
+++ b/gfx2/src/xlib/Makefile.in
@@ -1,55 +0,0 @@
-# 
-# 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) 2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-#    Stuart Parmenter <pavlov@netscape.com>
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= gfx2
-LIBRARY_NAME	= gfx2
-IS_COMPONENT	= 1
-
-CPPSRCS		= \
-		nsGfxFactory.cpp \
-		nsImage.cpp \
-		$(NULL)
-
-SHARED_LIBRARY_LIBS = $(DIST)/lib/libgfx_base.a
-
-include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += -L$(DIST)/bin
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-CXXFLAGS	+= $(TK_CFLAGS)
-
-EXTRA_DSO_LDOPTS += \
-		$(NSPR_LIBS)	\
-		-lxpcom		\
-		$(NULL)
-
-ifeq ($(OS_ARCH), Linux)
-DEFINES         += -D_BSD_SOURCE
-endif
-
diff --git a/gfx2/src/xlib/nsGfxFactory.cpp b/gfx2/src/xlib/nsGfxFactory.cpp
index 2152b765bb0..e69de29bb2d 100644
--- a/gfx2/src/xlib/nsGfxFactory.cpp
+++ b/gfx2/src/xlib/nsGfxFactory.cpp
@@ -1,42 +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) 2000 Netscape Communications Corporation. All
- * Rights Reserved.
- * 
- * Contributor(s): 
- *   Stuart Parmenter <pavlov@netscape.com>
- */
-
-#include "nsIGenericFactory.h"
-#include "nsIModule.h"
-
-#include "nsImage.h"
-
-// objects that just require generic constructors
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsImage)
-
-static nsModuleComponentInfo components[] =
-{
-  { "xlib image",
-    NS_IMAGE_CID,
-    "@mozilla.org/gfx/image;2",
-    nsImageConstructor, },
-};
-
-NS_IMPL_NSGETMODULE("nsGfx2Module", components)
-
diff --git a/gfx2/src/xlib/nsImage.cpp b/gfx2/src/xlib/nsImageContainer.cpp
similarity index 100%
rename from gfx2/src/xlib/nsImage.cpp
rename to gfx2/src/xlib/nsImageContainer.cpp
diff --git a/gfx2/src/xlib/nsImage.h b/gfx2/src/xlib/nsImageContainer.h
similarity index 100%
rename from gfx2/src/xlib/nsImage.h
rename to gfx2/src/xlib/nsImageContainer.h
diff --git a/gfx2/src/xlib/nsImageFrame.cpp b/gfx2/src/xlib/nsImageFrame.cpp
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/gfx2/src/xlib/nsImageFrame.h b/gfx2/src/xlib/nsImageFrame.h
new file mode 100644
index 00000000000..e69de29bb2d