wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1082598 - Part 4: Workaround for naming conflict in unified sources for Skia and thebes DWrite fonts. r=jrmuizel

Browse Source
This commit is contained in:
Lee Salzman 2015-12-17 14:45:45 -05:00
parent 1478cd1889
commit 7ba4aae815
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/thebes/gfxDWriteFontList.cpp
View File

@ -1357,7 +1357,7 @@ static HRESULT GetFamilyName(IDWriteFont *aFont, nsString& aFamilyName)
// used to invoke the DirectWrite layout engine to determine the fallback font
// for a given character.
IFACEMETHODIMP FontFallbackRenderer::DrawGlyphRun(
IFACEMETHODIMP DWriteFontFallbackRenderer::DrawGlyphRun(
void* clientDrawingContext,
FLOAT baselineOriginX,
FLOAT baselineOriginY,
@ -1422,7 +1422,7 @@ gfxDWriteFontList::GlobalFontFallback(const uint32_t aCh,
// initialize fallback renderer
if (!mFallbackRenderer) {
mFallbackRenderer = new FontFallbackRenderer(dwFactory);
mFallbackRenderer = new DWriteFontFallbackRenderer(dwFactory);
}
// initialize text format

8
gfx/thebes/gfxDWriteFontList.h
View File

@ -197,10 +197,10 @@ protected:
};
// custom text renderer used to determine the fallback font for a given char
class FontFallbackRenderer final : public IDWriteTextRenderer
class DWriteFontFallbackRenderer final : public IDWriteTextRenderer
{
public:
FontFallbackRenderer(IDWriteFactory *aFactory)
DWriteFontFallbackRenderer(IDWriteFactory *aFactory)
: mRefCount(0)
{
HRESULT hr = S_OK;
@ -209,7 +209,7 @@ public:
NS_ASSERTION(SUCCEEDED(hr), "GetSystemFontCollection failed!");
}
~FontFallbackRenderer()
~DWriteFontFallbackRenderer()
{}
// IDWriteTextRenderer methods
@ -421,7 +421,7 @@ private:
bool mGDIFontTableAccess;
RefPtr<IDWriteGdiInterop> mGDIInterop;
RefPtr<FontFallbackRenderer> mFallbackRenderer;
RefPtr<DWriteFontFallbackRenderer> mFallbackRenderer;
RefPtr<IDWriteTextFormat> mFallbackFormat;
RefPtr<IDWriteFontCollection> mSystemFonts;