fune/dom/svg/DOMSVGPoint.cpp
Nathan Froyd e3ebda1914 Bug 1223932 - delete guard object uses from the tree; r=jwalden
CLOSED TREE

We don't need these macros anymore, for two reasons:

1. We have static analysis to provide the same sort of checks via `MOZ_RAII`
   and friends.
2. clang now warns for the "temporary that should have been a declaration" case.

The extra requirements on class construction also show up during debug tests
as performance problems.

This change was automated by using the following sed script:

```
# Remove declarations in classes.
/MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER/d
/MOZ_GUARD_OBJECT_NOTIFIER_INIT/d

# Remove individual macros, carefully.
{
  # We don't have to worry about substrings here because the closing
  # parenthesis "anchors" the match.
  s/MOZ_GUARD_OBJECT_NOTIFIER_PARAM)/)/g;
  s/MOZ_GUARD_OBJECT_NOTIFIER_PARAM_TO_PARENT)/)/g;
  s/MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL)/)/g;
  s/MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_IN_IMPL)/)/g;

  # Remove the longer identifier first.
  s/MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_TO_PARENT//g;
  s/MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM//g;
}

# Remove the actual include.
\@# *include "mozilla/GuardObjects.h"@d
```

and running:

```
find . -name \*.cpp -o -name \*.h | grep -v 'GuardObjects.h' |xargs sed -i -f script 2>/dev/null
mach clang-format
```

Differential Revision: https://phabricator.services.mozilla.com/D85168
2020-07-30 14:22:38 +00:00

120 lines
3.4 KiB
C++

/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
/* 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/. */
#include "DOMSVGPoint.h"
#include "DOMSVGPointList.h"
#include "gfx2DGlue.h"
#include "mozAutoDocUpdate.h"
#include "nsCOMPtr.h"
#include "nsError.h"
#include "SVGPoint.h"
#include "mozilla/dom/DOMMatrix.h"
#include "mozilla/dom/SVGElement.h"
// See the architecture comment in DOMSVGPointList.h.
using namespace mozilla::gfx;
namespace mozilla {
namespace dom {
//----------------------------------------------------------------------
// Helper class: AutoChangePointNotifier
// Stack-based helper class to pair calls to WillChangePointList and
// DidChangePointList.
class MOZ_RAII AutoChangePointNotifier : public mozAutoDocUpdate {
public:
explicit AutoChangePointNotifier(DOMSVGPoint* aPoint)
: mozAutoDocUpdate(aPoint->Element()->GetComposedDoc(), true),
mPoint(aPoint) {
MOZ_ASSERT(mPoint, "Expecting non-null point");
MOZ_ASSERT(mPoint->HasOwner(),
"Expecting list to have an owner for notification");
mEmptyOrOldValue = mPoint->Element()->WillChangePointList(*this);
}
~AutoChangePointNotifier() {
mPoint->Element()->DidChangePointList(mEmptyOrOldValue, *this);
// Null check mPoint->mList, since DidChangePointList can run script,
// potentially removing mPoint from its list.
if (mPoint->mList && mPoint->mList->AttrIsAnimating()) {
mPoint->Element()->AnimationNeedsResample();
}
}
private:
DOMSVGPoint* const mPoint;
nsAttrValue mEmptyOrOldValue;
};
float DOMSVGPoint::X() {
if (mIsAnimValItem && HasOwner()) {
Element()->FlushAnimations(); // May make HasOwner() == false
}
return HasOwner() ? InternalItem().mX : mPt.mX;
}
void DOMSVGPoint::SetX(float aX, ErrorResult& rv) {
if (mIsAnimValItem || mIsReadonly) {
rv.Throw(NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR);
return;
}
if (HasOwner()) {
if (InternalItem().mX == aX) {
return;
}
AutoChangePointNotifier notifier(this);
InternalItem().mX = aX;
return;
}
mPt.mX = aX;
}
float DOMSVGPoint::Y() {
if (mIsAnimValItem && HasOwner()) {
Element()->FlushAnimations(); // May make HasOwner() == false
}
return HasOwner() ? InternalItem().mY : mPt.mY;
}
void DOMSVGPoint::SetY(float aY, ErrorResult& rv) {
if (mIsAnimValItem || mIsReadonly) {
rv.Throw(NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR);
return;
}
if (HasOwner()) {
if (InternalItem().mY == aY) {
return;
}
AutoChangePointNotifier notifier(this);
InternalItem().mY = aY;
return;
}
mPt.mY = aY;
}
already_AddRefed<nsISVGPoint> DOMSVGPoint::MatrixTransform(
const DOMMatrix2DInit& aMatrix, ErrorResult& aRv) {
RefPtr<DOMMatrixReadOnly> matrix =
DOMMatrixReadOnly::FromMatrix(GetParentObject(), aMatrix, aRv);
if (aRv.Failed()) {
return nullptr;
}
const auto* matrix2D = matrix->GetInternal2D();
if (!matrix2D->IsFinite()) {
aRv.ThrowTypeError<MSG_NOT_FINITE>("MatrixTransform matrix");
return nullptr;
}
auto pt = matrix2D->TransformPoint(HasOwner() ? InternalItem() : mPt);
nsCOMPtr<nsISVGPoint> newPoint = new DOMSVGPoint(ToPoint(pt));
return newPoint.forget();
}
} // namespace dom
} // namespace mozilla