Bug 1429806 - Initialize new field in WR GlyphOptions introduced in WR PR 2288. r?kats
MozReview-Commit-ID: JRm6VKBeUuL
--- a/gfx/webrender_bindings/webrender_ffi_generated.h
+++ b/gfx/webrender_bindings/webrender_ffi_generated.h
@@ -705,19 +705,21 @@ struct GlyphInstance {
bool operator==(const GlyphInstance& aOther) const {
return index == aOther.index &&
point == aOther.point;
}
};
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;
}
};
using WrYuvColorSpace = YuvColorSpace;
using WrLogLevelFilter = LogLevelFilter;
struct ByteSlice {
--- a/layout/generic/TextDrawTarget.h
+++ b/layout/generic/TextDrawTarget.h
@@ -129,16 +129,17 @@ public:
&& std::is_standard_layout<std::remove_reference<decltype(aBuffer.mGlyphs[0])>>::value
&& std::is_standard_layout<std::remove_reference<decltype(glyphs[0])>>::value
&& sizeof(aBuffer.mGlyphs[0]) == sizeof(glyphs[0])
&& sizeof(aBuffer.mGlyphs[0].mPosition) == sizeof(glyphs[0].point)
, "glyph buf types don't match");
wr::GlyphOptions glyphOptions;
glyphOptions.render_mode = wr::ToFontRenderMode(aOptions.mAntialiasMode, GetPermitSubpixelAA());
+ glyphOptions.flags = 0;
mManager->WrBridge()->PushGlyphs(mBuilder, glyphs, aFont,
color, mSc, mBoundsRect, mClipRect,
mBackfaceVisible, &glyphOptions);
}
void
PushClipRect(const Rect &aRect) override {