This commit was manufactured by cvs2svn to create tag 'build'.

git-svn-id: svn://10.0.0.236/tags/build@7070 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/layout/html/base/src/nsImageFrame.h

@@ -1,217 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#ifndef nsImageFrame_h___
-#define nsImageFrame_h___
-
-#include "nsLeafFrame.h"
-#include "nsString.h"
-#include "nsIPresContext.h"
-#include "nsHTMLImageLoader.h"
-#include "nsIImageFrame.h"
-
-#ifdef USE_IMG2
-#include "nsTransform2D.h"
-#include "imgIRequest.h"
-#include "imgIDecoderObserver.h"
-#include "imgIContainerObserver.h"
-#endif
-
-class nsIFrame;
-class nsImageMap;
-class nsIURI;
-class nsILoadGroup;
-struct nsHTMLReflowState;
-struct nsHTMLReflowMetrics;
-struct nsSize;
-
-#ifdef USE_IMG2
-class nsImageFrame;
-
-class nsImageListener : imgIDecoderObserver
-{
-public:
-  nsImageListener();
-  virtual ~nsImageListener();
-
-  NS_DECL_ISUPPORTS
-  NS_DECL_IMGIDECODEROBSERVER
-  NS_DECL_IMGICONTAINEROBSERVER
-
-  void SetFrame(nsImageFrame *frame) { mFrame = frame; }
-
-private:
-  nsImageFrame *mFrame;
-};
-#endif
-
-
-#define ImageFrameSuper nsLeafFrame
-
-class nsImageFrame : public ImageFrameSuper, public nsIImageFrame {
-public:
-  nsImageFrame();
-
-  // nsISupports 
-  NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
-
-  NS_IMETHOD Destroy(nsIPresContext* aPresContext);
-  NS_IMETHOD Init(nsIPresContext*  aPresContext,
-                  nsIContent*      aContent,
-                  nsIFrame*        aParent,
-                  nsIStyleContext* aContext,
-                  nsIFrame*        aPrevInFlow);
-  NS_IMETHOD Paint(nsIPresContext* aPresContext,
-                   nsIRenderingContext& aRenderingContext,
-                   const nsRect& aDirtyRect,
-                   nsFramePaintLayer aWhichLayer);
-  NS_IMETHOD Reflow(nsIPresContext*          aPresContext,
-                    nsHTMLReflowMetrics&     aDesiredSize,
-                    const nsHTMLReflowState& aReflowState,
-                    nsReflowStatus&          aStatus);
-  NS_IMETHOD  GetContentForEvent(nsIPresContext* aPresContext,
-                                 nsEvent* aEvent,
-                                 nsIContent** aContent);
-  NS_IMETHOD HandleEvent(nsIPresContext* aPresContext,
-                        nsGUIEvent* aEvent,
-                        nsEventStatus* aEventStatus);
-  NS_IMETHOD GetCursor(nsIPresContext* aPresContext,
-                       nsPoint& aPoint,
-                       PRInt32& aCursor);
-  NS_IMETHOD AttributeChanged(nsIPresContext* aPresContext,
-                              nsIContent* aChild,
-                              PRInt32 aNameSpaceID,
-                              nsIAtom* aAttribute,
-                              PRInt32 aHint);
-  NS_IMETHOD GetFrameType(nsIAtom** aResult) const;
-  NS_IMETHOD GetIntrinsicImageSize(nsSize& aSize);
-
-  NS_IMETHOD GetNaturalImageSize(PRUint32* naturalWidth, 
-                                 PRUint32 *naturalHeight);
-
-  NS_IMETHOD IsImageComplete(PRBool* aComplete);
-
-#ifdef DEBUG
-  NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler, PRUint32* aResult) const;
-#endif
-
-#ifdef USE_IMG2
-  NS_IMETHOD OnStartDecode(imgIRequest *aRequest, nsIPresContext *aCX);
-  NS_IMETHOD OnStartContainer(imgIRequest *aRequest, nsIPresContext *aCX, imgIContainer *aImage);
-  NS_IMETHOD OnStartFrame(imgIRequest *aRequest, nsIPresContext *aCX, gfxIImageFrame *aFrame);
-  NS_IMETHOD OnDataAvailable(imgIRequest *aRequest, nsIPresContext *aCX, gfxIImageFrame *aFrame, const nsRect * rect);
-  NS_IMETHOD OnStopFrame(imgIRequest *aRequest, nsIPresContext *aCX, gfxIImageFrame *aFrame);
-  NS_IMETHOD OnStopContainer(imgIRequest *aRequest, nsIPresContext *aCX, imgIContainer *aImage);
-  NS_IMETHOD OnStopDecode(imgIRequest *aRequest, nsIPresContext *aCX, nsresult aStatus, const PRUnichar *aStatusArg);
-  NS_IMETHOD FrameChanged(imgIContainer *aContainer, nsIPresContext *aCX, gfxIImageFrame *aNewframe, nsRect *aDirtyRect);
-#endif
-
-protected:
-  // nsISupports
-  NS_IMETHOD_(nsrefcnt) AddRef(void);
-  NS_IMETHOD_(nsrefcnt) Release(void);
-
-  virtual ~nsImageFrame();
-
-  virtual void GetDesiredSize(nsIPresContext* aPresContext,
-                              const nsHTMLReflowState& aReflowState,
-                              nsHTMLReflowMetrics& aDesiredSize);
-
-#ifndef USE_IMG2
-  nsresult UpdateImage(nsIPresContext* aPresContext, PRUint32 aStatus, void* aClosure);
-#endif
-
-  nsImageMap* GetImageMap(nsIPresContext* aPresContext);
-
-  void TriggerLink(nsIPresContext* aPresContext,
-                   const nsString& aURLSpec,
-                   const nsString& aTargetSpec,
-                   PRBool aClick);
-
-  PRBool IsServerImageMap();
-
-  void TranslateEventCoords(nsIPresContext* aPresContext,
-                            const nsPoint& aPoint,
-                            nsPoint& aResult);
-
-  PRBool GetAnchorHREF(nsString& aResult);
-
-  PRIntn GetSuppress();
-
-  void MeasureString(const PRUnichar*     aString,
-                     PRInt32              aLength,
-                     nscoord              aMaxWidth,
-                     PRUint32&            aMaxFit,
-                     nsIRenderingContext& aContext);
-
-  void DisplayAltText(nsIPresContext*      aPresContext,
-                      nsIRenderingContext& aRenderingContext,
-                      const nsString&      aAltText,
-                      const nsRect&        aRect);
-
-  void DisplayAltFeedback(nsIPresContext*      aPresContext,
-                          nsIRenderingContext& aRenderingContext,
-                          PRInt32              aIconId);
-
-  void GetInnerArea(nsIPresContext* aPresContext,
-                    nsRect& aInnerArea) const;
-
-#ifndef USE_IMG2
-  static nsresult UpdateImageFrame(nsIPresContext* aPresContext,
-                                   nsHTMLImageLoader* aLoader,
-                                   nsIFrame* aFrame,
-                                   void* aClosure,
-                                   PRUint32 aStatus);
-#endif
-
-  PRBool CanLoadImage(nsIURI *aURI);
-
-  void GetBaseURI(nsIURI **uri);
-  void GetLoadGroup(nsIPresContext *aPresContext, nsILoadGroup **aLoadGroup);
-
-  nsHTMLImageLoader   mImageLoader;
-  nsHTMLImageLoader * mLowSrcImageLoader;
-  nsImageMap*         mImageMap;
-  PRPackedBool        mSizeConstrained;
-
-#ifdef USE_IMG2
-  PRPackedBool mGotInitialReflow;
-
-  nsCOMPtr<imgIRequest> mImageRequest;
-  nsCOMPtr<imgIRequest> mLowImageRequest;
-
-  nsCOMPtr<imgIDecoderObserver> mListener;
-
-  nsSize mComputedSize;
-  nsSize mIntrinsicSize;
-
-  nsTransform2D mTransform;
-#endif
-
-  PRPackedBool        mSizeFrozen;
-  PRPackedBool        mInitialLoadCompleted;
-  PRPackedBool        mCanSendLoadEvent;
-  nsMargin            mBorderPadding;
-  PRUint32            mNaturalImageWidth, 
-                      mNaturalImageHeight;
-};
-
-#endif /* nsImageFrame_h___ */

mozilla/nglayout.mk

@@ -0,0 +1,171 @@
+#!gmake
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=.
+
+#
+# Command macro defines
+#
+
+CVSCO = cvs -q co -P
+
+THIS_MAKEFILE = nglayout.mk
+
+# Branch tags we use
+NETLIB_BRANCH = 
+LIBPREF_BRANCH = XPCOM_BRANCH
+PLUGIN_BRANCH =
+
+# CVS commands to pull the appropriate branch versions
+CVSCO_LIBPREF = $(CVSCO) -r $(LIBPREF_BRANCH)
+CVSCO_IMGLIB = $(CVSCO)
+CVSCO_NETLIB = $(CVSCO)
+CVSCO_NGLAYOUT = $(CVSCO)
+CVSCO_LIZARD = $(CVSCO)
+CVSCO_PLUGIN = $(CVSCO) -A
+
+# The list of directories that need to be built to build the standalone
+# nglayout test program. The order is important.
+DIRS =				\
+  config			\
+  dbm				\
+  nsprpub			\
+  jpeg				\
+  modules/libreg		\
+  xpcom				\
+  modules/zlib			\
+  modules/libutil		\
+  sun-java			\
+  nav-java			\
+  js				\
+  modules/security/freenav	\
+  modules/libpref		\
+  modules/libimg		\
+  modules/plugin		\
+  base				\
+  lib/xp			\
+  lib/libpwcac			\
+  network			\
+  lib/liblayer/include		\
+  htmlparser			\
+  dom				\
+  gfx				\
+  view				\
+  widget			\
+  layout			\
+  webshell
+
+include $(DEPTH)/config/config.mk
+
+include $(DEPTH)/config/rules.mk
+
+real_all: all
+
+real_export: export
+
+real_libs: libs
+
+real_install: install
+
+real_clobber: clobber
+
+real_depend: depend
+
+#
+# Rules for pulling the source from the cvs repository
+#
+
+pull_all: pull_lizard pull_xpcom pull_imglib pull_netlib pull_nglayout pull_plugin
+
+pull_lizard:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_LIZARD) mozilla/config; \
+	$(CVSCO_LIZARD) mozilla/dbm; \
+	$(CVSCO_LIZARD) mozilla/build/build_number; \
+	$(CVSCO_LIZARD) mozilla/cmd/xfe/icons/icondata.h; \
+	$(CVSCO_LIZARD) mozilla/lib/liblayer; \
+	$(CVSCO_LIZARD) mozilla/modules/zlib; \
+	$(CVSCO_LIZARD) mozilla/modules/libutil; \
+	$(CVSCO_LIZARD) mozilla/nsprpub; \
+	$(CVSCO_LIZARD) mozilla/sun-java; \
+	$(CVSCO_LIZARD) mozilla/nav-java; \
+	$(CVSCO_LIZARD) mozilla/js; \
+	$(CVSCO_LIZARD) mozilla/modules/security/freenav; \
+
+pull_xpcom:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO) -A mozilla/modules/libreg; \
+	$(CVSCO) -A mozilla/xpcom; \
+	$(CVSCO_LIBPREF) mozilla/modules/libpref
+
+pull_imglib:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_IMGLIB) mozilla/jpeg; \
+	$(CVSCO_IMGLIB) mozilla/modules/libutil; \
+	$(CVSCO_IMGLIB) mozilla/modules/libimg 
+
+pull_plugin:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_PLUGIN) mozilla/modules/plugin
+
+pull_netlib:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_NETLIB) mozilla/lib/xp; \
+	$(CVSCO_NETLIB) mozilla/lib/libpwcac; \
+	$(CVSCO_NETLIB) mozilla/network; \
+	$(CVSCO_NETLIB) mozilla/include
+
+pull_nglayout:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_NGLAYOUT) mozilla/base; \
+	$(CVSCO_NGLAYOUT) mozilla/dom; \
+	$(CVSCO_NGLAYOUT) mozilla/gfx; \
+	$(CVSCO_NGLAYOUT) mozilla/htmlparser; \
+	$(CVSCO_NGLAYOUT) mozilla/layout; \
+	$(CVSCO_NGLAYOUT) mozilla/view; \
+	$(CVSCO_NGLAYOUT) mozilla/webshell; \
+	$(CVSCO_NGLAYOUT) mozilla/widget
+
+pull_doc:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_NGLAYOUT) README/nglayout; \
+	$(CVSCO_NGLAYOUT) mozilla/LICENSE; \
+	$(CVSCO_NGLAYOUT) mozilla/LEGAL
+
+######################################################################
+#
+# Build tarball
+
+DATE_CMD=date
+DATE=$(shell $(DATE_CMD) +%Y%m%d)
+
+TAR = tar
+GZIP = gzip
+
+TARBALL = $(MOZ_SRC)/unix-$(DATE).tar
+
+TARFILES = mozilla README/nglayout
+
+tarball: pull_all pull_doc clobber clobber_all real_tar
+
+real_tar:
+	@echo Making $(TARBALL)
+	cd $(MOZ_SRC)/.; \
+	rm -f $(TARBALL) $(TARBALL).gz; \
+	$(TAR) cf $(TARBALL) $(TARFILES)
+	@echo Making gzip of $(TARBALL); \
+	cd $(MOZ_SRC)/.; \
+	$(GZIP) -9 -q $(TARBALL)