mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
Bug 551298, patch B: Replace uses of THEBES_INLINE_DECL_REFCOUNTING with NS_INLINE_DECL_REFCOUNTING. r=roc
This commit is contained in:
parent
73d9d71072
commit
f670acaa95
@ -41,6 +41,7 @@
|
||||
#include "nsSVGValue.h"
|
||||
#include <math.h>
|
||||
#include "nsContentUtils.h"
|
||||
#include "nsISupportsImpl.h"
|
||||
|
||||
const double radPerDegree = 2.0*3.1415926535 / 360.0;
|
||||
|
||||
|
@ -71,6 +71,7 @@
|
||||
|
||||
#include "nsIDOMSVGMatrix.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "nsAutoPtr.h"
|
||||
|
||||
nsresult
|
||||
NS_NewSVGMatrix(nsIDOMSVGMatrix** result,
|
||||
|
@ -42,6 +42,8 @@
|
||||
#include "nsRegion.h"
|
||||
#include "nsPoint.h"
|
||||
#include "nsRect.h"
|
||||
#include "nsISupportsImpl.h"
|
||||
#include "nsAutoPtr.h"
|
||||
#include "gfx3DMatrix.h"
|
||||
|
||||
class gfxContext;
|
||||
@ -106,7 +108,7 @@ class ImageContainer;
|
||||
* root layer, and each container layer holds a reference to its children.
|
||||
*/
|
||||
class THEBES_API LayerManager {
|
||||
THEBES_INLINE_DECL_REFCOUNTING(LayerManager)
|
||||
NS_INLINE_DECL_REFCOUNTING(LayerManager)
|
||||
|
||||
public:
|
||||
enum LayersBackend {
|
||||
@ -181,7 +183,7 @@ public:
|
||||
* surface.
|
||||
*/
|
||||
class THEBES_API Layer {
|
||||
THEBES_INLINE_DECL_REFCOUNTING(Layer)
|
||||
NS_INLINE_DECL_REFCOUNTING(Layer)
|
||||
|
||||
public:
|
||||
virtual ~Layer() {}
|
||||
|
@ -40,6 +40,7 @@
|
||||
|
||||
#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;
|
||||
|
@ -48,6 +48,7 @@
|
||||
#include "gfxMatrix.h"
|
||||
#include "gfxPattern.h"
|
||||
#include "gfxPath.h"
|
||||
#include "nsISupportsImpl.h"
|
||||
|
||||
typedef struct _cairo cairo_t;
|
||||
|
||||
@ -66,7 +67,7 @@ typedef struct _cairo cairo_t;
|
||||
* as opposed to app units.
|
||||
*/
|
||||
class THEBES_API gfxContext {
|
||||
THEBES_INLINE_DECL_REFCOUNTING(gfxContext)
|
||||
NS_INLINE_DECL_REFCOUNTING(gfxContext)
|
||||
|
||||
public:
|
||||
/**
|
||||
|
@ -55,6 +55,7 @@
|
||||
#include "gfxFontConstants.h"
|
||||
#include "gfxPlatform.h"
|
||||
#include "nsIAtom.h"
|
||||
#include "nsISupportsImpl.h"
|
||||
|
||||
#ifdef DEBUG
|
||||
#include <stdio.h>
|
||||
@ -160,7 +161,7 @@ struct THEBES_API gfxFontStyle {
|
||||
|
||||
class gfxFontEntry {
|
||||
public:
|
||||
THEBES_INLINE_DECL_REFCOUNTING(gfxFontEntry)
|
||||
NS_INLINE_DECL_REFCOUNTING(gfxFontEntry)
|
||||
|
||||
gfxFontEntry(const nsAString& aName, gfxFontFamily *aFamily = nsnull,
|
||||
PRBool aIsStandardFace = PR_FALSE) :
|
||||
@ -289,7 +290,7 @@ struct FontSearch {
|
||||
|
||||
class gfxFontFamily {
|
||||
public:
|
||||
THEBES_INLINE_DECL_REFCOUNTING(gfxFontFamily)
|
||||
NS_INLINE_DECL_REFCOUNTING(gfxFontFamily)
|
||||
|
||||
gfxFontFamily(const nsAString& aName) :
|
||||
mName(aName),
|
||||
@ -955,7 +956,7 @@ protected:
|
||||
};
|
||||
|
||||
class THEBES_API gfxTextRunFactory {
|
||||
THEBES_INLINE_DECL_REFCOUNTING(gfxTextRunFactory)
|
||||
NS_INLINE_DECL_REFCOUNTING(gfxTextRunFactory)
|
||||
|
||||
public:
|
||||
// Flags in the mask 0xFFFF0000 are reserved for textrun clients
|
||||
|
@ -39,6 +39,7 @@
|
||||
#define GFXGDKNATIVERENDER_H_
|
||||
|
||||
#include "gfxColor.h"
|
||||
#include "nsAutoPtr.h"
|
||||
#include <gdk/gdk.h>
|
||||
|
||||
class gfxASurface;
|
||||
|
@ -38,6 +38,7 @@
|
||||
#define GFX_PATH_H
|
||||
|
||||
#include "gfxTypes.h"
|
||||
#include "nsISupportsImpl.h"
|
||||
|
||||
class gfxContext;
|
||||
struct gfxPoint;
|
||||
@ -48,7 +49,7 @@ typedef struct cairo_path cairo_path_t;
|
||||
* of a gfxContext.
|
||||
*/
|
||||
class THEBES_API gfxPath {
|
||||
THEBES_INLINE_DECL_REFCOUNTING(gfxPath)
|
||||
NS_INLINE_DECL_REFCOUNTING(gfxPath)
|
||||
|
||||
friend class gfxContext;
|
||||
|
||||
|
@ -42,6 +42,8 @@
|
||||
|
||||
#include "gfxColor.h"
|
||||
#include "gfxMatrix.h"
|
||||
#include "nsISupportsImpl.h"
|
||||
#include "nsAutoPtr.h"
|
||||
|
||||
class gfxContext;
|
||||
class gfxASurface;
|
||||
@ -49,7 +51,7 @@ typedef struct _cairo_pattern cairo_pattern_t;
|
||||
|
||||
|
||||
class THEBES_API gfxPattern {
|
||||
THEBES_INLINE_DECL_REFCOUNTING(gfxPattern)
|
||||
NS_INLINE_DECL_REFCOUNTING(gfxPattern)
|
||||
|
||||
public:
|
||||
gfxPattern(cairo_pattern_t *aPattern);
|
||||
|
@ -40,6 +40,7 @@
|
||||
|
||||
#include "gfxTypes.h"
|
||||
#include "gfxPoint.h"
|
||||
#include "nsDebug.h"
|
||||
|
||||
struct THEBES_API gfxCorner {
|
||||
typedef int Corner;
|
||||
|
@ -90,16 +90,6 @@ 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) { \
|
||||
|
@ -46,6 +46,7 @@
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsIURI.h"
|
||||
#include "nsIFile.h"
|
||||
#include "nsISupportsImpl.h"
|
||||
|
||||
class nsIURI;
|
||||
class gfxMixedFontFamily;
|
||||
@ -138,7 +139,7 @@ class THEBES_API gfxUserFontSet {
|
||||
|
||||
public:
|
||||
|
||||
THEBES_INLINE_DECL_REFCOUNTING(gfxUserFontSet)
|
||||
NS_INLINE_DECL_REFCOUNTING(gfxUserFontSet)
|
||||
|
||||
gfxUserFontSet();
|
||||
virtual ~gfxUserFontSet();
|
||||
|
@ -44,6 +44,7 @@
|
||||
#include "nsAutoRef.h"
|
||||
#include "nsTArray.h"
|
||||
#include "nsTHashtable.h"
|
||||
#include "nsISupportsImpl.h"
|
||||
|
||||
#include <fontconfig/fontconfig.h>
|
||||
|
||||
@ -87,7 +88,7 @@ class gfxIgnoreCaseCStringComparator
|
||||
class gfxFontNameList : public nsTArray<nsString>
|
||||
{
|
||||
public:
|
||||
THEBES_INLINE_DECL_REFCOUNTING(gfxFontNameList)
|
||||
NS_INLINE_DECL_REFCOUNTING(gfxFontNameList)
|
||||
PRBool Exists(nsAString& aName);
|
||||
};
|
||||
|
||||
|
@ -935,7 +935,7 @@ GetFontGroup(PangoContext *aContext)
|
||||
|
||||
class gfxFcPangoFontSet {
|
||||
public:
|
||||
THEBES_INLINE_DECL_REFCOUNTING(gfxFcPangoFontSet)
|
||||
NS_INLINE_DECL_REFCOUNTING(gfxFcPangoFontSet)
|
||||
|
||||
explicit gfxFcPangoFontSet(FcPattern *aPattern,
|
||||
gfxUserFontSet *aUserFontSet)
|
||||
|
@ -44,6 +44,7 @@
|
||||
#include "nsIPrintOptions.h"
|
||||
#include "nsTArray.h"
|
||||
#include "nsCOMArray.h"
|
||||
#include "nsAutoPtr.h"
|
||||
|
||||
// Classes
|
||||
class nsPrintObject;
|
||||
|
Loading…
Reference in New Issue
Block a user