Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1306670: Properly disable cleartype when the underlying surface indicates it may not be opaque. r=jrmuizel

Browse Source 
MozReview-Commit-ID: LWzwbeG6JeL

--HG--
extra : rebase_source : 5621053dd1a1e33ecd42ddd907ca3b80235eb9ac
This commit is contained in:
Bas Schouten 2016-10-03 18:21:54 +02:00
parent c46c5a8fa1
commit 606090c843
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gfx/cairo/cairo/src/cairo-dwrite-font.cpp
View File

@ -1144,19 +1144,11 @@ _dwrite_draw_glyphs_to_gdi_surface_gdi(cairo_win32_surface_t *surface,
cairo_d2d_surface_t::TextRenderingState renderingState =
scaled_font->rendering_mode;
if ((renderingState == cairo_d2d_surface_t::TEXT_RENDERING_NORMAL ||
renderingState == cairo_d2d_surface_t::TEXT_RENDERING_GDI_CLASSIC) &&
!surface->base.permit_subpixel_antialiasing) {
renderingState = cairo_d2d_surface_t::TEXT_RENDERING_NO_CLEARTYPE;
}
IDWriteRenderingParams *params =
DWriteFactory::RenderingParams(renderingState);
rv = gdiInterop->CreateBitmapRenderTarget(surface->dc,
area.right - area.left,
area.bottom - area.top,
&rt);
if (FAILED(rv)) {
if (rv == E_OUTOFMEMORY) {
return (cairo_int_status_t)CAIRO_STATUS_NO_MEMORY;
@ -1165,6 +1157,22 @@ _dwrite_draw_glyphs_to_gdi_surface_gdi(cairo_win32_surface_t *surface,
}
}
if ((renderingState == cairo_d2d_surface_t::TEXT_RENDERING_NORMAL ||
renderingState == cairo_d2d_surface_t::TEXT_RENDERING_GDI_CLASSIC) &&
!surface->base.permit_subpixel_antialiasing) {
renderingState = cairo_d2d_surface_t::TEXT_RENDERING_NO_CLEARTYPE;
IDWriteBitmapRenderTarget1* rt1;
rv = rt->QueryInterface(&rt1);
if (SUCCEEDED(rv) && rt1) {
rt1->SetTextAntialiasMode(DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE);
rt1->Release();
}
}
IDWriteRenderingParams *params =
DWriteFactory::RenderingParams(renderingState);
/**
* We set the number of pixels per DIP to 1.0. This is because we always want
* to draw in device pixels, and not device independent pixels. On high DPI
@ -1447,11 +1455,12 @@ _cairo_dwrite_show_glyphs_on_surface(void *surface,
color,
dwritesf,
fontArea);
#ifdef CAIRO_TRY_D2D_TO_GDI
}
#endif
return CAIRO_INT_STATUS_SUCCESS;
return status;
}
#define ENHANCED_CONTRAST_REGISTRY_KEY \

2
gfx/cairo/cairo/src/cairo-dwrite-private.h
View File

@ -33,7 +33,7 @@
* Contributor(s):
* Bas Schouten <bschouten@mozilla.com>
*/
#include <dwrite.h>
#include <dwrite_1.h>
#include <d2d1.h>
// DirectWrite is not available on all platforms.