diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2020-04-24 16:58:09 +0000 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2020-05-04 21:46:46 +0200 |
| commit | 16ab4c5cc82829927c2e876af7e511c0f1fb6284 (patch) | |
| tree | 05b6f44a2c441bec31f23c7cd8654b99685c5b13 /vcl/win | |
| parent | 603df08a1e0211099ce2cf258cfe64a74ed6ded9 (diff) | |
remove old Skia text render methods that do not use Skia directly
The cairo-based method on Unix and manual glyph handling way taken
from GL on Windows should be longer be needed, now that using Skia
itself for text rendering seems to work fine.
This reverts more or less reverts the following commits:
b1d3ef798a89d11b853c467fa9ce0fe6ed235735
5ac9a62f3a354db80837bdd1c95b763989b303bb
619959827003814053a5e9ec81acfd07b3aa270a
6f5c85daa0e5073d87d1d7699bfa59af159686ca
ad3580df085b3a3d66eb73cae997ea5ca178ccc1
f109a1ac6fdf0c878d53dfea6fceffd93248608f
59205c742c43b4c456b69c3fd94e7fa35ff3eec0
Change-Id: Ib28b2469c7d6471c227bb2aa08d5485bb24c2fe1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93428
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/gdi/salfont.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/gdi/winlayout.cxx | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index cd7ca435e807..ce1a8bd610a0 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -63,8 +63,6 @@ #include <impfontmetricdata.hxx> #include <impglyphitem.hxx> -#include <vcl/skia/SkiaHelper.hxx> - using namespace vcl; static const int MAXFONTHEIGHT = 2048; diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 636cac595bf1..884b1be6e670 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -36,10 +36,6 @@ #include <win/saldata.hxx> #include <win/wingdiimpl.hxx> #include <outdev.h> -#include <vcl/skia/SkiaHelper.hxx> -#if HAVE_FEATURE_SKIA -#include <skia/win/winlayout.hxx> -#endif #include <win/DWriteTextRenderer.hxx> #include <win/scoped_gdi.hxx> @@ -63,11 +59,6 @@ GlobalWinGlyphCache * GlobalWinGlyphCache::get() SalData *data = GetSalData(); if (!data->m_pGlobalWinGlyphCache) { -#if HAVE_FEATURE_SKIA - if (SkiaHelper::isVCLSkiaEnabled()) - data->m_pGlobalWinGlyphCache.reset(new SkiaGlobalWinGlyphCache); - else -#endif if (OpenGLHelper::isVCLOpenGLEnabled()) data->m_pGlobalWinGlyphCache.reset(new OpenGLGlobalWinGlyphCache); } @@ -170,8 +161,7 @@ bool WinFontInstance::CacheGlyphToAtlas(HDC hDC, HFONT hFont, int nGlyphIndex, auto pRT = pTxt->GetRenderTarget(); ID2D1SolidColorBrush* pBrush = nullptr; - D2D1::ColorF textColor = aDC->wantsTextColorWhite() ? D2D1::ColorF::White : D2D1::ColorF::Black; - if (!SUCCEEDED(pRT->CreateSolidColorBrush(textColor, &pBrush))) + if (!SUCCEEDED(pRT->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::Black), &pBrush))) return false; D2D1_POINT_2F baseline = { |