2015-05-03 22:32:37 +03:00
|
|
|
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
2012-05-21 15:12:37 +04:00
|
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
2010-12-08 15:15:53 +03:00
|
|
|
|
|
|
|
#include "SVGAnimatedPointList.h"
|
2015-05-29 23:10:41 +03:00
|
|
|
|
2020-01-20 19:18:20 +03:00
|
|
|
#include <utility>
|
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj
This was done by:
This was done by applying:
```
diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
index 789affde7bbf..fe33c4c7d4d1 100644
--- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py
+++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
@@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase):
from subprocess import Popen, PIPE, check_output, CalledProcessError
diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE)
- args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format]
+ args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes']
if not output_file:
args.append("-i")
```
Then running `./mach clang-format -c <commit-hash>`
Then undoing that patch.
Then running check_spidermonkey_style.py --fixup
Then running `./mach clang-format`
I had to fix four things:
* I needed to move <utility> back down in GuardObjects.h because I was hitting
obscure problems with our system include wrappers like this:
0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration
0:03.94 extern void *realloc (void *__ptr, size_t __size)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here
0:03.94 MALLOC_DECL(realloc, void*, void*, size_t)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL'
0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__);
0:03.94 ^
0:03.94 <scratch space>:178:1: note: expanded from here
0:03.94 realloc_impl
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl'
0:03.94 #define realloc_impl mozmem_malloc_impl(realloc)
Which I really didn't feel like digging into.
* I had to restore the order of TrustOverrideUtils.h and related files in nss
because the .inc files depend on TrustOverrideUtils.h being included earlier.
* I had to add a missing include to RollingNumber.h
* Also had to partially restore include order in JsepSessionImpl.cpp to avoid
some -WError issues due to some static inline functions being defined in a
header but not used in the rest of the compilation unit.
Differential Revision: https://phabricator.services.mozilla.com/D60327
--HG--
extra : moz-landing-system : lando
2020-01-20 19:19:48 +03:00
|
|
|
|
2019-01-23 16:48:08 +03:00
|
|
|
#include "DOMSVGPointList.h"
|
2010-12-08 15:15:53 +03:00
|
|
|
#include "SVGPointListSMILType.h"
|
Bug 1609996 - Reorder some includes affected by the previous patches. r=froydnj
This was done by:
This was done by applying:
```
diff --git a/python/mozbuild/mozbuild/code-analysis/mach_commands.py b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
index 789affde7bbf..fe33c4c7d4d1 100644
--- a/python/mozbuild/mozbuild/code-analysis/mach_commands.py
+++ b/python/mozbuild/mozbuild/code-analysis/mach_commands.py
@@ -2007,7 +2007,7 @@ class StaticAnalysis(MachCommandBase):
from subprocess import Popen, PIPE, check_output, CalledProcessError
diff_process = Popen(self._get_clang_format_diff_command(commit), stdout=PIPE)
- args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format]
+ args = [sys.executable, clang_format_diff, "-p1", "-binary=%s" % clang_format, '-sort-includes']
if not output_file:
args.append("-i")
```
Then running `./mach clang-format -c <commit-hash>`
Then undoing that patch.
Then running check_spidermonkey_style.py --fixup
Then running `./mach clang-format`
I had to fix four things:
* I needed to move <utility> back down in GuardObjects.h because I was hitting
obscure problems with our system include wrappers like this:
0:03.94 /usr/include/stdlib.h:550:14: error: exception specification in declaration does not match previous declaration
0:03.94 extern void *realloc (void *__ptr, size_t __size)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/malloc_decls.h:53:1: note: previous declaration is here
0:03.94 MALLOC_DECL(realloc, void*, void*, size_t)
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozilla/mozalloc.h:22:32: note: expanded from macro 'MALLOC_DECL'
0:03.94 MOZ_MEMORY_API return_type name##_impl(__VA_ARGS__);
0:03.94 ^
0:03.94 <scratch space>:178:1: note: expanded from here
0:03.94 realloc_impl
0:03.94 ^
0:03.94 /home/emilio/src/moz/gecko-2/obj-debug/dist/include/mozmemory_wrap.h:142:41: note: expanded from macro 'realloc_impl'
0:03.94 #define realloc_impl mozmem_malloc_impl(realloc)
Which I really didn't feel like digging into.
* I had to restore the order of TrustOverrideUtils.h and related files in nss
because the .inc files depend on TrustOverrideUtils.h being included earlier.
* I had to add a missing include to RollingNumber.h
* Also had to partially restore include order in JsepSessionImpl.cpp to avoid
some -WError issues due to some static inline functions being defined in a
header but not used in the rest of the compilation unit.
Differential Revision: https://phabricator.services.mozilla.com/D60327
--HG--
extra : moz-landing-system : lando
2020-01-20 19:19:48 +03:00
|
|
|
#include "mozilla/SMILValue.h"
|
|
|
|
#include "mozilla/dom/SVGElement.h"
|
2010-12-08 15:15:53 +03:00
|
|
|
|
2018-12-22 20:04:05 +03:00
|
|
|
using namespace mozilla::dom;
|
|
|
|
|
2010-12-08 15:15:53 +03:00
|
|
|
// See the comments in this file's header!
|
|
|
|
|
2011-04-14 22:47:27 +04:00
|
|
|
namespace mozilla {
|
2010-12-08 15:15:53 +03:00
|
|
|
|
2019-05-01 11:47:10 +03:00
|
|
|
nsresult SVGAnimatedPointList::SetBaseValueString(const nsAString& aValue) {
|
2010-12-08 15:15:53 +03:00
|
|
|
SVGPointList newBaseValue;
|
|
|
|
|
|
|
|
// The spec says that the point data is parsed and accepted up to the first
|
|
|
|
// error encountered, so we don't return early if an error occurs. However,
|
|
|
|
// we do want to throw any error code from setAttribute if there's a problem.
|
|
|
|
|
|
|
|
nsresult rv = newBaseValue.SetValueFromString(aValue);
|
|
|
|
|
|
|
|
// We must send these notifications *before* changing mBaseVal! Our baseVal's
|
|
|
|
// DOM wrapper list may have to remove DOM items from itself, and any removed
|
|
|
|
// DOM items need to copy their internal counterpart's values *before* we
|
|
|
|
// change them. See the comments in
|
|
|
|
// DOMSVGPointList::InternalListWillChangeTo().
|
|
|
|
|
2019-05-01 11:47:10 +03:00
|
|
|
DOMSVGPointList* baseValWrapper =
|
2010-12-08 15:15:53 +03:00
|
|
|
DOMSVGPointList::GetDOMWrapperIfExists(GetBaseValKey());
|
|
|
|
if (baseValWrapper) {
|
|
|
|
baseValWrapper->InternalListWillChangeTo(newBaseValue);
|
|
|
|
}
|
|
|
|
|
2019-05-01 11:47:10 +03:00
|
|
|
DOMSVGPointList* animValWrapper = nullptr;
|
2010-12-08 15:15:53 +03:00
|
|
|
if (!IsAnimating()) { // DOM anim val wraps our base val too!
|
|
|
|
animValWrapper = DOMSVGPointList::GetDOMWrapperIfExists(GetAnimValKey());
|
|
|
|
if (animValWrapper) {
|
|
|
|
animValWrapper->InternalListWillChangeTo(newBaseValue);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Only now may we modify mBaseVal!
|
|
|
|
|
|
|
|
// We don't need to call DidChange* here - we're only called by
|
2018-12-21 11:58:14 +03:00
|
|
|
// SVGElement::ParseAttribute under Element::SetAttr,
|
2010-12-08 15:15:53 +03:00
|
|
|
// which takes care of notifying.
|
|
|
|
|
|
|
|
nsresult rv2 = mBaseVal.CopyFrom(newBaseValue);
|
|
|
|
if (NS_FAILED(rv2)) {
|
|
|
|
// Attempting to increase mBaseVal's length failed (mBaseVal is left
|
|
|
|
// unmodified). We MUST keep any DOM wrappers in sync:
|
|
|
|
if (baseValWrapper) {
|
|
|
|
baseValWrapper->InternalListWillChangeTo(mBaseVal);
|
|
|
|
}
|
|
|
|
if (animValWrapper) {
|
|
|
|
animValWrapper->InternalListWillChangeTo(mBaseVal);
|
|
|
|
}
|
|
|
|
return rv2;
|
|
|
|
}
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SVGAnimatedPointList::ClearBaseValue() {
|
|
|
|
// We must send these notifications *before* changing mBaseVal! (See above.)
|
|
|
|
|
2019-05-01 11:47:10 +03:00
|
|
|
DOMSVGPointList* baseValWrapper =
|
2010-12-08 15:15:53 +03:00
|
|
|
DOMSVGPointList::GetDOMWrapperIfExists(GetBaseValKey());
|
|
|
|
if (baseValWrapper) {
|
|
|
|
baseValWrapper->InternalListWillChangeTo(SVGPointList());
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!IsAnimating()) { // DOM anim val wraps our base val too!
|
2019-05-01 11:47:10 +03:00
|
|
|
DOMSVGPointList* animValWrapper =
|
2010-12-08 15:15:53 +03:00
|
|
|
DOMSVGPointList::GetDOMWrapperIfExists(GetAnimValKey());
|
|
|
|
if (animValWrapper) {
|
|
|
|
animValWrapper->InternalListWillChangeTo(SVGPointList());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mBaseVal.Clear();
|
|
|
|
// Caller notifies
|
|
|
|
}
|
|
|
|
|
2019-05-01 11:47:10 +03:00
|
|
|
nsresult SVGAnimatedPointList::SetAnimValue(const SVGPointList& aNewAnimValue,
|
|
|
|
SVGElement* aElement) {
|
2010-12-08 15:15:53 +03:00
|
|
|
// Note that a new animation may totally change the number of items in the
|
|
|
|
// animVal list, either replacing what was essentially a mirror of the
|
|
|
|
// baseVal list, or else replacing and overriding an existing animation.
|
|
|
|
// It is not possible for us to reliably distinguish between calls to this
|
|
|
|
// method that are setting a new sample for an existing animation (in which
|
|
|
|
// case our list length isn't changing and we wouldn't need to notify our DOM
|
|
|
|
// wrapper to keep its length in sync), and calls to this method that are
|
|
|
|
// setting the first sample of a new animation that will override the base
|
|
|
|
// value/an existing animation (in which case our length may be changing and
|
|
|
|
// our DOM wrapper may need to be notified). Happily though, it's cheap to
|
|
|
|
// just blindly notify our animVal's DOM wrapper of our new value each time
|
|
|
|
// this method is called, so that's what we do.
|
|
|
|
|
|
|
|
// We must send this notification *before* changing mAnimVal! (See above.)
|
|
|
|
|
2019-05-01 11:47:10 +03:00
|
|
|
DOMSVGPointList* domWrapper =
|
2010-12-08 15:15:53 +03:00
|
|
|
DOMSVGPointList::GetDOMWrapperIfExists(GetAnimValKey());
|
|
|
|
if (domWrapper) {
|
|
|
|
domWrapper->InternalListWillChangeTo(aNewAnimValue);
|
|
|
|
}
|
|
|
|
if (!mAnimVal) {
|
2020-02-25 23:03:26 +03:00
|
|
|
mAnimVal = MakeUnique<SVGPointList>();
|
2010-12-08 15:15:53 +03:00
|
|
|
}
|
|
|
|
nsresult rv = mAnimVal->CopyFrom(aNewAnimValue);
|
|
|
|
if (NS_FAILED(rv)) {
|
|
|
|
// OOM. We clear the animation and, importantly, ClearAnimValue() ensures
|
|
|
|
// that mAnimVal's DOM wrapper (if any) is kept in sync!
|
|
|
|
ClearAnimValue(aElement);
|
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
aElement->DidAnimatePointList();
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
2019-05-01 11:47:10 +03:00
|
|
|
void SVGAnimatedPointList::ClearAnimValue(SVGElement* aElement) {
|
2010-12-08 15:15:53 +03:00
|
|
|
// We must send these notifications *before* changing mAnimVal! (See above.)
|
|
|
|
|
2019-05-01 11:47:10 +03:00
|
|
|
DOMSVGPointList* domWrapper =
|
2010-12-08 15:15:53 +03:00
|
|
|
DOMSVGPointList::GetDOMWrapperIfExists(GetAnimValKey());
|
|
|
|
if (domWrapper) {
|
|
|
|
// When all animation ends, animVal simply mirrors baseVal, which may have
|
|
|
|
// a different number of items to the last active animated value.
|
|
|
|
//
|
|
|
|
domWrapper->InternalListWillChangeTo(mBaseVal);
|
|
|
|
}
|
2012-07-30 18:20:58 +04:00
|
|
|
mAnimVal = nullptr;
|
2010-12-08 15:15:53 +03:00
|
|
|
aElement->DidAnimatePointList();
|
|
|
|
}
|
|
|
|
|
2019-05-01 11:47:10 +03:00
|
|
|
UniquePtr<SMILAttr> SVGAnimatedPointList::ToSMILAttr(SVGElement* aElement) {
|
2017-03-30 07:10:07 +03:00
|
|
|
return MakeUnique<SMILAnimatedPointList>(this, aElement);
|
2010-12-08 15:15:53 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
nsresult SVGAnimatedPointList::SMILAnimatedPointList::ValueFromString(
|
2019-05-01 11:47:10 +03:00
|
|
|
const nsAString& aStr, const dom::SVGAnimationElement* /*aSrcElement*/,
|
|
|
|
SMILValue& aValue, bool& aPreventCachingOfSandwich) const {
|
2019-01-23 16:48:08 +03:00
|
|
|
SMILValue val(&SVGPointListSMILType::sSingleton);
|
2019-05-01 11:47:10 +03:00
|
|
|
SVGPointListAndInfo* list = static_cast<SVGPointListAndInfo*>(val.mU.mPtr);
|
2010-12-08 15:15:53 +03:00
|
|
|
nsresult rv = list->SetValueFromString(aStr);
|
|
|
|
if (NS_SUCCEEDED(rv)) {
|
|
|
|
list->SetInfo(mElement);
|
2018-05-30 22:15:35 +03:00
|
|
|
aValue = std::move(val);
|
2010-12-08 15:15:53 +03:00
|
|
|
}
|
2011-10-17 18:59:28 +04:00
|
|
|
aPreventCachingOfSandwich = false;
|
2010-12-08 15:15:53 +03:00
|
|
|
return rv;
|
|
|
|
}
|
|
|
|
|
2019-01-23 16:48:08 +03:00
|
|
|
SMILValue SVGAnimatedPointList::SMILAnimatedPointList::GetBaseValue() const {
|
2010-12-08 15:15:53 +03:00
|
|
|
// To benefit from Return Value Optimization and avoid copy constructor calls
|
|
|
|
// due to our use of return-by-value, we must return the exact same object
|
|
|
|
// from ALL return points. This function must only return THIS variable:
|
2019-01-23 16:48:08 +03:00
|
|
|
SMILValue val;
|
2010-12-08 15:15:53 +03:00
|
|
|
|
2019-01-23 16:48:08 +03:00
|
|
|
SMILValue tmp(&SVGPointListSMILType::sSingleton);
|
2019-05-01 11:47:10 +03:00
|
|
|
SVGPointListAndInfo* list = static_cast<SVGPointListAndInfo*>(tmp.mU.mPtr);
|
2010-12-08 15:15:53 +03:00
|
|
|
nsresult rv = list->CopyFrom(mVal->mBaseVal);
|
|
|
|
if (NS_SUCCEEDED(rv)) {
|
|
|
|
list->SetInfo(mElement);
|
2020-01-20 19:17:06 +03:00
|
|
|
std::swap(val, tmp);
|
2010-12-08 15:15:53 +03:00
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
nsresult SVGAnimatedPointList::SMILAnimatedPointList::SetAnimValue(
|
2019-05-01 11:47:10 +03:00
|
|
|
const SMILValue& aValue) {
|
2010-12-08 15:15:53 +03:00
|
|
|
NS_ASSERTION(aValue.mType == &SVGPointListSMILType::sSingleton,
|
|
|
|
"Unexpected type to assign animated value");
|
|
|
|
if (aValue.mType == &SVGPointListSMILType::sSingleton) {
|
2019-05-01 11:47:10 +03:00
|
|
|
mVal->SetAnimValue(*static_cast<SVGPointListAndInfo*>(aValue.mU.mPtr),
|
2010-12-08 15:15:53 +03:00
|
|
|
mElement);
|
|
|
|
}
|
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SVGAnimatedPointList::SMILAnimatedPointList::ClearAnimValue() {
|
|
|
|
if (mVal->mAnimVal) {
|
|
|
|
mVal->ClearAnimValue(mElement);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-14 22:47:27 +04:00
|
|
|
} // namespace mozilla
|