Commit ae91fb1e authored by Michal Klocek's avatar Michal Klocek
Browse files

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: default avatarAllan Sandfeld Jensen <allan.jensen@qt.io>
No related merge requests found
Showing with 4 additions and 0 deletions
...@@ -87,8 +87,12 @@ void InitializeDWriteFontProxy() { ...@@ -87,8 +87,12 @@ void InitializeDWriteFontProxy() {
// fallback if IDWriteFontFallback is not available. // fallback if IDWriteFontFallback is not available.
// This flag can be removed when Win8.0 and earlier are no longer supported. // This flag can be removed when Win8.0 and earlier are no longer supported.
bool fallback_available = font_fallback.Get() != nullptr; 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, DCHECK_EQ(fallback_available,
base::win::GetVersion() > base::win::VERSION_WIN8); base::win::GetVersion() > base::win::VERSION_WIN8);
#endif
blink::WebFontRendering::setUseSkiaFontFallback(fallback_available); blink::WebFontRendering::setUseSkiaFontFallback(fallback_available);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment