From 4b892d44b0ef3fd376d3c0f58197cff247322295 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@mozilla.com>
Date: Tue, 16 Jan 2018 10:28:54 -0500
Subject: [PATCH] Bug 1429806 - Initialize new field in WR GlyphOptions
 introduced in WR PR 2288. r=kats

MozReview-Commit-ID: JRm6VKBeUuL

--HG--
extra : rebase_source : 20ea49bec54e8a99304628348c1fd63b0d950129
---
 gfx/webrender_bindings/webrender_ffi_generated.h | 4 +++-
 layout/generic/TextDrawTarget.h                  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfx/webrender_bindings/webrender_ffi_generated.h b/gfx/webrender_bindings/webrender_ffi_generated.h
index 055d1a578d2f..cc81ffbc90ff 100644
--- a/gfx/webrender_bindings/webrender_ffi_generated.h
+++ b/gfx/webrender_bindings/webrender_ffi_generated.h
@@ -710,9 +710,11 @@ struct GlyphInstance {
 
 struct GlyphOptions {
   FontRenderMode render_mode;
+  FontInstanceFlags flags;
 
   bool operator==(const GlyphOptions& aOther) const {
-    return render_mode == aOther.render_mode;
+    return render_mode == aOther.render_mode &&
+           flags == aOther.flags;
   }
 };
 
diff --git a/layout/generic/TextDrawTarget.h b/layout/generic/TextDrawTarget.h
index ca3e94bbee97..9b333fb78702 100644
--- a/layout/generic/TextDrawTarget.h
+++ b/layout/generic/TextDrawTarget.h
@@ -134,6 +134,7 @@ public:
 
     wr::GlyphOptions glyphOptions;
     glyphOptions.render_mode = wr::ToFontRenderMode(aOptions.mAntialiasMode, GetPermitSubpixelAA());
+    glyphOptions.flags = 0;
 
     mManager->WrBridge()->PushGlyphs(mBuilder, glyphs, aFont,
                                      color, mSc, mBoundsRect, mClipRect,