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 1118601 - trim out unused pref fonts list from platform objects. r=m_kato

Browse Source
This commit is contained in:
John Daggett 2015-01-07 14:29:21 +09:00
parent aa2b502545
commit be24b149cb
4 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/thebes/gfxMacPlatformFontList.h
View File

@ -93,8 +93,6 @@ public:
const uint8_t* aFontData,
uint32_t aLength);
void ClearPrefFonts() { mPrefFonts.Clear(); }
private:
friend class gfxPlatformMac;

5
gfx/thebes/gfxQtPlatform.h
View File

@ -72,8 +72,6 @@ public:
virtual bool IsFontFormatSupported(nsIURI *aFontURI,
uint32_t aFormatFlags) MOZ_OVERRIDE;
virtual void ClearPrefFonts() { mPrefFonts.Clear(); }
static int32_t GetDPI();
virtual gfxImageFormat GetOffscreenFormat() MOZ_OVERRIDE;
@ -90,9 +88,6 @@ protected:
private:
virtual void GetPlatformCMSOutputProfile(void *&mem, size_t &size) MOZ_OVERRIDE;
// TODO: unify this with mPrefFonts (NB: holds families, not fonts) in gfxPlatformFontList
nsDataHashtable<nsCStringHashKey, nsTArray<nsRefPtr<gfxFontEntry> > > mPrefFonts;
int mScreenDepth;
};

13
gfx/thebes/gfxWindowsPlatform.cpp
View File

@ -326,7 +326,6 @@ NS_IMPL_ISUPPORTS(GPUAdapterReporter, nsIMemoryReporter)
gfxWindowsPlatform::gfxWindowsPlatform()
: mD3D11DeviceInitialized(false)
, mPrefFonts(32)
{
mUseClearTypeForDownloadableFonts = UNINITIALIZED_VALUE;
mUseClearTypeAlways = UNINITIALIZED_VALUE;
@ -1098,18 +1097,6 @@ gfxWindowsPlatform::GetPlatformCMSOutputProfile(void* &mem, size_t &mem_size)
#endif // _WIN32
}
bool
gfxWindowsPlatform::GetPrefFontEntries(const nsCString& aKey, nsTArray<nsRefPtr<gfxFontEntry> > *array)
{
return mPrefFonts.Get(aKey, array);
}
void
gfxWindowsPlatform::SetPrefFontEntries(const nsCString& aKey, nsTArray<nsRefPtr<gfxFontEntry> >& array)
{
mPrefFonts.Put(aKey, array);
}
bool
gfxWindowsPlatform::UseClearTypeForDownloadableFonts()
{

8
gfx/thebes/gfxWindowsPlatform.h
View File

@ -215,11 +215,6 @@ public:
gfxFontFamily *FindFontFamily(const nsAString& aName);
gfxFontEntry *FindFontEntry(const nsAString& aName, const gfxFontStyle& aFontStyle);
bool GetPrefFontEntries(const nsCString& aLangGroup, nsTArray<nsRefPtr<gfxFontEntry> > *array);
void SetPrefFontEntries(const nsCString& aLangGroup, nsTArray<nsRefPtr<gfxFontEntry> >& array);
void ClearPrefFonts() { mPrefFonts.Clear(); }
// ClearType is not always enabled even when available (e.g. Windows XP)
// if either of these prefs are enabled and apply, use ClearType rendering
bool UseClearTypeForDownloadableFonts();
@ -290,9 +285,6 @@ private:
mozilla::RefPtr<mozilla::layers::ReadbackManagerD3D11> mD3D11ReadbackManager;
virtual void GetPlatformCMSOutputProfile(void* &mem, size_t &size);
// TODO: unify this with mPrefFonts (NB: holds families, not fonts) in gfxPlatformFontList
nsDataHashtable<nsCStringHashKey, nsTArray<nsRefPtr<gfxFontEntry> > > mPrefFonts;
};
bool DoesD3D11TextureSharingWork(ID3D11Device *device);