workaround for bug=30927

git-svn-id: svn://10.0.0.236/branches/M15-patch@72213 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/dom/jni/javaDOMGlobals.h

@@ -0,0 +1,105 @@
+/* 
+ 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 Sun Microsystems,
+ Inc. Portions created by Sun are
+ Copyright (C) 1999 Sun Microsystems, Inc. All
+ Rights Reserved.
+
+ Contributor(s): 
+*/
+
+#ifndef __JavaDOMGlobals_h__
+#define __JavaDOMGlobals_h__
+
+#include "jni.h"
+#include "prclist.h"
+#include "nsError.h"
+
+#ifdef ERROR
+#undef ERROR
+#endif
+
+class nsISupports;
+class nsIDOMNode;
+struct PRLogModuleInfo;
+struct PRLock;
+
+class JavaDOMGlobals {
+
+ public:
+  static jclass attrClass;
+  static jclass cDataSectionClass;
+  static jclass commentClass;
+  static jclass documentClass;
+  static jclass documentFragmentClass;
+  static jclass documentTypeClass;
+  static jclass domImplementationClass;
+  static jclass elementClass;
+  static jclass entityClass;
+  static jclass entityReferenceClass;
+  static jclass namedNodeMapClass;
+  static jclass nodeClass;
+  static jclass nodeListClass;
+  static jclass notationClass;
+  static jclass processingInstructionClass;
+  static jclass textClass;
+
+  static jfieldID nodePtrFID;
+  static jfieldID nodeListPtrFID;
+  static jfieldID domImplementationPtrFID;
+
+  static jfieldID nodeTypeAttributeFID;
+  static jfieldID nodeTypeCDataSectionFID;
+  static jfieldID nodeTypeCommentFID;
+  static jfieldID nodeTypeDocumentFragmentFID;
+  static jfieldID nodeTypeDocumentFID;
+  static jfieldID nodeTypeDocumentTypeFID;
+  static jfieldID nodeTypeElementFID;
+  static jfieldID nodeTypeEntityFID;
+  static jfieldID nodeTypeEntityReferenceFID;
+  static jfieldID nodeTypeNotationFID;
+  static jfieldID nodeTypeProcessingInstructionFID;
+  static jfieldID nodeTypeTextFID;
+
+  static jclass domExceptionClass;
+  static jmethodID domExceptionInitMID;
+  static jclass runtimeExceptionClass;
+  static jmethodID runtimeExceptionInitMID;
+
+  static const char* const DOM_EXCEPTION_MESSAGE[];
+
+  typedef enum ExceptionType { EXCEPTION_RUNTIME, 
+			       EXCEPTION_DOM } ExceptionType;
+  
+  static PRLogModuleInfo* log;
+  static PRCList garbage;
+  static PRLock* garbageLock;
+
+  static PRInt32 javaMaxInt;
+
+  static void Initialize(JNIEnv *env);
+  static void Destroy(JNIEnv *env);
+  static jobject CreateNodeSubtype(JNIEnv *env, 
+				   nsIDOMNode *node);
+
+  static void AddToGarbage(nsISupports* domObject);
+  static void TakeOutGarbage();
+
+  static void ThrowException(JNIEnv *env,
+                             const char * message = NULL,
+                             nsresult rv = NS_OK,
+                             ExceptionType exceptionType = EXCEPTION_RUNTIME);
+};
+  
+#endif /* __JavaDOMGlobals_h__ */

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___ */