From 55a260eb2d1255307edde9932923ab69b07a0db5 Mon Sep 17 00:00:00 2001 From: "sharparrow1%yahoo.com" Date: Fri, 3 Aug 2007 23:39:37 +0000 Subject: [PATCH] Bug 389938 - Full page zoom does not affect text with CSS font set to message-box. r+sr=roc, a=pavlov git-svn-id: svn://10.0.0.236/trunk@231456 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/public/nsIDeviceContext.h | 2 +- mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/gfx/public/nsIDeviceContext.h b/mozilla/gfx/public/nsIDeviceContext.h index 48bed64a191..aa0bd7ddeba 100644 --- a/mozilla/gfx/public/nsIDeviceContext.h +++ b/mozilla/gfx/public/nsIDeviceContext.h @@ -482,7 +482,7 @@ public: * Get the unscaled ratio of app units to dev pixels; useful if something * needs to be converted from to unscaled pixels */ - PRInt32 UnscaledAppUnitsPerDevPixel() { return mAppUnitsPerDevNotScaledPixel; } + PRInt32 UnscaledAppUnitsPerDevPixel() const { return mAppUnitsPerDevNotScaledPixel; } protected: PRInt32 mAppUnitsPerDevPixel; diff --git a/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp b/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp index 89c969cf3d0..9fe9ba5aa2a 100644 --- a/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp +++ b/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp @@ -402,7 +402,7 @@ nsThebesDeviceContext::GetSystemFont(nsSystemFontID aID, nsFont *aFont) const aFont->familyNameQuirks = fontStyle.familyNameQuirks; aFont->weight = fontStyle.weight; aFont->decorations = NS_FONT_DECORATION_NONE; - aFont->size = NSFloatPixelsToAppUnits(fontStyle.size, AppUnitsPerDevPixel()); + aFont->size = NSFloatPixelsToAppUnits(fontStyle.size, UnscaledAppUnitsPerDevPixel()); //aFont->langGroup = fontStyle.langGroup; aFont->sizeAdjust = fontStyle.sizeAdjust;