From fb8e1bdb06b88fc5b6972fb5314e487449889c15 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Fri, 8 Oct 1999 23:42:13 +0000 Subject: [PATCH] Fixed cellmap ctor/dtor logging to not show up negative git-svn-id: svn://10.0.0.236/trunk@50279 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/html/table/src/celldata.h | 11 ++++++++++- mozilla/layout/html/table/src/nsCellMap.cpp | 11 +++++++++++ mozilla/layout/tables/celldata.h | 11 ++++++++++- mozilla/layout/tables/nsCellMap.cpp | 11 +++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/html/table/src/celldata.h b/mozilla/layout/html/table/src/celldata.h index f7d041a29ca..4d5d2e6a10e 100644 --- a/mozilla/layout/html/table/src/celldata.h +++ b/mozilla/layout/html/table/src/celldata.h @@ -18,6 +18,8 @@ #ifndef CellData_h__ #define CellData_h__ +#include "nsISupports.h" + class nsTableCellFrame; /** Data stored by nsCellMap to rationalize rowspan and colspan cells. @@ -33,9 +35,16 @@ class CellData { public: CellData(); + +#ifndef NS_BUILD_REFCNT_LOGGING CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData, CellData* aColSpanData) : mOrigCell(aOrigCell), mRowSpanData(aRowSpanData), mColSpanData(aColSpanData) - {} + { + } +#else + CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData, + CellData* aColSpanData); +#endif ~CellData(); diff --git a/mozilla/layout/html/table/src/nsCellMap.cpp b/mozilla/layout/html/table/src/nsCellMap.cpp index 10c5c437492..c62b96286c2 100644 --- a/mozilla/layout/html/table/src/nsCellMap.cpp +++ b/mozilla/layout/html/table/src/nsCellMap.cpp @@ -34,6 +34,17 @@ CellData::CellData() mColSpanData = nsnull; } +#ifdef NS_BUILD_REFCNT_LOGGING +CellData::CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData, + CellData* aColSpanData) + : mOrigCell(aOrigCell), + mRowSpanData(aRowSpanData), + mColSpanData(aColSpanData) +{ + MOZ_COUNT_CTOR(CellData); +} +#endif + CellData::~CellData() { MOZ_COUNT_DTOR(CellData); diff --git a/mozilla/layout/tables/celldata.h b/mozilla/layout/tables/celldata.h index f7d041a29ca..4d5d2e6a10e 100644 --- a/mozilla/layout/tables/celldata.h +++ b/mozilla/layout/tables/celldata.h @@ -18,6 +18,8 @@ #ifndef CellData_h__ #define CellData_h__ +#include "nsISupports.h" + class nsTableCellFrame; /** Data stored by nsCellMap to rationalize rowspan and colspan cells. @@ -33,9 +35,16 @@ class CellData { public: CellData(); + +#ifndef NS_BUILD_REFCNT_LOGGING CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData, CellData* aColSpanData) : mOrigCell(aOrigCell), mRowSpanData(aRowSpanData), mColSpanData(aColSpanData) - {} + { + } +#else + CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData, + CellData* aColSpanData); +#endif ~CellData(); diff --git a/mozilla/layout/tables/nsCellMap.cpp b/mozilla/layout/tables/nsCellMap.cpp index 10c5c437492..c62b96286c2 100644 --- a/mozilla/layout/tables/nsCellMap.cpp +++ b/mozilla/layout/tables/nsCellMap.cpp @@ -34,6 +34,17 @@ CellData::CellData() mColSpanData = nsnull; } +#ifdef NS_BUILD_REFCNT_LOGGING +CellData::CellData(nsTableCellFrame* aOrigCell, CellData* aRowSpanData, + CellData* aColSpanData) + : mOrigCell(aOrigCell), + mRowSpanData(aRowSpanData), + mColSpanData(aColSpanData) +{ + MOZ_COUNT_CTOR(CellData); +} +#endif + CellData::~CellData() { MOZ_COUNT_DTOR(CellData);