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 661471. Part 6.2: Handle dynamic changes to Cleartype enabled/disabled. r=jfkthame

Browse Source
This commit is contained in:
Robert O'Callahan 2011-06-09 08:13:05 +01:00
parent d7aa0ae8f6
commit 44dafb791e
3 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/base/nsPresContext.cpp
View File

@ -772,8 +772,10 @@ nsPresContext::GetUserPreferences()
}
void
nsPresContext::AppUnitsPerDevPixelChanged()
nsPresContext::InvalidateThebesLayers()
{
if (!mShell)
return;
nsIFrame* rootFrame = mShell->FrameManager()->GetRootFrame();
if (rootFrame) {
// FrameLayerBuilder caches invalidation-related values that depend on the
@ -781,6 +783,12 @@ nsPresContext::AppUnitsPerDevPixelChanged()
// is completely flushed.
FrameLayerBuilder::InvalidateThebesLayersInSubtree(rootFrame);
}
}
void
nsPresContext::AppUnitsPerDevPixelChanged()
{
InvalidateThebesLayers();
mDeviceContext->FlushFontCache();
@ -868,6 +876,7 @@ nsPresContext::UpdateAfterPreferencesChanged()
mShell->SetPreferenceStyleRules(PR_TRUE);
}
InvalidateThebesLayers();
mDeviceContext->FlushFontCache();
nsChangeHint hint = nsChangeHint(0);

1
layout/base/nsPresContext.h
View File

@ -1049,6 +1049,7 @@ protected:
NS_HIDDEN_(void) UpdateCharSet(const nsAFlatCString& aCharSet);
void InvalidateThebesLayers();
void AppUnitsPerDevPixelChanged();
PRBool MayHavePaintEventListener();

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

@ -4458,6 +4458,35 @@ nsWindow::ProcessMessageForPlugin(const MSG &aMsg,
return PR_TRUE;
}
static void ForceFontUpdate()
{
// update device context font cache
// Dirty but easiest way:
// Changing nsIPrefBranch entry which triggers callbacks
// and flows into calling mDeviceContext->FlushFontCache()
// to update the font cache in all the instance of Browsers
static const char kPrefName[] = "font.internaluseonly.changed";
PRBool fontInternalChange =
Preferences::GetBool(kPrefName, PR_FALSE);
Preferences::SetBool(kPrefName, !fontInternalChange);
}
static PRBool CleartypeSettingChanged()
{
static int currentQuality = -1;
BYTE quality = cairo_win32_get_system_text_quality();
if (currentQuality == quality)
return PR_FALSE;
if (currentQuality < 0) {
currentQuality = quality;
return PR_FALSE;
}
currentQuality = quality;
return PR_TRUE;
}
// The main windows message processing method.
PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
LRESULT *aRetValue)
@ -4620,15 +4649,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
fontEnum->UpdateFontList(&didChange);
//didChange is TRUE only if new font langGroup is added to the list.
if (didChange) {
// update device context font cache
// Dirty but easiest way:
// Changing nsIPrefBranch entry which triggers callbacks
// and flows into calling mDeviceContext->FlushFontCache()
// to update the font cache in all the instance of Browsers
const char* kPrefName = "font.internaluseonly.changed";
PRBool fontInternalChange =
Preferences::GetBool(kPrefName, PR_FALSE);
Preferences::SetBool(kPrefName, !fontInternalChange);
ForceFontUpdate();
}
} //if (NS_SUCCEEDED(rv))
}
@ -4811,6 +4832,13 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM &wParam, LPARAM &lParam,
break;
case WM_PAINT:
if (CleartypeSettingChanged()) {
ForceFontUpdate();
gfxFontCache *fc = gfxFontCache::GetCache();
if (fc) {
fc->Flush();
}
}
*aRetValue = (int) OnPaint(NULL, 0);
result = PR_TRUE;
break;