summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authorJonathan Watt <jwatt@jwatt.org>2018-02-20 16:13:05 -0500
committerwolfbeast <mcwerewolf@gmail.com>2018-03-14 10:58:19 +0100
commite749d23a34ff04c492bcf729e01ed1a0292408f1 (patch)
tree3575d5f4b4120f3ef49f6b007ddc52a791e72cef /dom
parenta0892817409177372d61a2d65ca242b8ef2c320d (diff)
downloadUXP-e749d23a34ff04c492bcf729e01ed1a0292408f1.tar
UXP-e749d23a34ff04c492bcf729e01ed1a0292408f1.tar.gz
UXP-e749d23a34ff04c492bcf729e01ed1a0292408f1.tar.lz
UXP-e749d23a34ff04c492bcf729e01ed1a0292408f1.tar.xz
UXP-e749d23a34ff04c492bcf729e01ed1a0292408f1.zip
Bug 1430557. r=longsonr, a=lizzard
--HG-- extra : rebase_source : 5109c816d9ad1ce1881e3670b8d74ae0dc475223
Diffstat (limited to 'dom')
-rw-r--r--dom/svg/DOMSVGPathSegList.cpp21
1 files changed, 19 insertions, 2 deletions
diff --git a/dom/svg/DOMSVGPathSegList.cpp b/dom/svg/DOMSVGPathSegList.cpp
index edacdfc93..0b811cdb1 100644
--- a/dom/svg/DOMSVGPathSegList.cpp
+++ b/dom/svg/DOMSVGPathSegList.cpp
@@ -460,6 +460,18 @@ DOMSVGPathSegList::ReplaceItem(DOMSVGPathSeg& aNewItem,
float segAsRaw[1 + NS_SVG_PATH_SEG_MAX_ARGS];
domItem->ToSVGPathSegEncodedData(segAsRaw);
+ if (AnimListMirrorsBaseList()) {
+ // The anim val list is in sync with the base val list - remove mirroring
+ // animVal item if necessary. We do this *before* touching InternalList()
+ // so the removed item can correctly store its internal value.
+ DOMSVGPathSegList* animVal =
+ GetDOMWrapperIfExists(InternalAList().GetAnimValKey());
+ if (animVal->ItemAt(aIndex)) {
+ animVal->ItemAt(aIndex)->RemovingFromList();
+ animVal->ItemAt(aIndex) = nullptr;
+ }
+ }
+
if (!InternalList().mData.ReplaceElementsAt(internalIndex, 1 + oldArgCount,
segAsRaw, 1 + newArgCount,
fallible)) {
@@ -474,8 +486,13 @@ DOMSVGPathSegList::ReplaceItem(DOMSVGPathSeg& aNewItem,
int32_t delta = newArgCount - oldArgCount;
if (delta != 0) {
- for (uint32_t i = aIndex + 1; i < LengthNoFlush(); ++i) {
- mItems[i].mInternalDataIndex += delta;
+ // Sync up the internal indexes of all ItemProxys that come after aIndex:
+ UpdateListIndicesFromIndex(aIndex + 1, delta);
+ if (AnimListMirrorsBaseList()) {
+ // The anim val list is in sync with the base val list
+ DOMSVGPathSegList* animVal =
+ GetDOMWrapperIfExists(InternalAList().GetAnimValKey());
+ animVal->UpdateListIndicesFromIndex(aIndex + 1, delta);
}
}