mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
backing out changes that weren't supposed to be part of my previous backout...
This commit is contained in:
parent
b0bf225825
commit
13cfb3e1b1
@ -97,9 +97,6 @@ struct NS_GFX nsFont {
|
||||
// needs to be done.
|
||||
float sizeAdjust;
|
||||
|
||||
// Stretch of the font 1-9
|
||||
PRUint16 stretch;
|
||||
|
||||
// Initialize the font struct with an ASCII name
|
||||
nsFont(const char* aName, PRUint8 aStyle, PRUint8 aVariant,
|
||||
PRUint16 aWeight, PRUint8 aDecoration, nscoord aSize,
|
||||
|
@ -272,7 +272,10 @@ nsThebesDeviceContext::Init(nsNativeWidget aWidget)
|
||||
|
||||
#endif
|
||||
|
||||
mScreenManager = do_GetService("@mozilla.org/gfx/screenmanager;1");
|
||||
|
||||
mDepth = 24;
|
||||
|
||||
mScreenManager = do_GetService("@mozilla.org/gfx/screenmanager;1");
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
@ -418,12 +421,6 @@ nsThebesDeviceContext::CheckFontExistence(const nsString& aFaceName)
|
||||
NS_IMETHODIMP
|
||||
nsThebesDeviceContext::GetDepth(PRUint32& aDepth)
|
||||
{
|
||||
nsCOMPtr<nsIScreen> primaryScreen;
|
||||
if (mDepth == 0) {
|
||||
mScreenManager->GetPrimaryScreen(getter_AddRefs(primaryScreen));
|
||||
primaryScreen->GetColorDepth(reinterpret_cast<PRInt32 *>(&mDepth));
|
||||
}
|
||||
|
||||
aDepth = mDepth;
|
||||
return NS_OK;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user