summaryrefslogtreecommitdiff
path: root/libre/iceweasel/harmony-fix.diff
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2017-09-29 14:34:19 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2017-09-29 14:34:19 -0500
commitf7ed232d07c78b454ba9ea7aaf398092453a76b6 (patch)
tree6ddc778cb43e80b73b5bae9f5a30e72b93d73a44 /libre/iceweasel/harmony-fix.diff
parent238d327712e98bc3e861b985882410a911ac6ee6 (diff)
downloadabslibre-f7ed232d07c78b454ba9ea7aaf398092453a76b6.tar.gz
abslibre-f7ed232d07c78b454ba9ea7aaf398092453a76b6.tar.bz2
abslibre-f7ed232d07c78b454ba9ea7aaf398092453a76b6.zip
iceweasel-1:55.0.3-3.1: Patches from deved/nightly
Diffstat (limited to 'libre/iceweasel/harmony-fix.diff')
-rw-r--r--libre/iceweasel/harmony-fix.diff16
1 files changed, 16 insertions, 0 deletions
diff --git a/libre/iceweasel/harmony-fix.diff b/libre/iceweasel/harmony-fix.diff
new file mode 100644
index 000000000..7f62fd480
--- /dev/null
+++ b/libre/iceweasel/harmony-fix.diff
@@ -0,0 +1,16 @@
+diff --git i/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp w/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
+index 42da19280fce8235..2c221c32d097b462 100644
+--- i/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
++++ w/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
+@@ -666,10 +666,7 @@ void SkScalerContext_CairoFT::generateMetrics(SkGlyph* glyph)
+ glyph->fTop = -SkToS16(SkFDot6Floor(bbox.yMax));
+ glyph->fLeft = SkToS16(SkFDot6Floor(bbox.xMin));
+
+- if (isLCD(fRec) &&
+- gSetLcdFilter &&
+- (fLcdFilter == FT_LCD_FILTER_DEFAULT ||
+- fLcdFilter == FT_LCD_FILTER_LIGHT)) {
++ if (isLCD(fRec)) {
+ if (fRec.fFlags & kLCD_Vertical_Flag) {
+ glyph->fTop -= 1;
+ glyph->fHeight += 2;