Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 859128: Store SVGPathSegUtils::ArgCountForType's return-val in a signed variable, when we need to perform signed arithmetic with it. r=jwatt

Browse Source
This commit is contained in:
Daniel Holbert 2013-04-08 23:25:22 -07:00
parent ce292d6506
commit dc9839e648
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
content/svg/content/src/DOMSVGPathSegList.cpp
View File

@ -387,8 +387,12 @@ DOMSVGPathSegList::ReplaceItem(DOMSVGPathSeg& aNewItem,
// We use InternalList() to get oldArgCount since we may not have a DOM
// wrapper at the index being replaced.
uint32_t oldType = SVGPathSegUtils::DecodeType(InternalList().mData[internalIndex]);
uint32_t oldArgCount = SVGPathSegUtils::ArgCountForType(oldType);
uint32_t newArgCount = SVGPathSegUtils::ArgCountForType(domItem->Type());
// NOTE: ArgCountForType returns a (small) unsigned value, but we're
// intentionally putting it in a signed variable, because we're going to
// subtract these values and might produce something negative.
int32_t oldArgCount = SVGPathSegUtils::ArgCountForType(oldType);
int32_t newArgCount = SVGPathSegUtils::ArgCountForType(domItem->Type());
float segAsRaw[1 + NS_SVG_PATH_SEG_MAX_ARGS];
domItem->ToSVGPathSegEncodedData(segAsRaw);
@ -406,7 +410,7 @@ DOMSVGPathSegList::ReplaceItem(DOMSVGPathSeg& aNewItem,
// would end up reading bad data from InternalList()!
domItem->InsertingIntoList(this, aIndex, IsAnimValList());
uint32_t delta = newArgCount - oldArgCount;
int32_t delta = newArgCount - oldArgCount;
if (delta != 0) {
for (uint32_t i = aIndex + 1; i < LengthNoFlush(); ++i) {
mItems[i].mInternalDataIndex += delta;
@ -444,7 +448,10 @@ DOMSVGPathSegList::RemoveItem(uint32_t aIndex,
uint32_t internalIndex = mItems[aIndex].mInternalDataIndex;
uint32_t segType = SVGPathSegUtils::DecodeType(InternalList().mData[internalIndex]);
uint32_t argCount = SVGPathSegUtils::ArgCountForType(segType);
// NOTE: ArgCountForType returns a (small) unsigned value, but we're
// intentionally putting it in a signed value, because we're going to
// negate it, and you can't negate an unsigned value.
int32_t argCount = SVGPathSegUtils::ArgCountForType(segType);
// Now that we know we're removing, keep animVal list in sync as necessary.
// Do this *before* touching InternalList() so the removed item can get its
@ -454,9 +461,7 @@ DOMSVGPathSegList::RemoveItem(uint32_t aIndex,
InternalList().mData.RemoveElementsAt(internalIndex, 1 + argCount);
mItems.RemoveElementAt(aIndex);
// Note: The subtraction from 0 below is necessary to fix
// MSVC build warning C4146 (negating an unsigned value).
UpdateListIndicesFromIndex(aIndex, 0 - (argCount + 1));
UpdateListIndicesFromIndex(aIndex, -(argCount + 1));
Element()->DidChangePathSegList(emptyOrOldValue);
if (AttrIsAnimating()) {
@ -505,7 +510,7 @@ DOMSVGPathSegList::
void
DOMSVGPathSegList::
MaybeRemoveItemFromAnimValListAt(uint32_t aIndex,
uint32_t aArgCountForItem)
int32_t aArgCountForItem)
{
NS_ABORT_IF_FALSE(!IsAnimValList(), "call from baseVal to animVal");
@ -531,9 +536,7 @@ DOMSVGPathSegList::
}
animVal->mItems.RemoveElementAt(aIndex);
// Note: The subtraction from 0 below is necessary to fix
// MSVC build warning C4146 (negating an unsigned value).
animVal->UpdateListIndicesFromIndex(aIndex, 0 - (1 + aArgCountForItem));
animVal->UpdateListIndicesFromIndex(aIndex, -(1 + aArgCountForItem));
}
void

2
content/svg/content/src/DOMSVGPathSegList.h
View File

@ -212,7 +212,7 @@ private:
uint32_t aInternalIndex,
uint32_t aArgCountForItem);
void MaybeRemoveItemFromAnimValListAt(uint32_t aIndex,
uint32_t aArgCountForItem);
int32_t aArgCountForItem);
// Calls UpdateListIndex on all elements in |mItems| that satisfy ItemAt(),
// from |aStartingIndex| to the end of |mItems|. Also adjusts