From 67b4ace7f40ea543498253cc7503c606318d55a7 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Thu, 11 Jun 2015 10:10:48 -0700 Subject: [PATCH] Bug 1173415 - Fix incorrect mask used for nsBidi::mFlags [r=smontagu] LRI and RLI are values of type DirProp (uint8_t). The DIRPROP_FLAG macro is needed to convert them to bits in the 32-bit `flags` variable. --- layout/base/nsBidi.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layout/base/nsBidi.cpp b/layout/base/nsBidi.cpp index 24630c4b0ca..f669c973153 100644 --- a/layout/base/nsBidi.cpp +++ b/layout/base/nsBidi.cpp @@ -505,7 +505,7 @@ void nsBidi::GetDirProps(const char16_t *aText) } else if (state == SEEKING_STRONG_FOR_FSI) { if (stackLast <= NSBIDI_MAX_EXPLICIT_LEVEL) { dirProps[isolateStartStack[stackLast]] = LRI; - flags |= LRI; + flags |= DIRPROP_FLAG(LRI); } state = LOOKING_FOR_PDI; } @@ -518,7 +518,7 @@ void nsBidi::GetDirProps(const char16_t *aText) } else if (state == SEEKING_STRONG_FOR_FSI) { if (stackLast <= NSBIDI_MAX_EXPLICIT_LEVEL) { dirProps[isolateStartStack[stackLast]] = RLI; - flags |= RLI; + flags |= DIRPROP_FLAG(RLI); } state = LOOKING_FOR_PDI; }