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/. */
|
2008-06-14 13:09:44 +04:00
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
#include "SVGAnimatedString.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
|
|
|
|
2010-10-07 23:19:32 +04:00
|
|
|
#include "SMILStringType.h"
|
2019-01-24 00:48:00 +03:00
|
|
|
#include "SVGAttrTearoffTable.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"
|
2010-10-07 23:19:32 +04:00
|
|
|
|
2013-06-15 02:37:27 +04:00
|
|
|
using namespace mozilla::dom;
|
2008-06-14 13:09:44 +04:00
|
|
|
|
2019-01-06 20:52:55 +03:00
|
|
|
namespace mozilla {
|
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
NS_SVG_VAL_IMPL_CYCLE_COLLECTION_WRAPPERCACHED(
|
|
|
|
SVGAnimatedString::DOMAnimatedString, mSVGElement)
|
2008-06-14 13:09:44 +04:00
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(SVGAnimatedString::DOMAnimatedString)
|
|
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(SVGAnimatedString::DOMAnimatedString)
|
2008-12-30 19:32:22 +03:00
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SVGAnimatedString::DOMAnimatedString)
|
2013-06-15 02:37:27 +04:00
|
|
|
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
|
2008-06-14 13:09:44 +04:00
|
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
|
|
NS_INTERFACE_MAP_END
|
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
static inline SVGAttrTearoffTable<SVGAnimatedString,
|
|
|
|
SVGAnimatedString::DOMAnimatedString>&
|
2013-05-31 02:34:53 +04:00
|
|
|
SVGAnimatedStringTearoffTable() {
|
2019-04-04 20:40:56 +03:00
|
|
|
static SVGAttrTearoffTable<SVGAnimatedString,
|
|
|
|
SVGAnimatedString::DOMAnimatedString>
|
2013-05-31 02:34:53 +04:00
|
|
|
sSVGAnimatedStringTearoffTable;
|
|
|
|
return sSVGAnimatedStringTearoffTable;
|
|
|
|
}
|
2012-12-21 13:18:58 +04:00
|
|
|
|
2008-06-14 13:09:44 +04:00
|
|
|
/* Implementation */
|
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
void SVGAnimatedString::SetBaseValue(const nsAString& aValue,
|
|
|
|
SVGElement* aSVGElement, bool aDoSetAttr) {
|
2009-01-22 03:56:51 +03:00
|
|
|
NS_ASSERTION(aSVGElement, "Null element passed to SetBaseValue");
|
|
|
|
|
2011-10-17 18:59:28 +04:00
|
|
|
mIsBaseSet = true;
|
2009-01-22 03:56:51 +03:00
|
|
|
if (aDoSetAttr) {
|
|
|
|
aSVGElement->SetStringBaseValue(mAttrEnum, aValue);
|
|
|
|
}
|
2010-10-07 23:19:32 +04:00
|
|
|
if (mAnimVal) {
|
|
|
|
aSVGElement->AnimationNeedsResample();
|
|
|
|
}
|
2009-01-22 03:56:51 +03:00
|
|
|
|
|
|
|
aSVGElement->DidChangeString(mAttrEnum);
|
|
|
|
}
|
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
void SVGAnimatedString::GetAnimValue(nsAString& aResult,
|
|
|
|
const SVGElement* aSVGElement) const {
|
2010-10-07 23:19:32 +04:00
|
|
|
if (mAnimVal) {
|
2009-01-22 03:56:51 +03:00
|
|
|
aResult = *mAnimVal;
|
2010-10-07 23:19:32 +04:00
|
|
|
return;
|
|
|
|
}
|
2009-01-22 03:56:51 +03:00
|
|
|
|
|
|
|
aSVGElement->GetStringBaseValue(mAttrEnum, aResult);
|
2008-06-14 13:09:44 +04:00
|
|
|
}
|
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
void SVGAnimatedString::SetAnimValue(const nsAString& aValue,
|
|
|
|
SVGElement* aSVGElement) {
|
2010-10-07 23:19:32 +04:00
|
|
|
if (aSVGElement->IsStringAnimatable(mAttrEnum)) {
|
2012-06-02 03:53:06 +04:00
|
|
|
if (mAnimVal && mAnimVal->Equals(aValue)) {
|
|
|
|
return;
|
|
|
|
}
|
2010-10-07 23:19:32 +04:00
|
|
|
if (!mAnimVal) {
|
2020-02-25 23:03:26 +03:00
|
|
|
mAnimVal = MakeUnique<nsString>();
|
2010-10-07 23:19:32 +04:00
|
|
|
}
|
|
|
|
*mAnimVal = aValue;
|
|
|
|
aSVGElement->DidAnimateString(mAttrEnum);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
already_AddRefed<DOMSVGAnimatedString> SVGAnimatedString::ToDOMAnimatedString(
|
2018-12-21 11:58:14 +03:00
|
|
|
SVGElement* aSVGElement) {
|
2015-10-18 08:24:48 +03:00
|
|
|
RefPtr<DOMAnimatedString> domAnimatedString =
|
2013-05-31 02:34:53 +04:00
|
|
|
SVGAnimatedStringTearoffTable().GetTearoff(this);
|
2012-12-21 13:18:58 +04:00
|
|
|
if (!domAnimatedString) {
|
|
|
|
domAnimatedString = new DOMAnimatedString(this, aSVGElement);
|
2013-05-31 02:34:53 +04:00
|
|
|
SVGAnimatedStringTearoffTable().AddTearoff(this, domAnimatedString);
|
2012-12-21 13:18:58 +04:00
|
|
|
}
|
2008-06-14 13:09:44 +04:00
|
|
|
|
2013-02-07 12:08:56 +04:00
|
|
|
return domAnimatedString.forget();
|
2008-06-14 13:09:44 +04:00
|
|
|
}
|
2010-10-07 23:19:32 +04:00
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
SVGAnimatedString::DOMAnimatedString::~DOMAnimatedString() {
|
2013-05-31 02:34:53 +04:00
|
|
|
SVGAnimatedStringTearoffTable().RemoveTearoff(mVal);
|
2012-12-21 13:18:58 +04:00
|
|
|
}
|
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
UniquePtr<SMILAttr> SVGAnimatedString::ToSMILAttr(SVGElement* aSVGElement) {
|
2017-03-30 07:10:07 +03:00
|
|
|
return MakeUnique<SMILString>(this, aSVGElement);
|
2010-10-07 23:19:32 +04:00
|
|
|
}
|
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
nsresult SVGAnimatedString::SMILString::ValueFromString(
|
2013-03-19 07:18:45 +04:00
|
|
|
const nsAString& aStr, const dom::SVGAnimationElement* /*aSrcElement*/,
|
2019-01-23 16:48:08 +03:00
|
|
|
SMILValue& aValue, bool& aPreventCachingOfSandwich) const {
|
|
|
|
SMILValue val(SMILStringType::Singleton());
|
2010-10-07 23:19:32 +04:00
|
|
|
|
|
|
|
*static_cast<nsAString*>(val.mU.mPtr) = aStr;
|
2018-05-30 22:15:35 +03:00
|
|
|
aValue = std::move(val);
|
2011-10-17 18:59:28 +04:00
|
|
|
aPreventCachingOfSandwich = false;
|
2010-10-07 23:19:32 +04:00
|
|
|
return NS_OK;
|
|
|
|
}
|
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
SMILValue SVGAnimatedString::SMILString::GetBaseValue() const {
|
2019-01-23 16:48:08 +03:00
|
|
|
SMILValue val(SMILStringType::Singleton());
|
2010-10-07 23:19:32 +04:00
|
|
|
mSVGElement->GetStringBaseValue(mVal->mAttrEnum,
|
|
|
|
*static_cast<nsAString*>(val.mU.mPtr));
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
void SVGAnimatedString::SMILString::ClearAnimValue() {
|
2010-10-07 23:19:32 +04:00
|
|
|
if (mVal->mAnimVal) {
|
2012-07-30 18:20:58 +04:00
|
|
|
mVal->mAnimVal = nullptr;
|
2010-10-07 23:19:32 +04:00
|
|
|
mSVGElement->DidAnimateString(mVal->mAttrEnum);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-04 20:40:56 +03:00
|
|
|
nsresult SVGAnimatedString::SMILString::SetAnimValue(const SMILValue& aValue) {
|
2013-05-31 02:34:53 +04:00
|
|
|
NS_ASSERTION(aValue.mType == SMILStringType::Singleton(),
|
2010-10-07 23:19:32 +04:00
|
|
|
"Unexpected type to assign animated value");
|
2013-05-31 02:34:53 +04:00
|
|
|
if (aValue.mType == SMILStringType::Singleton()) {
|
2010-10-07 23:19:32 +04:00
|
|
|
mVal->SetAnimValue(*static_cast<nsAString*>(aValue.mU.mPtr), mSVGElement);
|
|
|
|
}
|
|
|
|
return NS_OK;
|
|
|
|
}
|
2019-01-06 20:52:55 +03:00
|
|
|
|
|
|
|
} // namespace mozilla
|