[external/skia] Merge tag 'android-5.1.1_r24' into dev

Android 5.1.1 release 24
This commit is contained in:
Firefly
2015-10-15 22:58:33 +08:00
committed by djw
parent 04681dc762
commit d62a29774c

View File

@ -65,7 +65,10 @@ public:
SkASSERT(count >= SkRegion::kRectRegionRuns);
RunHead* head = (RunHead*)sk_malloc_throw(sizeof(RunHead) + count * sizeof(RunType));
const int64_t size = sk_64_mul(count, sizeof(RunType)) + sizeof(RunHead);
if (count < 0 || !sk_64_isS32(size)) { SK_CRASH(); }
RunHead* head = (RunHead*)sk_malloc_throw(size);
head->fRefCnt = 1;
head->fRunCount = count;
// these must be filled in later, otherwise we will be invalid