From ae91fb1e8b05d240929ef608223e2ce406f438e3 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Wed, 15 Mar 2017 15:47:27 +0100
Subject: [PATCH] Fix render process crash for windows debug builds on win10
Due to change 8ae5d7f0 in chromium DWriteFontProxy is now
also initialized when not using the sandbox. This triggers
on win10 DCHECK which fails if font fallback is supported,
but reported windows version (due to missing correct
manifest file) is 8.0. Skip the DCHECK for qtwebengine
builds.
Change-Id: I6fcef46b1e0f0dc8fec8fec62cc46322efcaaad9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
.../child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/chromium/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc b/chromium/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc
index 5708d60caa6..7ba112a43db 100644
--- a/chromium/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc
+++ b/chromium/content/child/dwrite_font_proxy/dwrite_font_proxy_init_win.cc
@@ -87,8 +87,12 @@ void InitializeDWriteFontProxy() {
// fallback if IDWriteFontFallback is not available.
// This flag can be removed when Win8.0 and earlier are no longer supported.
bool fallback_available = font_fallback.Get() != nullptr;
+#ifndef TOOLKIT_QT
+ // qtwebengine does not supply manifest file, version of windows is always reported as
+ // windows 8
DCHECK_EQ(fallback_available,
base::win::GetVersion() > base::win::VERSION_WIN8);
+#endif
blink::WebFontRendering::setUseSkiaFontFallback(fallback_available);
}
--
GitLab