Backed out changeset 29bc09de2f77 (Bug 551298) due to Linux debug mochitest-5 orange

This commit is contained in:
Daniel Holbert 2010-04-01 09:38:53 -07:00
parent f670acaa95
commit 605900c19f
15 changed files with 21 additions and 26 deletions

View File

@ -41,7 +41,6 @@
#include "nsSVGValue.h"
#include <math.h>
#include "nsContentUtils.h"
#include "nsISupportsImpl.h"
const double radPerDegree = 2.0*3.1415926535 / 360.0;

View File

@ -71,7 +71,6 @@
#include "nsIDOMSVGMatrix.h"
#include "gfxMatrix.h"
#include "nsAutoPtr.h"
nsresult
NS_NewSVGMatrix(nsIDOMSVGMatrix** result,

View File

@ -42,8 +42,6 @@
#include "nsRegion.h"
#include "nsPoint.h"
#include "nsRect.h"
#include "nsISupportsImpl.h"
#include "nsAutoPtr.h"
#include "gfx3DMatrix.h"
class gfxContext;
@ -108,7 +106,7 @@ class ImageContainer;
* root layer, and each container layer holds a reference to its children.
*/
class THEBES_API LayerManager {
NS_INLINE_DECL_REFCOUNTING(LayerManager)
THEBES_INLINE_DECL_REFCOUNTING(LayerManager)
public:
enum LayersBackend {
@ -183,7 +181,7 @@ public:
* surface.
*/
class THEBES_API Layer {
NS_INLINE_DECL_REFCOUNTING(Layer)
THEBES_INLINE_DECL_REFCOUNTING(Layer)
public:
virtual ~Layer() {}

View File

@ -40,7 +40,6 @@
#include "gfxTypes.h"
#include "gfxRect.h"
#include "nsAutoPtr.h"
typedef struct _cairo_surface cairo_surface_t;
typedef struct _cairo_user_data_key cairo_user_data_key_t;

View File

@ -48,7 +48,6 @@
#include "gfxMatrix.h"
#include "gfxPattern.h"
#include "gfxPath.h"
#include "nsISupportsImpl.h"
typedef struct _cairo cairo_t;
@ -67,7 +66,7 @@ typedef struct _cairo cairo_t;
* as opposed to app units.
*/
class THEBES_API gfxContext {
NS_INLINE_DECL_REFCOUNTING(gfxContext)
THEBES_INLINE_DECL_REFCOUNTING(gfxContext)
public:
/**

View File

@ -55,7 +55,6 @@
#include "gfxFontConstants.h"
#include "gfxPlatform.h"
#include "nsIAtom.h"
#include "nsISupportsImpl.h"
#ifdef DEBUG
#include <stdio.h>
@ -161,7 +160,7 @@ struct THEBES_API gfxFontStyle {
class gfxFontEntry {
public:
NS_INLINE_DECL_REFCOUNTING(gfxFontEntry)
THEBES_INLINE_DECL_REFCOUNTING(gfxFontEntry)
gfxFontEntry(const nsAString& aName, gfxFontFamily *aFamily = nsnull,
PRBool aIsStandardFace = PR_FALSE) :
@ -290,7 +289,7 @@ struct FontSearch {
class gfxFontFamily {
public:
NS_INLINE_DECL_REFCOUNTING(gfxFontFamily)
THEBES_INLINE_DECL_REFCOUNTING(gfxFontFamily)
gfxFontFamily(const nsAString& aName) :
mName(aName),
@ -956,7 +955,7 @@ protected:
};
class THEBES_API gfxTextRunFactory {
NS_INLINE_DECL_REFCOUNTING(gfxTextRunFactory)
THEBES_INLINE_DECL_REFCOUNTING(gfxTextRunFactory)
public:
// Flags in the mask 0xFFFF0000 are reserved for textrun clients

View File

@ -39,7 +39,6 @@
#define GFXGDKNATIVERENDER_H_
#include "gfxColor.h"
#include "nsAutoPtr.h"
#include <gdk/gdk.h>
class gfxASurface;

View File

@ -38,7 +38,6 @@
#define GFX_PATH_H
#include "gfxTypes.h"
#include "nsISupportsImpl.h"
class gfxContext;
struct gfxPoint;
@ -49,7 +48,7 @@ typedef struct cairo_path cairo_path_t;
* of a gfxContext.
*/
class THEBES_API gfxPath {
NS_INLINE_DECL_REFCOUNTING(gfxPath)
THEBES_INLINE_DECL_REFCOUNTING(gfxPath)
friend class gfxContext;

View File

@ -42,8 +42,6 @@
#include "gfxColor.h"
#include "gfxMatrix.h"
#include "nsISupportsImpl.h"
#include "nsAutoPtr.h"
class gfxContext;
class gfxASurface;
@ -51,7 +49,7 @@ typedef struct _cairo_pattern cairo_pattern_t;
class THEBES_API gfxPattern {
NS_INLINE_DECL_REFCOUNTING(gfxPattern)
THEBES_INLINE_DECL_REFCOUNTING(gfxPattern)
public:
gfxPattern(cairo_pattern_t *aPattern);

View File

@ -40,7 +40,6 @@
#include "gfxTypes.h"
#include "gfxPoint.h"
#include "nsDebug.h"
struct THEBES_API gfxCorner {
typedef int Corner;

View File

@ -90,6 +90,16 @@ enum gfxBreakPriority {
eNormalBreak
};
/**
* Define refcounting for Thebes. For now use the stuff from nsISupportsImpl
* even though it forces the functions to be virtual...
*/
#include "nsISupportsImpl.h"
#include "nsAutoPtr.h"
#define THEBES_INLINE_DECL_REFCOUNTING(_class) \
NS_INLINE_DECL_REFCOUNTING(_class)
#define THEBES_INLINE_DECL_THREADSAFE_REFCOUNTING(_class) \
public: \
nsrefcnt AddRef(void) { \

View File

@ -46,7 +46,6 @@
#include "nsCOMPtr.h"
#include "nsIURI.h"
#include "nsIFile.h"
#include "nsISupportsImpl.h"
class nsIURI;
class gfxMixedFontFamily;
@ -139,7 +138,7 @@ class THEBES_API gfxUserFontSet {
public:
NS_INLINE_DECL_REFCOUNTING(gfxUserFontSet)
THEBES_INLINE_DECL_REFCOUNTING(gfxUserFontSet)
gfxUserFontSet();
virtual ~gfxUserFontSet();

View File

@ -44,7 +44,6 @@
#include "nsAutoRef.h"
#include "nsTArray.h"
#include "nsTHashtable.h"
#include "nsISupportsImpl.h"
#include <fontconfig/fontconfig.h>
@ -88,7 +87,7 @@ class gfxIgnoreCaseCStringComparator
class gfxFontNameList : public nsTArray<nsString>
{
public:
NS_INLINE_DECL_REFCOUNTING(gfxFontNameList)
THEBES_INLINE_DECL_REFCOUNTING(gfxFontNameList)
PRBool Exists(nsAString& aName);
};

View File

@ -935,7 +935,7 @@ GetFontGroup(PangoContext *aContext)
class gfxFcPangoFontSet {
public:
NS_INLINE_DECL_REFCOUNTING(gfxFcPangoFontSet)
THEBES_INLINE_DECL_REFCOUNTING(gfxFcPangoFontSet)
explicit gfxFcPangoFontSet(FcPattern *aPattern,
gfxUserFontSet *aUserFontSet)

View File

@ -44,7 +44,6 @@
#include "nsIPrintOptions.h"
#include "nsTArray.h"
#include "nsCOMArray.h"
#include "nsAutoPtr.h"
// Classes
class nsPrintObject;