This commit was manufactured by cvs2svn to create branch 'SSU_PERSONAL_M13'.

git-svn-id: svn://10.0.0.236/branches/SSU_PERSONAL_M13@54297 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/xpinstall/wizard/windows/setup/update.html

@@ -0,0 +1,98 @@
+<html>
+<head>
+   <title>Commercial build update</title>
+</head>
+<body>
+<script>
+
+var xpi = new Object();
+var numxpi = 0;
+var numstatus = 0;
+
+function showprops(obj) {
+  var props = "";
+  for (i in obj) {
+     props += i+":"+obj[i]+"\n  ";
+  }
+  alert(props);
+}
+
+function statusCallback(url,status) {
+    for (i in xpi) {
+        if ( url.indexOf(xpi[i]) != -1 ) {
+            xpi[i] = status;
+            numstatus++;
+            break;
+        }
+    }
+
+    // if we've gotten all results then display them
+    if (numstatus == numxpi)
+    {
+        var text;
+        var restart = false;
+        dlg = window.open("","resultWindow");
+        dlg.document.write("<head><title>XPInstall Results</title></head>");
+        dlg.document.write("<body><h1>XPInstall Results</h1>");
+        for (i in xpi)
+        {
+            text = "    "+i+": ";
+            switch (status) {
+              case 999:
+                 restart = true;     // fall-through
+              case 0:
+                 text += "Successful";
+                 break;
+              default:
+                 text += "Error encountered -- "+status;
+                 break;
+            }
+            text += "<br>";
+            dlg.document.write(text);
+        }
+        if (restart) {
+            dlg.document.write("<p>Some files were in use, you must restart to complete the installation");
+        }
+
+        dlg.document.write("</body>");
+        dlg.document.close();
+    }
+}
+
+function launch() {
+    for (var i = 0; i < document.installForm.elements.length; i++)
+    {
+       e = document.installForm.elements[i];
+       if (e.type.match(/checkbox/i) && e.checked )
+       {
+         xpi[e.value] = "xpi/"+e.name+".xpi";
+         numxpi++;
+       }
+    }
+
+    // showprops(xpi);
+    InstallTrigger.install(xpi,statusCallback);
+}
+</script>
+
+
+<h2>Commercial Build update</h2>
+
+
+Select the parts of Seamonkey you wish to update and press the Launch button. 
+<p>
+Update all of the pieces you use at once; mismatched versions
+will cause you grief.
+
+<form name="installForm">
+<input type="checkbox" name="core"         value="Navigator" checked> Navigator   <br>
+<input type="checkbox" name="security"     value="SSL/HTTP"  checked> SSL/HTTP    <br>
+<input type="checkbox" name="mail"         value="Mail"      checked> Mail        <br>
+<input type="checkbox" name="aim"          value="Instant Messenger" checked> Instant Messenger <br>
+<input type="checkbox" name="fullcircle"   value="FullCircle"> FullCircle          <br>
+<input type="checkbox" name="spellchecker" value="Spelling Checker"> Spelling Checker <br>
+<input type="checkbox" name="psm"          value="Cartman"> Cartman             <br>
+<input type="button" value="Launch XPInstall" onclick="launch()">
+</form>
+</body>
+</html>