Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Unified Diff: ui/gfx/render_text_win.cc

Issue 11087016: Create font with DEFAULT_CHARSET instead of ANSI_CHARSET. (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/gfx/platform_font_win.cc ('K') | « ui/gfx/platform_font_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text_win.cc
diff --git a/ui/gfx/render_text_win.cc b/ui/gfx/render_text_win.cc
index 0b72ab68b4888b0aa100df9f411c98fe267a4d25..03c4c243f49b349d2af170fac5a31c295d832656 100644
--- a/ui/gfx/render_text_win.cc
+++ b/ui/gfx/render_text_win.cc
@@ -646,7 +646,8 @@ void RenderTextWin::LayoutTextRun(internal::TextRun* run) {
HRESULT hr = ShapeTextRunWithFont(run, current_font);
bool glyphs_missing = false;
- if (hr == USP_E_SCRIPT_NOT_IN_FONT) {
+ if (hr == USP_E_SCRIPT_NOT_IN_FONT ||
+ hr == HRESULT_FROM_WIN32(ERROR_INVALID_WINDOW_HANDLE)) {
msw 2012/10/12 21:34:55 It seems like this should trash the invalid |cache
glyphs_missing = true;
} else if (hr == S_OK) {
// If |hr| is S_OK, there could still be missing glyphs in the output.
« ui/gfx/platform_font_win.cc ('K') | « ui/gfx/platform_font_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698