Bug 1163583 - Update SetPara with recent changes to ICU algorithm. r=smontagu
authorTed Clancy <tclancy@mozilla.com>
Wed, 13 May 2015 13:11:57 -0400
changeset 244261 307db24f332a3d72e8e0b62b6c0013ba7bf7c612
parent 244260 f49f111e85cb3fb6eac9ce96b848b2f1d97fb3e5
child 244262 c4b4d5aaa2d28c6b00bffc01a885fe98aad75cf8
push id28773
push usercbook@mozilla.com
push dateMon, 18 May 2015 11:43:50 +0000
treeherdermozilla-central@f578b845c4b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmontagu
bugs1163583
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1163583 - Update SetPara with recent changes to ICU algorithm. r=smontagu
layout/base/nsBidi.cpp
--- a/layout/base/nsBidi.cpp
+++ b/layout/base/nsBidi.cpp
@@ -319,17 +319,17 @@ nsresult nsBidi::SetPara(const char16_t 
       return rv;
     }
   }
 
   /* allocate isolate memory */
   if (mIsolateCount <= SIMPLE_ISOLATES_SIZE) {
     mIsolates = mSimpleIsolates;
   } else {
-    if (mIsolateCount <= (int32_t) mIsolatesSize) {
+    if (mIsolateCount * sizeof(Isolate) <= mIsolatesSize) {
       mIsolates = mIsolatesMemory;
     } else {
       if (GETINITIALISOLATESMEMORY(mIsolateCount)) {
         mIsolates = mIsolatesMemory;
       } else {
         return NS_ERROR_OUT_OF_MEMORY;
       }
     }