branch

git-svn-id: svn://10.0.0.236/branches/IMGLIB2_NEWSTUFF@91714 18797224-902f-48f8-a5cc-f745e15eee43

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

@@ -0,0 +1,217 @@
+/* -*- 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/tools/tinderbox-configs/firefox/win32/CLOBBER

@@ -1 +0,0 @@
-Another clobber to see about the orange... :(

mozilla/tools/tinderbox-configs/firefox/win32/mozconfig

@@ -1,26 +0,0 @@
-#
-## hostname: gaius
-## uname: WINNT GAIUS 5.2 3790 xx I386
-#
-
-
-# . $topsrcdir/browser/config/mozconfig
-
-mk_add_options MOZ_CO_PROJECT=browser
-##mk_add_options MOZ_MAKE_FLAGS="-j8"
-#mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
-mk_add_options MOZ_PACKAGE_NSIS=1
-
-ac_add_options --enable-application=browser
-ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-# ac_add_options --enable-codesighs
-ac_add_options --enable-tests
-ac_add_options --disable-static
-# ac_add_options --disable-shared
-# ac_add_options --enable-official-branding
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-default-toolkit=cairo-windows
-#ac_add_options --enable-update-packaging

mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl

@@ -1,254 +0,0 @@
-#
-## hostname: gaius
-## uname: WINNT GAIUS 5.2 3790 xx I386
-#
-
-#- tinder-config.pl - Tinderbox configuration file.
-#-    Uncomment the variables you need to set.
-#-    The default values are the same as the commented variables.
-
-$ENV{MOZ_INSTALLER_USE_7ZIP} = '1';
-$ENV{NO_EM_RESTART} = '1';
-$ENV{MOZ_PACKAGE_NSIS} = '1';
-
-# $ENV{MOZ_PACKAGE_MSI}
-#-----------------------------------------------------------------------------
-#  Default: 0
-#   Values: 0 | 1
-#  Purpose: Controls whether a MSI package is made.
-# Requires: Windows and a local MakeMSI installation.
-#$ENV{MOZ_PACKAGE_MSI} = 0;
-
-# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
-#-----------------------------------------------------------------------------
-#  Default: scp
-#   Values: scp | rsync
-#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
-# Requires: The selected type requires the command be available both locally
-#           and on the Talkback server.
-#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
-
-#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
-$BuildAdministrator = 'build@mozilla.org';
-#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
-
-$BuildXForms = 1;
-
-#- You'll need to change these to suit your machine's needs
-#$DisplayServer = ':0.0';
-
-#- Default values of command-line opts
-#-
-#$BuildDepend       = 1;      # Depend or Clobber
-#$BuildDebug        = 0;      # Debug or Opt (Darwin)
-#$ReportStatus      = 1;      # Send results to server, or not
-#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
-#$UseTimeStamp      = 1;      # Use the CVS 'pull-by-timestamp' option, or not
-#$BuildOnce         = 0;      # Build once, don't send results to server
-#$TestOnly          = 0;      # Only run tests, don't pull/build
-#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
-#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
-#$BuildLocales      = 0;      # Do l10n packaging?
-
-# Tests
-$CleanProfile             = 1;
-#$ResetHomeDirForTests     = 1;
-$ProductName              = "Firefox";
-$VendorName               = "Mozilla";
-
-$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
-$RegxpcomTest             = 0;
-$AliveTest                = 0;
-#$JavaTest                 = 0;
-#$ViewerTest               = 0;
-#$BloatTest                = 0;  # warren memory bloat test
-#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
-#$DomToTextConversionTest  = 0;  
-#$XpcomGlueTest            = 0;
-$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
-$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
-#$MailBloatTest            = 0;
-#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
-$LayoutPerformanceTest    = 0;  # Tp
-#$DHTMLPerformanceTest     = 0;  # Tdhtml
-#$QATest                   = 0;  
-$XULWindowOpenTest        = 0;  # Txul
-#$StartupPerformanceTest   = 1;  # Ts
-#$NeckoUnitTest            = 0;
-$RenderPerformanceTest     = 0;  # Tgfx
-
-$RunUnitTests = 1;
-
-$TestsPhoneHome           = 1;  # Should test report back to server?
-$GraphNameOverride        = 'fxexp-win32-tbox';
-
-# $results_server
-#----------------------------------------------------------------------------
-# Server on which test results will be accessible.  This was originally tegu,
-# then became axolotl.  Once we moved services from axolotl, it was time
-# to give this service its own hostname to make future transitions easier.
-# - cmp@mozilla.org
-#$results_server           = "build-graphs.mozilla.org";
-
-$pageload_server          = "pageload.build.mozilla.org";  # localhost
-
-#
-# Timeouts, values are in seconds.
-#
-#$CVSCheckoutTimeout               = 3600;
-#$CreateProfileTimeout             = 45;
-#$RegxpcomTestTimeout              = 120;
-
-#$AliveTestTimeout                 = 30;
-#$ViewerTestTimeout                = 45;
-#$EmbedTestTimeout                 = 45;
-#$BloatTestTimeout                 = 120;   # seconds
-#$MailBloatTestTimeout             = 120;   # seconds
-#$JavaTestTimeout                  = 45;
-#$DomTestTimeout	                  = 45;    # seconds
-#$XpcomGlueTestTimeout             = 15;
-#$CodesizeTestTimeout              = 900;     # seconds
-#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
-$LayoutPerformanceTestTimeout     = 800;  # entire test, seconds
-#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
-#$QATestTimeout                    = 1200;   # entire test, seconds
-#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
-#$StartupPerformanceTestTimeout    = 20;    # seconds
-#$XULWindowOpenTestTimeout	      = 90;   # seconds
-#$NeckoUnitTestTimeout             = 30;    # seconds
-$RenderPerformanceTestTimeout     = 1800;  # seconds
-
-#$MozConfigFileName = 'mozconfig';
-
-#$UseMozillaProfile = 1;
-#$MozProfileName = 'default';
-
-#- Set these to what makes sense for your system
-$Make          = 'make';       # Must be GNU make
-#$MakeOverrides = '';
-#$mail          = '/bin/mail';
-#$CVS           = 'cvs -q';
-#$CVSCO         = 'checkout -P';
-
-# win32 usually doesn't have /bin/mail
-$blat           = 'd:/moztools/bin/blat.exe';
-$use_blat       = 1;
-
-# Set moz_cvsroot to something like:
-# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
-# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
-#
-# Note that win32 may not need \@, depends on ' or ".
-# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
-
-#$moz_cvsroot   = $ENV{CVSROOT};
-$moz_cvsroot = ':ext:cltbld@cvs.mozilla.org:/cvsroot';
-
-#- Set these proper values for your tinderbox server
-#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
-
-# Allow for non-client builds, e.g. camino.
-#$moz_client_mk = 'client.mk';
-
-#- Set if you want to build in a separate object tree
-#$ObjDir = 'fx-trunk-cairo';
-
-# Extra build name, if needed.
-$BuildNameExtra = 'Unit Testing';
-
-# User comment, eg. ip address for dhcp builds.
-# ex: $UserComment = "ip = 208.12.36.108";
-#$UserComment = 0;
-
-#-
-#- The rest should not need to be changed
-#-
-
-#- Minimum wait period from start of build to start of next build in minutes.
-#$BuildSleep = 10;
-
-#- Until you get the script working. When it works,
-#- change to the tree you're actually building
-#$BuildTree  = 'MozillaTest';
-#$BuildTree  = 'Firefox-Cairo';
-$BuildTree  = 'MozillaExperimental';
-
-#$BuildName = '';
-#$BuildTag = '';
-#$BuildConfigDir = 'mozilla/config';
-#$Topsrcdir = 'mozilla';
-
-$BinaryName = 'firefox.exe';
-
-#
-# For embedding app, use:
-#$EmbedBinaryName = 'TestGtkEmbed';
-#$EmbedDistDir    = 'dist/bin'
-
-
-#$ShellOverride = ''; # Only used if the default shell is too stupid
-#$ConfigureArgs = '';
-#$ConfigureEnvArgs = '';
-#$Compiler = 'gcc';
-#$NSPRArgs = '';
-#$ShellOverride = '';
-
-# Release build options
-$ReleaseBuild  = 0;
-$shiptalkback  = 0;
-$ReleaseToLatest = 0; # Push the release to latest-<milestone>?
-$ReleaseToDated = 0; # Push the release to YYYY-MM-DD-HH-<milestone>?
-$build_hour    = "4";
-$package_creation_path = "/browser/installer";
-# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
-$ssh_version   = "2";
-#$ssh_user      = "cltbld";
-#$ssh_server    = "stage.mozilla.org";
-$ftp_path      = "/home/ftp/pub/firefox/nightly";
-$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly";
-$tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds";
-$tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds";
-$milestone     = "trunk";
-$notify_list   = 'build-announce@mozilla.org';
-#$stub_installer = 0;
-#$sea_installer = 1;
-#$archive       = 1;
-#$push_raw_xpis = 1;
-#$update_package = 1;
-#$update_product = "Firefox";
-#$update_version = "trunk";
-#$update_platform = "WINNT_x86-msvc";
-#$update_hash = "sha1";
-#$update_filehost = "ftp.mozilla.org";
-#$update_appv = "3.0a1";
-#$update_extv = "3.0a1";
-#$update_pushinfo = 0;
-
-# Reboot the OS at the end of build-and-test cycle. This is primarily
-# intended for Win9x, which can't last more than a few cycles before
-# locking up (and testing would be suspect even after a couple of cycles).
-# Right now, there is only code to force the reboot for Win9x, so even
-# setting this to 1, will not have an effect on other platforms. Setting
-# up win9x to automatically logon and begin running tinderbox is left 
-# as an exercise to the reader. 
-#$RebootSystem = 0;
-
-# LogCompression specifies the type of compression used on the log file.
-# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
-# for 'gzip' or 'bzip2' are in the user's path before setting this
-# option.
-#$LogCompression = '';
-
-# LogEncoding specifies the encoding format used for the logs. Valid
-# options are 'base64', and 'uuencode'. If $LogCompression is set above,
-# this needs to be set to 'base64' or 'uuencode' to ensure that the
-# binary data is transferred properly.
-#$LogEncoding = '';
-
-# Prevent Extension Manager from spawning child processes during tests
-# - processes that tbox scripts cannot kill. 
-#$ENV{NO_EM_RESTART} = '1';
-
-# Build XForms
-$BuildXForms = 1;