Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-23 19:09:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed nsIFontCache to conform to XPCOM standards

Browse Source
This commit is contained in:
troy%netscape.com 1998-08-28 05:16:41 +00:00
parent 6cb09b5132
commit b242b51732
8 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/src/nsDeviceContext.cpp
View File

@ -199,8 +199,7 @@ NS_IMETHODIMP DeviceContextImpl::GetMetricsFor(const nsFont& aFont, nsIFontMetri
return rv;
}
}
aMetrics = mFontCache->GetMetricsFor(aFont);
return NS_OK;
return mFontCache->GetMetricsFor(aFont, aMetrics);
}
NS_IMETHODIMP DeviceContextImpl :: SetZoom(float aZoom)

51
gfx/src/nsFontCache.cpp
View File

@ -33,10 +33,10 @@ public:
NS_DECL_ISUPPORTS
virtual nsresult Init(nsIDeviceContext* aContext);
virtual nsIDeviceContext* GetDeviceContext() const;
virtual nsIFontMetrics* GetMetricsFor(const nsFont& aFont);
virtual void Flush();
NS_IMETHOD Init(nsIDeviceContext* aContext);
NS_IMETHOD GetDeviceContext(nsIDeviceContext *&aContext) const;
NS_IMETHOD GetMetricsFor(const nsFont& aFont, nsIFontMetrics *&aMetrics);
NS_IMETHOD Flush();
protected:
nsVoidArray mFontMetrics;
@ -57,7 +57,7 @@ FontCacheImpl :: ~FontCacheImpl()
NS_IMPL_ISUPPORTS(FontCacheImpl, kIFontCacheIID)
nsresult FontCacheImpl :: Init(nsIDeviceContext* aContext)
NS_IMETHODIMP FontCacheImpl :: Init(nsIDeviceContext* aContext)
{
NS_PRECONDITION(nsnull != aContext, "null ptr");
// Note: we don't hold a reference to the device context, because it
@ -66,27 +66,26 @@ nsresult FontCacheImpl :: Init(nsIDeviceContext* aContext)
return NS_OK;
}
nsIDeviceContext* FontCacheImpl::GetDeviceContext() const
NS_IMETHODIMP FontCacheImpl::GetDeviceContext(nsIDeviceContext *&aContext) const
{
NS_IF_ADDREF(mContext);
return mContext;
aContext = mContext;
return NS_OK;
}
nsIFontMetrics* FontCacheImpl :: GetMetricsFor(const nsFont& aFont)
NS_IMETHODIMP FontCacheImpl :: GetMetricsFor(const nsFont& aFont, nsIFontMetrics *&aMetrics)
{
nsIFontMetrics* fm;
// First check our cache
PRInt32 n = mFontMetrics.Count();
for (PRInt32 cnt = 0; cnt < n; cnt++)
{
fm = (nsIFontMetrics*) mFontMetrics.ElementAt(cnt);
aMetrics = (nsIFontMetrics*) mFontMetrics.ElementAt(cnt);
if (aFont.Equals(fm->GetFont()))
if (aFont.Equals(aMetrics->GetFont()))
{
NS_ADDREF(fm);
return fm;
NS_ADDREF(aMetrics);
return NS_OK;
}
}
@ -95,24 +94,29 @@ nsIFontMetrics* FontCacheImpl :: GetMetricsFor(const nsFont& aFont)
static NS_DEFINE_IID(kFontMetricsCID, NS_FONT_METRICS_CID);
static NS_DEFINE_IID(kFontMetricsIID, NS_IFONT_METRICS_IID);
nsresult rv = NSRepository::CreateInstance(kFontMetricsCID, nsnull,
kFontMetricsIID, (void **)&fm);
if (NS_OK != rv)
return nsnull;
nsIFontMetrics* fm;
nsresult rv = NSRepository::CreateInstance(kFontMetricsCID, nsnull,
kFontMetricsIID, (void **)&fm);
if (NS_OK != rv) {
aMetrics = nsnull;
return rv;
}
rv = fm->Init(aFont, mContext);
if (NS_OK != rv)
return nsnull;/* XXX losing error code */
if (NS_OK != rv) {
aMetrics = nsnull;
return rv;
}
mFontMetrics.AppendElement(fm);
NS_ADDREF(fm);
return fm;
aMetrics = fm;
return NS_OK;
}
void FontCacheImpl::Flush()
NS_IMETHODIMP FontCacheImpl::Flush()
{
PRInt32 i, n = mFontMetrics.Count();
for (i = 0; i < n; i++) {
@ -120,6 +124,7 @@ void FontCacheImpl::Flush()
NS_RELEASE(fm);
}
mFontMetrics.Clear();
return NS_OK;
}
extern "C" NS_GFX_(nsresult)

8
gfx/src/nsIFontCache.h
View File

@ -44,22 +44,22 @@ public:
* Initialize the font cache. Call this after creating the font
* cache and before trying to use it.
*/
virtual nsresult Init(nsIDeviceContext* aContext) = 0;
NS_IMETHOD Init(nsIDeviceContext* aContext) = 0;
/**
* Get the device context associated with this cache
*/
virtual nsIDeviceContext* GetDeviceContext() const = 0;
NS_IMETHOD GetDeviceContext(nsIDeviceContext *&aContext) const = 0;
/**
* Get metrics for a given font.
*/
virtual nsIFontMetrics* GetMetricsFor(const nsFont& aFont) = 0;
NS_IMETHOD GetMetricsFor(const nsFont& aFont, nsIFontMetrics *&aMetrics) = 0;
/**
* Flush the cache.
*/
virtual void Flush() = 0;
NS_IMETHOD Flush() = 0;
};
extern "C" NS_GFX_(nsresult)

2
gfx/src/windows/nsRenderingContextWin.cpp
View File

@ -738,7 +738,7 @@ nscolor nsRenderingContextWin :: GetColor() const
void nsRenderingContextWin :: SetFont(const nsFont& aFont)
{
NS_IF_RELEASE(mFontMetrics);
mFontMetrics = mFontCache->GetMetricsFor(aFont);
mFontCache->GetMetricsFor(aFont, mFontMetrics);
}
const nsFont& nsRenderingContextWin :: GetFont()

3
layout/html/forms/src/nsInputFrame.cpp
View File

@ -469,7 +469,8 @@ nsInputFrame::GetTextSize(nsIPresContext& aPresContext, nsInputFrame* aFrame,
nsIFontCache* fontCache;
deviceContext->GetFontCache(fontCache);
nsIFontMetrics* fontMet = fontCache->GetMetricsFor(font);
nsIFontMetrics* fontMet;
fontCache->GetMetricsFor(font, fontMet);
aSize.width = fontMet->GetWidth(aString);
aSize.height = fontMet->GetHeight();

3
widget/src/mac/nsWindow.cpp
View File

@ -618,7 +618,8 @@ void nsWindow::SetFont(const nsFont &aFont)
nsIFontCache* fontCache = nsnull;
mContext->GetFontCache(fontCache);
if (fontCache != nsnull) {
nsIFontMetrics* metrics = fontCache->GetMetricsFor(aFont);
nsIFontMetrics* metrics;
fontCache->GetMetricsFor(aFont, metrics);
if (metrics != nsnull) {
//XmFontList fontList = NULL;

3
widget/src/motif/nsWindow.cpp
View File

@ -836,7 +836,8 @@ void nsWindow::SetFont(const nsFont &aFont)
nsIFontCache* fontCache;
mContext->GetFontCache(fontCache);
if (fontCache != nsnull) {
nsIFontMetrics* metrics = fontCache->GetMetricsFor(aFont);
nsIFontMetrics* metrics;
fontCache->GetMetricsFor(aFont, metrics);
if (metrics != nsnull) {
XmFontList fontList = NULL;

3
widget/src/windows/nsWindow.cpp
View File

@ -1058,7 +1058,8 @@ void nsWindow::SetFont(const nsFont &aFont)
{
nsIFontCache* fontCache;
mContext->GetFontCache(fontCache);
nsIFontMetrics* metrics = fontCache->GetMetricsFor(aFont);
nsIFontMetrics* metrics;
fontCache->GetMetricsFor(aFont, metrics);
HFONT hfont = metrics->GetFontHandle();
// Draw in the new font