mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 1239100 - Implement SVGGeometryElement interface. r=cam r=peterv
--HG-- rename : dom/svg/nsSVGPathGeometryElement.cpp => dom/svg/SVGGeometryElement.cpp rename : dom/svg/nsSVGPathGeometryElement.h => dom/svg/SVGGeometryElement.h rename : dom/svg/nsSVGPolyElement.cpp => dom/svg/SVGPolyElement.cpp rename : dom/svg/nsSVGPolyElement.h => dom/svg/SVGPolyElement.h rename : layout/svg/nsSVGPathGeometryFrame.cpp => layout/svg/SVGGeometryFrame.cpp rename : layout/svg/nsSVGPathGeometryFrame.h => layout/svg/SVGGeometryFrame.h
This commit is contained in:
parent
a122b98497
commit
783bfbb1e4
@ -61,7 +61,7 @@
|
||||
#include "nsIObserverService.h"
|
||||
#include "nsLayoutUtils.h"
|
||||
#include "nsPluginFrame.h"
|
||||
#include "nsSVGPathGeometryFrame.h"
|
||||
#include "SVGGeometryFrame.h"
|
||||
#include "nsTreeBodyFrame.h"
|
||||
#include "nsTreeColumns.h"
|
||||
#include "nsTreeUtils.h"
|
||||
@ -1173,8 +1173,8 @@ nsAccessibilityService::CreateAccessible(nsINode* aNode,
|
||||
|
||||
if (!newAcc) {
|
||||
if (content->IsSVGElement()) {
|
||||
nsSVGPathGeometryFrame* pathGeometryFrame = do_QueryFrame(frame);
|
||||
if (pathGeometryFrame) {
|
||||
SVGGeometryFrame* geometryFrame = do_QueryFrame(frame);
|
||||
if (geometryFrame) {
|
||||
// A graphic elements: rect, circle, ellipse, line, path, polygon,
|
||||
// polyline and image. A 'use' and 'text' graphic elements require
|
||||
// special support.
|
||||
|
@ -2051,6 +2051,7 @@ GK_ATOM(svgFEUnstyledLeafFrame, "SVGFEUnstyledLeafFrame")
|
||||
GK_ATOM(svgFilterFrame, "SVGFilterFrame")
|
||||
GK_ATOM(svgForeignObjectFrame, "SVGForeignObjectFrame")
|
||||
GK_ATOM(svgGenericContainerFrame, "SVGGenericContainerFrame")
|
||||
GK_ATOM(svgGeometryFrame, "SVGGeometryFrame")
|
||||
GK_ATOM(svgGFrame, "SVGGFrame")
|
||||
GK_ATOM(svgGradientFrame, "SVGGradientFrame")
|
||||
GK_ATOM(svgImageFrame, "SVGImageFrame")
|
||||
@ -2061,7 +2062,6 @@ GK_ATOM(svgMarkerAnonChildFrame, "SVGMarkerAnonChildFrame")
|
||||
GK_ATOM(svgMaskFrame, "SVGMaskFrame")
|
||||
GK_ATOM(svgOuterSVGFrame, "SVGOuterSVGFrame")
|
||||
GK_ATOM(svgOuterSVGAnonChildFrame, "SVGOuterSVGAnonChildFrame")
|
||||
GK_ATOM(svgPathGeometryFrame, "SVGPathGeometryFrame")
|
||||
GK_ATOM(svgPatternFrame, "SVGPatternFrame")
|
||||
GK_ATOM(svgRadialGradientFrame, "SVGRadialGradientFrame")
|
||||
GK_ATOM(svgStopFrame, "SVGStopFrame")
|
||||
|
@ -80,7 +80,7 @@ SVGCircleElement::GetLengthInfo()
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGPathGeometryElement methods
|
||||
// SVGGeometryElement methods
|
||||
|
||||
bool
|
||||
SVGCircleElement::GetGeometryBounds(Rect* aBounds,
|
||||
|
@ -7,17 +7,17 @@
|
||||
#ifndef mozilla_dom_SVGCircleElement_h
|
||||
#define mozilla_dom_SVGCircleElement_h
|
||||
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
#include "nsSVGLength2.h"
|
||||
|
||||
nsresult NS_NewSVGCircleElement(nsIContent **aResult,
|
||||
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
|
||||
|
||||
typedef nsSVGPathGeometryElement SVGCircleElementBase;
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
typedef SVGGeometryElement SVGCircleElementBase;
|
||||
|
||||
class SVGCircleElement final : public SVGCircleElementBase
|
||||
{
|
||||
protected:
|
||||
@ -30,7 +30,7 @@ public:
|
||||
// nsSVGSVGElement methods:
|
||||
virtual bool HasValidDimensions() const override;
|
||||
|
||||
// nsSVGPathGeometryElement methods:
|
||||
// SVGGeometryElement methods:
|
||||
virtual bool GetGeometryBounds(Rect* aBounds, const StrokeOptions& aStrokeOptions,
|
||||
const Matrix& aToBoundsSpace,
|
||||
const Matrix* aToNonScalingStrokeSpace = nullptr) override;
|
||||
|
@ -91,7 +91,7 @@ SVGEllipseElement::GetLengthInfo()
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGPathGeometryElement methods
|
||||
// SVGGeometryElement methods
|
||||
|
||||
bool
|
||||
SVGEllipseElement::GetGeometryBounds(Rect* aBounds,
|
||||
|
@ -7,7 +7,7 @@
|
||||
#ifndef mozilla_dom_SVGEllipseElement_h
|
||||
#define mozilla_dom_SVGEllipseElement_h
|
||||
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
#include "nsSVGLength2.h"
|
||||
|
||||
nsresult NS_NewSVGEllipseElement(nsIContent **aResult,
|
||||
@ -16,7 +16,7 @@ nsresult NS_NewSVGEllipseElement(nsIContent **aResult,
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
typedef nsSVGPathGeometryElement SVGEllipseElementBase;
|
||||
typedef SVGGeometryElement SVGEllipseElementBase;
|
||||
|
||||
class SVGEllipseElement final : public SVGEllipseElementBase
|
||||
{
|
||||
@ -30,7 +30,7 @@ public:
|
||||
// nsSVGSVGElement methods:
|
||||
virtual bool HasValidDimensions() const override;
|
||||
|
||||
// nsSVGPathGeometryElement methods:
|
||||
// SVGGeometryElement methods:
|
||||
virtual bool GetGeometryBounds(Rect* aBounds, const StrokeOptions& aStrokeOptions,
|
||||
const Matrix& aToBoundsSpace,
|
||||
const Matrix* aToNonScalingStrokeSpace = nullptr) override;
|
||||
|
@ -4,8 +4,9 @@
|
||||
* 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 "nsSVGPathGeometryElement.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
|
||||
#include "DOMSVGPoint.h"
|
||||
#include "gfxPlatform.h"
|
||||
#include "mozilla/gfx/2D.h"
|
||||
#include "nsComputedDOMStyle.h"
|
||||
@ -16,30 +17,43 @@
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::gfx;
|
||||
|
||||
nsSVGElement::NumberInfo SVGGeometryElement::sNumberInfo =
|
||||
{ &nsGkAtoms::pathLength, 0, false };
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// Implementation
|
||||
|
||||
nsSVGPathGeometryElement::nsSVGPathGeometryElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
|
||||
: nsSVGPathGeometryElementBase(aNodeInfo)
|
||||
SVGGeometryElement::SVGGeometryElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
|
||||
: SVGGeometryElementBase(aNodeInfo)
|
||||
{
|
||||
}
|
||||
|
||||
nsSVGElement::NumberAttributesInfo
|
||||
SVGGeometryElement::GetNumberInfo()
|
||||
{
|
||||
return NumberAttributesInfo(&mPathLength, &sNumberInfo, 1);
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsSVGPathGeometryElement::AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
|
||||
const nsAttrValue* aValue, bool aNotify)
|
||||
SVGGeometryElement::AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
|
||||
const nsAttrValue* aValue, bool aNotify)
|
||||
{
|
||||
if (mCachedPath &&
|
||||
aNamespaceID == kNameSpaceID_None &&
|
||||
AttributeDefinesGeometry(aName)) {
|
||||
mCachedPath = nullptr;
|
||||
}
|
||||
return nsSVGPathGeometryElementBase::AfterSetAttr(aNamespaceID, aName,
|
||||
aValue, aNotify);
|
||||
return SVGGeometryElementBase::AfterSetAttr(aNamespaceID, aName,
|
||||
aValue, aNotify);
|
||||
}
|
||||
|
||||
bool
|
||||
nsSVGPathGeometryElement::AttributeDefinesGeometry(const nsIAtom *aName)
|
||||
SVGGeometryElement::AttributeDefinesGeometry(const nsIAtom *aName)
|
||||
{
|
||||
if (aName == nsGkAtoms::pathLength) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Check for nsSVGLength2 attribute
|
||||
LengthAttributesInfo info = GetLengthInfo();
|
||||
for (uint32_t i = 0; i < info.mLengthCount; i++) {
|
||||
@ -52,10 +66,10 @@ nsSVGPathGeometryElement::AttributeDefinesGeometry(const nsIAtom *aName)
|
||||
}
|
||||
|
||||
bool
|
||||
nsSVGPathGeometryElement::GeometryDependsOnCoordCtx()
|
||||
SVGGeometryElement::GeometryDependsOnCoordCtx()
|
||||
{
|
||||
// Check the nsSVGLength2 attribute
|
||||
LengthAttributesInfo info = const_cast<nsSVGPathGeometryElement*>(this)->GetLengthInfo();
|
||||
LengthAttributesInfo info = const_cast<SVGGeometryElement*>(this)->GetLengthInfo();
|
||||
for (uint32_t i = 0; i < info.mLengthCount; i++) {
|
||||
if (info.mLengths[i].GetSpecifiedUnitType() == nsIDOMSVGLength::SVG_LENGTHTYPE_PERCENTAGE) {
|
||||
return true;
|
||||
@ -65,19 +79,19 @@ nsSVGPathGeometryElement::GeometryDependsOnCoordCtx()
|
||||
}
|
||||
|
||||
bool
|
||||
nsSVGPathGeometryElement::IsMarkable()
|
||||
SVGGeometryElement::IsMarkable()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
void
|
||||
nsSVGPathGeometryElement::GetMarkPoints(nsTArray<nsSVGMark> *aMarks)
|
||||
SVGGeometryElement::GetMarkPoints(nsTArray<nsSVGMark> *aMarks)
|
||||
{
|
||||
}
|
||||
|
||||
already_AddRefed<Path>
|
||||
nsSVGPathGeometryElement::GetOrBuildPath(const DrawTarget& aDrawTarget,
|
||||
FillRule aFillRule)
|
||||
SVGGeometryElement::GetOrBuildPath(const DrawTarget& aDrawTarget,
|
||||
FillRule aFillRule)
|
||||
{
|
||||
// We only cache the path if it matches the backend used for screen painting:
|
||||
bool cacheable = aDrawTarget.GetBackendType() ==
|
||||
@ -102,13 +116,13 @@ nsSVGPathGeometryElement::GetOrBuildPath(const DrawTarget& aDrawTarget,
|
||||
}
|
||||
|
||||
already_AddRefed<Path>
|
||||
nsSVGPathGeometryElement::GetOrBuildPathForMeasuring()
|
||||
SVGGeometryElement::GetOrBuildPathForMeasuring()
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
FillRule
|
||||
nsSVGPathGeometryElement::GetFillRule()
|
||||
SVGGeometryElement::GetFillRule()
|
||||
{
|
||||
FillRule fillRule = FillRule::FILL_WINDING; // Equivalent to StyleFillRule::Nonzero
|
||||
|
||||
@ -130,3 +144,42 @@ nsSVGPathGeometryElement::GetFillRule()
|
||||
|
||||
return fillRule;
|
||||
}
|
||||
|
||||
float
|
||||
SVGGeometryElement::GetTotalLength()
|
||||
{
|
||||
RefPtr<Path> flat = GetOrBuildPathForMeasuring();
|
||||
return flat ? flat->ComputeLength() : 0.f;
|
||||
}
|
||||
|
||||
already_AddRefed<nsISVGPoint>
|
||||
SVGGeometryElement::GetPointAtLength(float distance, ErrorResult& rv)
|
||||
{
|
||||
RefPtr<Path> path = GetOrBuildPathForMeasuring();
|
||||
if (!path) {
|
||||
rv.Throw(NS_ERROR_FAILURE);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
float totalLength = path->ComputeLength();
|
||||
if (mPathLength.IsExplicitlySet()) {
|
||||
float pathLength = mPathLength.GetAnimValue();
|
||||
if (pathLength <= 0) {
|
||||
rv.Throw(NS_ERROR_FAILURE);
|
||||
return nullptr;
|
||||
}
|
||||
distance *= totalLength / pathLength;
|
||||
}
|
||||
distance = std::max(0.f, distance);
|
||||
distance = std::min(totalLength, distance);
|
||||
|
||||
nsCOMPtr<nsISVGPoint> point =
|
||||
new DOMSVGPoint(path->ComputePointAtLength(distance));
|
||||
return point.forget();
|
||||
}
|
||||
|
||||
already_AddRefed<SVGAnimatedNumber>
|
||||
SVGGeometryElement::PathLength()
|
||||
{
|
||||
return mPathLength.ToDOMAnimatedNumber(this);
|
||||
}
|
@ -4,11 +4,13 @@
|
||||
* 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/. */
|
||||
|
||||
#ifndef __NS_SVGPATHGEOMETRYELEMENT_H__
|
||||
#define __NS_SVGPATHGEOMETRYELEMENT_H__
|
||||
#ifndef mozilla_dom_SVGGeometryElement_h
|
||||
#define mozilla_dom_SVGGeometryElement_h
|
||||
|
||||
#include "mozilla/gfx/2D.h"
|
||||
#include "SVGGraphicsElement.h"
|
||||
#include "nsISVGPoint.h"
|
||||
#include "nsSVGNumber2.h"
|
||||
|
||||
struct nsSVGMark {
|
||||
enum Type {
|
||||
@ -25,9 +27,14 @@ struct nsSVGMark {
|
||||
x(aX), y(aY), angle(aAngle), type(aType) {}
|
||||
};
|
||||
|
||||
typedef mozilla::dom::SVGGraphicsElement nsSVGPathGeometryElementBase;
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
class nsSVGPathGeometryElement : public nsSVGPathGeometryElementBase
|
||||
class SVGAnimatedNumber;
|
||||
|
||||
typedef mozilla::dom::SVGGraphicsElement SVGGeometryElementBase;
|
||||
|
||||
class SVGGeometryElement : public SVGGeometryElementBase
|
||||
{
|
||||
protected:
|
||||
typedef mozilla::gfx::CapStyle CapStyle;
|
||||
@ -42,7 +49,7 @@ protected:
|
||||
typedef mozilla::gfx::StrokeOptions StrokeOptions;
|
||||
|
||||
public:
|
||||
explicit nsSVGPathGeometryElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
|
||||
explicit SVGGeometryElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
|
||||
|
||||
virtual nsresult AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
|
||||
const nsAttrValue* aValue, bool aNotify) override;
|
||||
@ -159,7 +166,7 @@ public:
|
||||
* that is created may be cached and returned on subsequent calls.
|
||||
*/
|
||||
virtual already_AddRefed<Path> GetOrBuildPath(const DrawTarget& aDrawTarget,
|
||||
FillRule fillRule);
|
||||
FillRule fillRule);
|
||||
|
||||
/**
|
||||
* The same as GetOrBuildPath, but bypasses the cache (neither returns any
|
||||
@ -191,8 +198,22 @@ public:
|
||||
*/
|
||||
FillRule GetFillRule();
|
||||
|
||||
// WebIDL
|
||||
already_AddRefed<SVGAnimatedNumber> PathLength();
|
||||
float GetTotalLength();
|
||||
already_AddRefed<nsISVGPoint>
|
||||
GetPointAtLength(float distance, ErrorResult& rv);
|
||||
|
||||
protected:
|
||||
// nsSVGElement method
|
||||
virtual NumberAttributesInfo GetNumberInfo() override;
|
||||
|
||||
nsSVGNumber2 mPathLength;
|
||||
static NumberInfo sNumberInfo;
|
||||
mutable RefPtr<Path> mCachedPath;
|
||||
};
|
||||
|
||||
#endif
|
||||
} // namespace dom
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_dom_SVGGeometryElement_h
|
@ -235,7 +235,7 @@ SVGImageElement::IsAttributeMapped(const nsIAtom* name) const
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGPathGeometryElement methods
|
||||
// SVGGeometryElement methods
|
||||
|
||||
/* For the purposes of the update/invalidation logic pretend to
|
||||
be a rectangle. */
|
||||
|
@ -9,21 +9,21 @@
|
||||
|
||||
#include "nsImageLoadingContent.h"
|
||||
#include "nsSVGLength2.h"
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "nsSVGString.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
#include "SVGAnimatedPreserveAspectRatio.h"
|
||||
|
||||
nsresult NS_NewSVGImageElement(nsIContent **aResult,
|
||||
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
|
||||
|
||||
typedef nsSVGPathGeometryElement SVGImageElementBase;
|
||||
|
||||
class nsSVGImageFrame;
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
class DOMSVGAnimatedPreserveAspectRatio;
|
||||
|
||||
typedef SVGGeometryElement SVGImageElementBase;
|
||||
|
||||
class SVGImageElement : public SVGImageElementBase,
|
||||
public nsImageLoadingContent
|
||||
{
|
||||
@ -56,7 +56,7 @@ public:
|
||||
|
||||
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const override;
|
||||
|
||||
// nsSVGPathGeometryElement methods:
|
||||
// SVGGeometryElement methods:
|
||||
virtual bool GetGeometryBounds(Rect* aBounds, const StrokeOptions& aStrokeOptions,
|
||||
const Matrix& aToBoundsSpace,
|
||||
const Matrix* aToNonScalingStrokeSpace = nullptr) override;
|
||||
|
@ -110,7 +110,7 @@ SVGLineElement::GetLengthInfo()
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGPathGeometryElement methods
|
||||
// SVGGeometryElement methods
|
||||
|
||||
void
|
||||
SVGLineElement::GetMarkPoints(nsTArray<nsSVGMark> *aMarks) {
|
||||
|
@ -7,7 +7,7 @@
|
||||
#ifndef mozilla_dom_SVGLineElement_h
|
||||
#define mozilla_dom_SVGLineElement_h
|
||||
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
#include "nsSVGLength2.h"
|
||||
|
||||
nsresult NS_NewSVGLineElement(nsIContent **aResult,
|
||||
@ -16,7 +16,7 @@ nsresult NS_NewSVGLineElement(nsIContent **aResult,
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
typedef nsSVGPathGeometryElement SVGLineElementBase;
|
||||
typedef SVGGeometryElement SVGLineElementBase;
|
||||
|
||||
class SVGLineElement final : public SVGLineElementBase
|
||||
{
|
||||
@ -34,7 +34,7 @@ public:
|
||||
// nsIContent interface
|
||||
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const override;
|
||||
|
||||
// nsSVGPathGeometryElement methods:
|
||||
// SVGGeometryElement methods:
|
||||
virtual bool IsMarkable() override { return true; }
|
||||
virtual void GetMarkPoints(nsTArray<nsSVGMark> *aMarks) override;
|
||||
virtual void GetAsSimplePath(SimplePath* aSimplePath) override;
|
||||
|
@ -15,10 +15,10 @@
|
||||
#include "nsError.h"
|
||||
#include "nsString.h"
|
||||
#include "nsSVGPathDataParser.h"
|
||||
#include "nsSVGPathGeometryElement.h" // for nsSVGMark
|
||||
#include <stdarg.h>
|
||||
#include "nsStyleConsts.h"
|
||||
#include "SVGContentUtils.h"
|
||||
#include "SVGGeometryElement.h" // for nsSVGMark
|
||||
#include "SVGPathSegUtils.h"
|
||||
#include <algorithm>
|
||||
|
||||
|
@ -1,4 +1,3 @@
|
||||
/* -*- 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
|
||||
@ -10,7 +9,6 @@
|
||||
|
||||
#include "DOMSVGPathSeg.h"
|
||||
#include "DOMSVGPathSegList.h"
|
||||
#include "DOMSVGPoint.h"
|
||||
#include "gfx2DGlue.h"
|
||||
#include "gfxPlatform.h"
|
||||
#include "mozilla/dom/SVGPathElementBinding.h"
|
||||
@ -36,9 +34,6 @@ SVGPathElement::WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
|
||||
return SVGPathElementBinding::Wrap(aCx, this, aGivenProto);
|
||||
}
|
||||
|
||||
nsSVGElement::NumberInfo SVGPathElement::sNumberInfo =
|
||||
{ &nsGkAtoms::pathLength, 0, false };
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// Implementation
|
||||
|
||||
@ -62,45 +57,6 @@ SVGPathElement::SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const
|
||||
|
||||
NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGPathElement)
|
||||
|
||||
already_AddRefed<SVGAnimatedNumber>
|
||||
SVGPathElement::PathLength()
|
||||
{
|
||||
return mPathLength.ToDOMAnimatedNumber(this);
|
||||
}
|
||||
|
||||
float
|
||||
SVGPathElement::GetTotalLength()
|
||||
{
|
||||
RefPtr<Path> flat = GetOrBuildPathForMeasuring();
|
||||
return flat ? flat->ComputeLength() : 0.f;
|
||||
}
|
||||
|
||||
already_AddRefed<nsISVGPoint>
|
||||
SVGPathElement::GetPointAtLength(float distance, ErrorResult& rv)
|
||||
{
|
||||
RefPtr<Path> path = GetOrBuildPathForMeasuring();
|
||||
if (!path) {
|
||||
rv.Throw(NS_ERROR_FAILURE);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
float totalLength = path->ComputeLength();
|
||||
if (mPathLength.IsExplicitlySet()) {
|
||||
float pathLength = mPathLength.GetAnimValue();
|
||||
if (pathLength <= 0) {
|
||||
rv.Throw(NS_ERROR_FAILURE);
|
||||
return nullptr;
|
||||
}
|
||||
distance *= totalLength / pathLength;
|
||||
}
|
||||
distance = std::max(0.f, distance);
|
||||
distance = std::min(totalLength, distance);
|
||||
|
||||
nsCOMPtr<nsISVGPoint> point =
|
||||
new DOMSVGPoint(path->ComputePointAtLength(distance));
|
||||
return point.forget();
|
||||
}
|
||||
|
||||
uint32_t
|
||||
SVGPathElement::GetPathSegAtLength(float distance)
|
||||
{
|
||||
@ -285,12 +241,6 @@ SVGPathElement::HasValidDimensions() const
|
||||
return !mD.GetAnimValue().IsEmpty();
|
||||
}
|
||||
|
||||
nsSVGElement::NumberAttributesInfo
|
||||
SVGPathElement::GetNumberInfo()
|
||||
{
|
||||
return NumberAttributesInfo(&mPathLength, &sNumberInfo, 1);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsIContent methods
|
||||
|
||||
@ -312,7 +262,7 @@ SVGPathElement::GetOrBuildPathForMeasuring()
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGPathGeometryElement methods
|
||||
// SVGGeometryElement methods
|
||||
|
||||
bool
|
||||
SVGPathElement::AttributeDefinesGeometry(const nsIAtom *aName)
|
||||
|
@ -9,22 +9,21 @@
|
||||
|
||||
#include "mozilla/gfx/2D.h"
|
||||
#include "mozilla/RefPtr.h"
|
||||
#include "nsSVGNumber2.h"
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "SVGAnimatedPathSegList.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
#include "DOMSVGPathSeg.h"
|
||||
|
||||
nsresult NS_NewSVGPathElement(nsIContent **aResult,
|
||||
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
|
||||
|
||||
typedef nsSVGPathGeometryElement SVGPathElementBase;
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
class nsISVGPoint;
|
||||
|
||||
namespace dom {
|
||||
|
||||
typedef SVGGeometryElement SVGPathElementBase;
|
||||
|
||||
class SVGPathElement final : public SVGPathElementBase
|
||||
{
|
||||
typedef mozilla::gfx::Path Path;
|
||||
@ -45,7 +44,7 @@ public:
|
||||
// nsSVGSVGElement methods:
|
||||
virtual bool HasValidDimensions() const override;
|
||||
|
||||
// nsSVGPathGeometryElement methods:
|
||||
// SVGGeometryElement methods:
|
||||
virtual bool AttributeDefinesGeometry(const nsIAtom *aName) override;
|
||||
virtual bool IsMarkable() override;
|
||||
virtual void GetMarkPoints(nsTArray<nsSVGMark> *aMarks) override;
|
||||
@ -82,9 +81,6 @@ public:
|
||||
float GetPathLengthScale(PathLengthScaleForType aFor);
|
||||
|
||||
// WebIDL
|
||||
already_AddRefed<SVGAnimatedNumber> PathLength();
|
||||
float GetTotalLength();
|
||||
already_AddRefed<nsISVGPoint> GetPointAtLength(float distance, ErrorResult& rv);
|
||||
uint32_t GetPathSegAtLength(float distance);
|
||||
already_AddRefed<DOMSVGPathSegClosePath> CreateSVGPathSegClosePath();
|
||||
already_AddRefed<DOMSVGPathSegMovetoAbs> CreateSVGPathSegMovetoAbs(float x, float y);
|
||||
@ -120,12 +116,7 @@ public:
|
||||
|
||||
protected:
|
||||
|
||||
// nsSVGElement method
|
||||
virtual NumberAttributesInfo GetNumberInfo() override;
|
||||
|
||||
SVGAnimatedPathSegList mD;
|
||||
nsSVGNumber2 mPathLength;
|
||||
static NumberInfo sNumberInfo;
|
||||
};
|
||||
|
||||
} // namespace dom
|
||||
|
@ -4,7 +4,7 @@
|
||||
* 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 "nsSVGPolyElement.h"
|
||||
#include "SVGPolyElement.h"
|
||||
#include "DOMSVGPointList.h"
|
||||
#include "mozilla/gfx/2D.h"
|
||||
#include "SVGContentUtils.h"
|
||||
@ -15,26 +15,26 @@ using namespace mozilla::gfx;
|
||||
//----------------------------------------------------------------------
|
||||
// nsISupports methods
|
||||
|
||||
NS_IMPL_ADDREF_INHERITED(nsSVGPolyElement,nsSVGPolyElementBase)
|
||||
NS_IMPL_RELEASE_INHERITED(nsSVGPolyElement,nsSVGPolyElementBase)
|
||||
NS_IMPL_ADDREF_INHERITED(SVGPolyElement,SVGPolyElementBase)
|
||||
NS_IMPL_RELEASE_INHERITED(SVGPolyElement,SVGPolyElementBase)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsSVGPolyElement)
|
||||
NS_INTERFACE_MAP_END_INHERITING(nsSVGPolyElementBase)
|
||||
NS_INTERFACE_MAP_BEGIN(SVGPolyElement)
|
||||
NS_INTERFACE_MAP_END_INHERITING(SVGPolyElementBase)
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// Implementation
|
||||
|
||||
nsSVGPolyElement::nsSVGPolyElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
|
||||
: nsSVGPolyElementBase(aNodeInfo)
|
||||
SVGPolyElement::SVGPolyElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
|
||||
: SVGPolyElementBase(aNodeInfo)
|
||||
{
|
||||
}
|
||||
|
||||
nsSVGPolyElement::~nsSVGPolyElement()
|
||||
SVGPolyElement::~SVGPolyElement()
|
||||
{
|
||||
}
|
||||
|
||||
already_AddRefed<DOMSVGPointList>
|
||||
nsSVGPolyElement::Points()
|
||||
SVGPolyElement::Points()
|
||||
{
|
||||
void *key = mPoints.GetBaseValKey();
|
||||
RefPtr<DOMSVGPointList> points = DOMSVGPointList::GetDOMWrapper(key, this, false);
|
||||
@ -42,7 +42,7 @@ nsSVGPolyElement::Points()
|
||||
}
|
||||
|
||||
already_AddRefed<DOMSVGPointList>
|
||||
nsSVGPolyElement::AnimatedPoints()
|
||||
SVGPolyElement::AnimatedPoints()
|
||||
{
|
||||
void *key = mPoints.GetAnimValKey();
|
||||
RefPtr<DOMSVGPointList> points = DOMSVGPointList::GetDOMWrapper(key, this, true);
|
||||
@ -54,30 +54,30 @@ nsSVGPolyElement::AnimatedPoints()
|
||||
// nsIContent methods
|
||||
|
||||
NS_IMETHODIMP_(bool)
|
||||
nsSVGPolyElement::IsAttributeMapped(const nsIAtom* name) const
|
||||
SVGPolyElement::IsAttributeMapped(const nsIAtom* name) const
|
||||
{
|
||||
static const MappedAttributeEntry* const map[] = {
|
||||
sMarkersMap
|
||||
};
|
||||
|
||||
return FindAttributeDependence(name, map) ||
|
||||
nsSVGPolyElementBase::IsAttributeMapped(name);
|
||||
SVGPolyElementBase::IsAttributeMapped(name);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGElement methods
|
||||
|
||||
/* virtual */ bool
|
||||
nsSVGPolyElement::HasValidDimensions() const
|
||||
SVGPolyElement::HasValidDimensions() const
|
||||
{
|
||||
return !mPoints.GetAnimValue().IsEmpty();
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGPathGeometryElement methods
|
||||
// SVGGeometryElement methods
|
||||
|
||||
bool
|
||||
nsSVGPolyElement::AttributeDefinesGeometry(const nsIAtom *aName)
|
||||
SVGPolyElement::AttributeDefinesGeometry(const nsIAtom *aName)
|
||||
{
|
||||
if (aName == nsGkAtoms::points)
|
||||
return true;
|
||||
@ -86,7 +86,7 @@ nsSVGPolyElement::AttributeDefinesGeometry(const nsIAtom *aName)
|
||||
}
|
||||
|
||||
void
|
||||
nsSVGPolyElement::GetMarkPoints(nsTArray<nsSVGMark> *aMarks)
|
||||
SVGPolyElement::GetMarkPoints(nsTArray<nsSVGMark> *aMarks)
|
||||
{
|
||||
const SVGPointList &points = mPoints.GetAnimValue();
|
||||
|
||||
@ -122,10 +122,10 @@ nsSVGPolyElement::GetMarkPoints(nsTArray<nsSVGMark> *aMarks)
|
||||
}
|
||||
|
||||
bool
|
||||
nsSVGPolyElement::GetGeometryBounds(Rect* aBounds,
|
||||
const StrokeOptions& aStrokeOptions,
|
||||
const Matrix& aToBoundsSpace,
|
||||
const Matrix* aToNonScalingStrokeSpace)
|
||||
SVGPolyElement::GetGeometryBounds(Rect* aBounds,
|
||||
const StrokeOptions& aStrokeOptions,
|
||||
const Matrix& aToBoundsSpace,
|
||||
const Matrix* aToNonScalingStrokeSpace)
|
||||
{
|
||||
const SVGPointList &points = mPoints.GetAnimValue();
|
||||
|
@ -8,21 +8,22 @@
|
||||
#define NS_SVGPOLYELEMENT_H_
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "SVGAnimatedPointList.h"
|
||||
|
||||
typedef nsSVGPathGeometryElement nsSVGPolyElementBase;
|
||||
#include "SVGGeometryElement.h"
|
||||
|
||||
namespace mozilla {
|
||||
class DOMSVGPointList;
|
||||
} // namespace mozilla
|
||||
|
||||
class nsSVGPolyElement : public nsSVGPolyElementBase
|
||||
namespace dom {
|
||||
|
||||
typedef SVGGeometryElement SVGPolyElementBase;
|
||||
|
||||
class SVGPolyElement : public SVGPolyElementBase
|
||||
{
|
||||
protected:
|
||||
explicit nsSVGPolyElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
|
||||
explicit SVGPolyElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
|
||||
|
||||
virtual ~nsSVGPolyElement();
|
||||
virtual ~SVGPolyElement();
|
||||
|
||||
public:
|
||||
//interfaces
|
||||
@ -42,7 +43,7 @@ public:
|
||||
// nsSVGElement methods:
|
||||
virtual bool HasValidDimensions() const override;
|
||||
|
||||
// nsSVGPathGeometryElement methods:
|
||||
// SVGGeometryElement methods:
|
||||
virtual bool AttributeDefinesGeometry(const nsIAtom *aName) override;
|
||||
virtual bool IsMarkable() override { return true; }
|
||||
virtual void GetMarkPoints(nsTArray<nsSVGMark> *aMarks) override;
|
||||
@ -58,4 +59,7 @@ protected:
|
||||
SVGAnimatedPointList mPoints;
|
||||
};
|
||||
|
||||
} // namespace dom
|
||||
} // namespace mozilla
|
||||
|
||||
#endif //NS_SVGPOLYELEMENT_H_
|
@ -37,12 +37,12 @@ SVGPolygonElement::SVGPolygonElement(already_AddRefed<mozilla::dom::NodeInfo>& a
|
||||
NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGPolygonElement)
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGPathGeometryElement methods
|
||||
// SVGGeometryElement methods
|
||||
|
||||
void
|
||||
SVGPolygonElement::GetMarkPoints(nsTArray<nsSVGMark> *aMarks)
|
||||
{
|
||||
nsSVGPolyElement::GetMarkPoints(aMarks);
|
||||
SVGPolyElement::GetMarkPoints(aMarks);
|
||||
|
||||
if (aMarks->IsEmpty() || aMarks->LastElement().type != nsSVGMark::eEnd) {
|
||||
return;
|
||||
@ -56,7 +56,7 @@ SVGPolygonElement::GetMarkPoints(nsTArray<nsSVGMark> *aMarks)
|
||||
endMark->angle = SVGContentUtils::AngleBisect(angle, endMark->angle);
|
||||
startMark->angle = SVGContentUtils::AngleBisect(angle, startMark->angle);
|
||||
// for a polygon (as opposed to a polyline) there's an implicit extra point
|
||||
// co-located with the start point that nsSVGPolyElement::GetMarkPoints
|
||||
// co-located with the start point that SVGPolyElement::GetMarkPoints
|
||||
// doesn't return
|
||||
aMarks->AppendElement(nsSVGMark(startMark->x, startMark->y, startMark->angle,
|
||||
nsSVGMark::eEnd));
|
||||
|
@ -8,16 +8,16 @@
|
||||
#define mozilla_dom_SVGPolygonElement_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsSVGPolyElement.h"
|
||||
#include "SVGPolyElement.h"
|
||||
|
||||
nsresult NS_NewSVGPolygonElement(nsIContent **aResult,
|
||||
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
|
||||
|
||||
typedef nsSVGPolyElement SVGPolygonElementBase;
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
typedef SVGPolyElement SVGPolygonElementBase;
|
||||
|
||||
class SVGPolygonElement final : public SVGPolygonElementBase
|
||||
{
|
||||
protected:
|
||||
@ -27,7 +27,7 @@ protected:
|
||||
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo));
|
||||
|
||||
public:
|
||||
// nsSVGPathGeometryElement methods:
|
||||
// SVGGeometryElement methods:
|
||||
virtual void GetMarkPoints(nsTArray<nsSVGMark> *aMarks) override;
|
||||
virtual already_AddRefed<Path> BuildPath(PathBuilder* aBuilder) override;
|
||||
|
||||
|
@ -36,7 +36,7 @@ SVGPolylineElement::SVGPolylineElement(already_AddRefed<mozilla::dom::NodeInfo>&
|
||||
NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGPolylineElement)
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGPathGeometryElement methods
|
||||
// SVGGeometryElement methods
|
||||
|
||||
already_AddRefed<Path>
|
||||
SVGPolylineElement::BuildPath(PathBuilder* aBuilder)
|
||||
|
@ -7,16 +7,16 @@
|
||||
#ifndef mozilla_dom_SVGPolylineElement_h
|
||||
#define mozilla_dom_SVGPolylineElement_h
|
||||
|
||||
#include "nsSVGPolyElement.h"
|
||||
#include "SVGPolyElement.h"
|
||||
|
||||
nsresult NS_NewSVGPolylineElement(nsIContent **aResult,
|
||||
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
|
||||
|
||||
typedef nsSVGPolyElement SVGPolylineElementBase;
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
typedef SVGPolyElement SVGPolylineElementBase;
|
||||
|
||||
class SVGPolylineElement final : public SVGPolylineElementBase
|
||||
{
|
||||
protected:
|
||||
@ -25,7 +25,7 @@ protected:
|
||||
friend nsresult (::NS_NewSVGPolylineElement(nsIContent **aResult,
|
||||
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo));
|
||||
|
||||
// nsSVGPathGeometryElement methods:
|
||||
// SVGGeometryElement methods:
|
||||
virtual already_AddRefed<Path> BuildPath(PathBuilder* aBuilder) override;
|
||||
|
||||
public:
|
||||
|
@ -109,7 +109,7 @@ SVGRectElement::GetLengthInfo()
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGPathGeometryElement methods
|
||||
// SVGGeometryElement methods
|
||||
|
||||
bool
|
||||
SVGRectElement::GetGeometryBounds(Rect* aBounds,
|
||||
|
@ -7,17 +7,17 @@
|
||||
#ifndef mozilla_dom_SVGRectElement_h
|
||||
#define mozilla_dom_SVGRectElement_h
|
||||
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "nsSVGLength2.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
|
||||
nsresult NS_NewSVGRectElement(nsIContent **aResult,
|
||||
already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
|
||||
|
||||
typedef nsSVGPathGeometryElement SVGRectElementBase;
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
typedef SVGGeometryElement SVGRectElementBase;
|
||||
|
||||
class SVGRectElement final : public SVGRectElementBase
|
||||
{
|
||||
protected:
|
||||
@ -30,7 +30,7 @@ public:
|
||||
// nsSVGSVGElement methods:
|
||||
virtual bool HasValidDimensions() const override;
|
||||
|
||||
// nsSVGPathGeometryElement methods:
|
||||
// SVGGeometryElement methods:
|
||||
virtual bool GetGeometryBounds(Rect* aBounds, const StrokeOptions& aStrokeOptions,
|
||||
const Matrix& aToBoundsSpace,
|
||||
const Matrix* aToNonScalingStrokeSpace = nullptr) override;
|
||||
|
@ -64,6 +64,7 @@ EXPORTS.mozilla.dom += [
|
||||
'SVGFilterElement.h',
|
||||
'SVGForeignObjectElement.h',
|
||||
'SVGGElement.h',
|
||||
'SVGGeometryElement.h',
|
||||
'SVGGradientElement.h',
|
||||
'SVGGraphicsElement.h',
|
||||
'SVGImageElement.h',
|
||||
@ -130,8 +131,6 @@ UNIFIED_SOURCES += [
|
||||
'nsSVGNumber2.cpp',
|
||||
'nsSVGNumberPair.cpp',
|
||||
'nsSVGPathDataParser.cpp',
|
||||
'nsSVGPathGeometryElement.cpp',
|
||||
'nsSVGPolyElement.cpp',
|
||||
'nsSVGString.cpp',
|
||||
'nsSVGTransform.cpp',
|
||||
'nsSVGViewBox.cpp',
|
||||
@ -189,6 +188,7 @@ UNIFIED_SOURCES += [
|
||||
'SVGForeignObjectElement.cpp',
|
||||
'SVGFragmentIdentifier.cpp',
|
||||
'SVGGElement.cpp',
|
||||
'SVGGeometryElement.cpp',
|
||||
'SVGGradientElement.cpp',
|
||||
'SVGGraphicsElement.cpp',
|
||||
'SVGImageElement.cpp',
|
||||
@ -217,6 +217,7 @@ UNIFIED_SOURCES += [
|
||||
'SVGPatternElement.cpp',
|
||||
'SVGPointList.cpp',
|
||||
'SVGPointListSMILType.cpp',
|
||||
'SVGPolyElement.cpp',
|
||||
'SVGPolygonElement.cpp',
|
||||
'SVGPolylineElement.cpp',
|
||||
'SVGPreserveAspectRatio.cpp',
|
||||
|
@ -16,7 +16,6 @@
|
||||
#include "nsICSSDeclaration.h"
|
||||
#include "nsIDocument.h"
|
||||
#include "nsIDOMMutationEvent.h"
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "mozilla/InternalMutationEvent.h"
|
||||
#include "nsError.h"
|
||||
#include "nsIPresShell.h"
|
||||
@ -45,6 +44,7 @@
|
||||
#include "SVGAnimatedPointList.h"
|
||||
#include "SVGAnimatedPathSegList.h"
|
||||
#include "SVGContentUtils.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
#include "nsIFrame.h"
|
||||
#include "nsQueryObject.h"
|
||||
#include <stdarg.h>
|
||||
|
@ -1007,6 +1007,8 @@ var interfaceNamesInGlobalScope =
|
||||
"SVGForeignObjectElement",
|
||||
// IMPORTANT: Do not change this list without review from a DOM peer!
|
||||
"SVGGElement",
|
||||
// IMPORTANT: Do not change this list without review from a DOM peer!
|
||||
"SVGGeometryElement",
|
||||
// IMPORTANT: Do not change this list without review from a DOM peer!
|
||||
"SVGGradientElement",
|
||||
// IMPORTANT: Do not change this list without review from a DOM peer!
|
||||
|
@ -9,14 +9,8 @@
|
||||
* Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
|
||||
* liability, trademark and document use rules apply.
|
||||
*/
|
||||
interface SVGPathElement : SVGGraphicsElement {
|
||||
interface SVGPathElement : SVGGeometryElement {
|
||||
|
||||
[Constant]
|
||||
readonly attribute SVGAnimatedNumber pathLength;
|
||||
|
||||
float getTotalLength();
|
||||
[NewObject, Throws]
|
||||
SVGPoint getPointAtLength(float distance);
|
||||
unsigned long getPathSegAtLength(float distance);
|
||||
[NewObject]
|
||||
SVGPathSegClosePath createSVGPathSegClosePath();
|
||||
|
@ -470,6 +470,7 @@ WEBIDL_FILES = [
|
||||
'SVGFitToViewBox.webidl',
|
||||
'SVGForeignObjectElement.webidl',
|
||||
'SVGGElement.webidl',
|
||||
'SVGGeometryElement.webidl',
|
||||
'SVGGradientElement.webidl',
|
||||
'SVGGraphicsElement.webidl',
|
||||
'SVGImageElement.webidl',
|
||||
|
@ -136,7 +136,7 @@ NS_NewSVGOuterSVGAnonChildFrame(nsIPresShell* aPresShell, nsStyleContext* aConte
|
||||
nsIFrame*
|
||||
NS_NewSVGInnerSVGFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
nsIFrame*
|
||||
NS_NewSVGPathGeometryFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
NS_NewSVGGeometryFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
nsIFrame*
|
||||
NS_NewSVGGFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
nsIFrame*
|
||||
@ -5493,13 +5493,13 @@ nsCSSFrameConstructor::FindSVGData(Element* aElement,
|
||||
SIMPLE_SVG_CREATE(svg, NS_NewSVGInnerSVGFrame),
|
||||
SIMPLE_SVG_CREATE(g, NS_NewSVGGFrame),
|
||||
SIMPLE_SVG_CREATE(svgSwitch, NS_NewSVGSwitchFrame),
|
||||
SIMPLE_SVG_CREATE(polygon, NS_NewSVGPathGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(polyline, NS_NewSVGPathGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(circle, NS_NewSVGPathGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(ellipse, NS_NewSVGPathGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(line, NS_NewSVGPathGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(rect, NS_NewSVGPathGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(path, NS_NewSVGPathGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(polygon, NS_NewSVGGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(polyline, NS_NewSVGGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(circle, NS_NewSVGGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(ellipse, NS_NewSVGGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(line, NS_NewSVGGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(rect, NS_NewSVGGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(path, NS_NewSVGGeometryFrame),
|
||||
SIMPLE_SVG_CREATE(defs, NS_NewSVGContainerFrame),
|
||||
SIMPLE_SVG_CREATE(generic_, NS_NewSVGGenericContainerFrame),
|
||||
{ &nsGkAtoms::foreignObject,
|
||||
|
@ -153,7 +153,7 @@ FRAME_ID(nsSVGMaskFrame)
|
||||
FRAME_ID(nsSVGOuterSVGFrame)
|
||||
FRAME_ID(nsSVGOuterSVGAnonChildFrame)
|
||||
FRAME_ID(nsSVGPaintServerFrame)
|
||||
FRAME_ID(nsSVGPathGeometryFrame)
|
||||
FRAME_ID(SVGGeometryFrame)
|
||||
FRAME_ID(nsSVGPatternFrame)
|
||||
FRAME_ID(nsSVGRadialGradientFrame)
|
||||
FRAME_ID(nsSVGStopFrame)
|
||||
|
@ -52,7 +52,7 @@ DECLARE_DISPLAY_ITEM_TYPE(SUBDOCUMENT)
|
||||
DECLARE_DISPLAY_ITEM_TYPE(MASK)
|
||||
DECLARE_DISPLAY_ITEM_TYPE(FILTER)
|
||||
DECLARE_DISPLAY_ITEM_TYPE(SVG_OUTER_SVG)
|
||||
DECLARE_DISPLAY_ITEM_TYPE(SVG_PATH_GEOMETRY)
|
||||
DECLARE_DISPLAY_ITEM_TYPE(SVG_GEOMETRY)
|
||||
DECLARE_DISPLAY_ITEM_TYPE(SVG_TEXT)
|
||||
DECLARE_DISPLAY_ITEM_TYPE(TABLE_CELL_BACKGROUND)
|
||||
DECLARE_DISPLAY_ITEM_TYPE(TABLE_CELL_SELECTION)
|
||||
|
@ -918,7 +918,7 @@ nsStyleSVG::CalcDifference(const nsStyleSVG& aNewData) const
|
||||
if (!DefinitelyEqualURIs(mMarkerEnd, aNewData.mMarkerEnd) ||
|
||||
!DefinitelyEqualURIs(mMarkerMid, aNewData.mMarkerMid) ||
|
||||
!DefinitelyEqualURIs(mMarkerStart, aNewData.mMarkerStart)) {
|
||||
// Markers currently contribute to nsSVGPathGeometryFrame::mRect,
|
||||
// Markers currently contribute to SVGGeometryFrame::mRect,
|
||||
// so we need a reflow as well as a repaint. No intrinsic sizes need
|
||||
// to change, so nsChangeHint_NeedReflow is sufficient.
|
||||
return nsChangeHint_UpdateEffects |
|
||||
@ -939,7 +939,7 @@ nsStyleSVG::CalcDifference(const nsStyleSVG& aNewData) const
|
||||
// stroke (in which case whether we have fill or not is significant to frame
|
||||
// bounds) and whether we have fill or not just changed. In either case we
|
||||
// need to reflow so the frame rect is updated.
|
||||
// XXXperf this is a waste on non nsSVGPathGeometryFrames.
|
||||
// XXXperf this is a waste on non SVGGeometryFrames.
|
||||
hint |= nsChangeHint_NeedReflow |
|
||||
nsChangeHint_NeedDirtyReflow; // XXX remove me: bug 876085
|
||||
}
|
||||
@ -949,10 +949,10 @@ nsStyleSVG::CalcDifference(const nsStyleSVG& aNewData) const
|
||||
}
|
||||
}
|
||||
|
||||
// Stroke currently contributes to nsSVGPathGeometryFrame::mRect, so
|
||||
// Stroke currently contributes to SVGGeometryFrame::mRect, so
|
||||
// we need a reflow here. No intrinsic sizes need to change, so
|
||||
// nsChangeHint_NeedReflow is sufficient.
|
||||
// Note that stroke-dashoffset does not affect nsSVGPathGeometryFrame::mRect.
|
||||
// Note that stroke-dashoffset does not affect SVGGeometryFrame::mRect.
|
||||
// text-anchor changes also require a reflow since it changes frames' rects.
|
||||
if (mStrokeWidth != aNewData.mStrokeWidth ||
|
||||
mStrokeMiterlimit != aNewData.mStrokeMiterlimit ||
|
||||
@ -1186,9 +1186,9 @@ nsStyleSVGReset::CalcDifference(const nsStyleSVGReset& aNewData) const
|
||||
// XXXjwatt: why NS_STYLE_HINT_REFLOW? Isn't that excessive?
|
||||
hint |= NS_STYLE_HINT_REFLOW;
|
||||
} else if (mVectorEffect != aNewData.mVectorEffect) {
|
||||
// Stroke currently affects nsSVGPathGeometryFrame::mRect, and
|
||||
// Stroke currently affects SVGGeometryFrame::mRect, and
|
||||
// vector-effect affect stroke. As a result we need to reflow if
|
||||
// vector-effect changes in order to have nsSVGPathGeometryFrame::
|
||||
// vector-effect changes in order to have SVGGeometryFrame::
|
||||
// ReflowSVG called to update its mRect. No intrinsic sizes need
|
||||
// to change so nsChangeHint_NeedReflow is sufficient.
|
||||
hint |= nsChangeHint_NeedReflow |
|
||||
@ -4021,8 +4021,8 @@ nsStyleUserInterface::CalcDifference(const nsStyleUserInterface& aNewData) const
|
||||
}
|
||||
|
||||
if (mPointerEvents != aNewData.mPointerEvents) {
|
||||
// nsSVGPathGeometryFrame's mRect depends on stroke _and_ on the value
|
||||
// of pointer-events. See nsSVGPathGeometryFrame::ReflowSVG's use of
|
||||
// SVGGeometryFrame's mRect depends on stroke _and_ on the value
|
||||
// of pointer-events. See SVGGeometryFrame::ReflowSVG's use of
|
||||
// GetHitTestFlags. (Only a reflow, no visual change.)
|
||||
hint |= nsChangeHint_NeedReflow |
|
||||
nsChangeHint_NeedDirtyReflow; // XXX remove me: bug 876085
|
||||
|
@ -4,7 +4,7 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
// Main header first:
|
||||
#include "nsSVGPathGeometryFrame.h"
|
||||
#include "SVGGeometryFrame.h"
|
||||
|
||||
// Keep others in (case-insensitive) order:
|
||||
#include "gfx2DGlue.h"
|
||||
@ -22,7 +22,7 @@
|
||||
#include "nsSVGEffects.h"
|
||||
#include "nsSVGIntegrationUtils.h"
|
||||
#include "nsSVGMarkerFrame.h"
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
#include "nsSVGUtils.h"
|
||||
#include "mozilla/ArrayUtils.h"
|
||||
#include "SVGAnimatedTransformList.h"
|
||||
@ -37,41 +37,41 @@ using namespace mozilla::image;
|
||||
// Implementation
|
||||
|
||||
nsIFrame*
|
||||
NS_NewSVGPathGeometryFrame(nsIPresShell* aPresShell,
|
||||
nsStyleContext* aContext)
|
||||
NS_NewSVGGeometryFrame(nsIPresShell* aPresShell,
|
||||
nsStyleContext* aContext)
|
||||
{
|
||||
return new (aPresShell) nsSVGPathGeometryFrame(aContext);
|
||||
return new (aPresShell) SVGGeometryFrame(aContext);
|
||||
}
|
||||
|
||||
NS_IMPL_FRAMEARENA_HELPERS(nsSVGPathGeometryFrame)
|
||||
NS_IMPL_FRAMEARENA_HELPERS(SVGGeometryFrame)
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsQueryFrame methods
|
||||
|
||||
NS_QUERYFRAME_HEAD(nsSVGPathGeometryFrame)
|
||||
NS_QUERYFRAME_HEAD(SVGGeometryFrame)
|
||||
NS_QUERYFRAME_ENTRY(nsISVGChildFrame)
|
||||
NS_QUERYFRAME_ENTRY(nsSVGPathGeometryFrame)
|
||||
NS_QUERYFRAME_ENTRY(SVGGeometryFrame)
|
||||
NS_QUERYFRAME_TAIL_INHERITING(nsFrame)
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// Display list item:
|
||||
|
||||
class nsDisplaySVGPathGeometry : public nsDisplayItem {
|
||||
class nsDisplaySVGGeometry : public nsDisplayItem {
|
||||
public:
|
||||
nsDisplaySVGPathGeometry(nsDisplayListBuilder* aBuilder,
|
||||
nsSVGPathGeometryFrame* aFrame)
|
||||
nsDisplaySVGGeometry(nsDisplayListBuilder* aBuilder,
|
||||
SVGGeometryFrame* aFrame)
|
||||
: nsDisplayItem(aBuilder, aFrame)
|
||||
{
|
||||
MOZ_COUNT_CTOR(nsDisplaySVGPathGeometry);
|
||||
MOZ_COUNT_CTOR(nsDisplaySVGGeometry);
|
||||
MOZ_ASSERT(aFrame, "Must have a frame!");
|
||||
}
|
||||
#ifdef NS_BUILD_REFCNT_LOGGING
|
||||
virtual ~nsDisplaySVGPathGeometry() {
|
||||
MOZ_COUNT_DTOR(nsDisplaySVGPathGeometry);
|
||||
virtual ~nsDisplaySVGGeometry() {
|
||||
MOZ_COUNT_DTOR(nsDisplaySVGGeometry);
|
||||
}
|
||||
#endif
|
||||
|
||||
NS_DISPLAY_DECL_NAME("nsDisplaySVGPathGeometry", TYPE_SVG_PATH_GEOMETRY)
|
||||
NS_DISPLAY_DECL_NAME("nsDisplaySVGGeometry", TYPE_SVG_GEOMETRY)
|
||||
|
||||
virtual void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
|
||||
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames) override;
|
||||
@ -89,10 +89,10 @@ public:
|
||||
};
|
||||
|
||||
void
|
||||
nsDisplaySVGPathGeometry::HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
|
||||
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames)
|
||||
nsDisplaySVGGeometry::HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
|
||||
HitTestState* aState, nsTArray<nsIFrame*> *aOutFrames)
|
||||
{
|
||||
nsSVGPathGeometryFrame *frame = static_cast<nsSVGPathGeometryFrame*>(mFrame);
|
||||
SVGGeometryFrame *frame = static_cast<SVGGeometryFrame*>(mFrame);
|
||||
nsPoint pointRelativeToReferenceFrame = aRect.Center();
|
||||
// ToReferenceFrame() includes frame->GetPosition(), our user space position.
|
||||
nsPoint userSpacePtInAppUnits = pointRelativeToReferenceFrame -
|
||||
@ -106,8 +106,8 @@ nsDisplaySVGPathGeometry::HitTest(nsDisplayListBuilder* aBuilder, const nsRect&
|
||||
}
|
||||
|
||||
void
|
||||
nsDisplaySVGPathGeometry::Paint(nsDisplayListBuilder* aBuilder,
|
||||
nsRenderingContext* aCtx)
|
||||
nsDisplaySVGGeometry::Paint(nsDisplayListBuilder* aBuilder,
|
||||
nsRenderingContext* aCtx)
|
||||
{
|
||||
uint32_t appUnitsPerDevPixel = mFrame->PresContext()->AppUnitsPerDevPixel();
|
||||
|
||||
@ -122,13 +122,13 @@ nsDisplaySVGPathGeometry::Paint(nsDisplayListBuilder* aBuilder,
|
||||
gfxMatrix tm = nsSVGIntegrationUtils::GetCSSPxToDevPxMatrix(mFrame) *
|
||||
gfxMatrix::Translation(devPixelOffset);
|
||||
DrawResult result =
|
||||
static_cast<nsSVGPathGeometryFrame*>(mFrame)->PaintSVG(*aCtx->ThebesContext(), tm);
|
||||
static_cast<SVGGeometryFrame*>(mFrame)->PaintSVG(*aCtx->ThebesContext(), tm);
|
||||
|
||||
nsDisplayItemGenericImageGeometry::UpdateDrawResult(this, result);
|
||||
}
|
||||
|
||||
void
|
||||
nsDisplaySVGPathGeometry::ComputeInvalidationRegion(
|
||||
nsDisplaySVGGeometry::ComputeInvalidationRegion(
|
||||
nsDisplayListBuilder* aBuilder,
|
||||
const nsDisplayItemGeometry* aGeometry,
|
||||
nsRegion* aInvalidRegion)
|
||||
@ -145,22 +145,24 @@ nsDisplaySVGPathGeometry::ComputeInvalidationRegion(
|
||||
nsDisplayItem::ComputeInvalidationRegion(aBuilder, aGeometry, aInvalidRegion);
|
||||
}
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsIFrame methods
|
||||
|
||||
void
|
||||
nsSVGPathGeometryFrame::Init(nsIContent* aContent,
|
||||
nsContainerFrame* aParent,
|
||||
nsIFrame* aPrevInFlow)
|
||||
SVGGeometryFrame::Init(nsIContent* aContent,
|
||||
nsContainerFrame* aParent,
|
||||
nsIFrame* aPrevInFlow)
|
||||
{
|
||||
AddStateBits(aParent->GetStateBits() & NS_STATE_SVG_CLIPPATH_CHILD);
|
||||
nsFrame::Init(aContent, aParent, aPrevInFlow);
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsSVGPathGeometryFrame::AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType)
|
||||
SVGGeometryFrame::AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType)
|
||||
{
|
||||
// We don't invalidate for transform changes (the layers code does that).
|
||||
// Also note that SVGTransformableElement::GetAttributeChangeHint will
|
||||
@ -168,7 +170,7 @@ nsSVGPathGeometryFrame::AttributeChanged(int32_t aNameSpaceID,
|
||||
// and cause DoApplyRenderingChangeToTree to make the SchedulePaint call.
|
||||
|
||||
if (aNameSpaceID == kNameSpaceID_None &&
|
||||
(static_cast<nsSVGPathGeometryElement*>
|
||||
(static_cast<SVGGeometryElement*>
|
||||
(mContent)->AttributeDefinesGeometry(aAttribute))) {
|
||||
nsLayoutUtils::PostRestyleEvent(
|
||||
mContent->AsElement(), nsRestyleHint(0),
|
||||
@ -179,7 +181,7 @@ nsSVGPathGeometryFrame::AttributeChanged(int32_t aNameSpaceID,
|
||||
}
|
||||
|
||||
/* virtual */ void
|
||||
nsSVGPathGeometryFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
|
||||
SVGGeometryFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
|
||||
{
|
||||
nsFrame::DidSetStyleContext(aOldStyleContext);
|
||||
|
||||
@ -193,8 +195,8 @@ nsSVGPathGeometryFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
|
||||
InvalidateFrame();
|
||||
}
|
||||
|
||||
nsSVGPathGeometryElement* element =
|
||||
static_cast<nsSVGPathGeometryElement*>(mContent);
|
||||
SVGGeometryElement* element =
|
||||
static_cast<SVGGeometryElement*>(mContent);
|
||||
|
||||
auto oldStyleSVG = aOldStyleContext->PeekStyleSVG();
|
||||
if (oldStyleSVG && !SVGContentUtils::ShapeTypeHasNoCorners(mContent)) {
|
||||
@ -222,14 +224,14 @@ nsSVGPathGeometryFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
|
||||
}
|
||||
|
||||
nsIAtom *
|
||||
nsSVGPathGeometryFrame::GetType() const
|
||||
SVGGeometryFrame::GetType() const
|
||||
{
|
||||
return nsGkAtoms::svgPathGeometryFrame;
|
||||
return nsGkAtoms::svgGeometryFrame;
|
||||
}
|
||||
|
||||
bool
|
||||
nsSVGPathGeometryFrame::IsSVGTransformed(gfx::Matrix *aOwnTransform,
|
||||
gfx::Matrix *aFromParentTransform) const
|
||||
SVGGeometryFrame::IsSVGTransformed(gfx::Matrix *aOwnTransform,
|
||||
gfx::Matrix *aFromParentTransform) const
|
||||
{
|
||||
bool foundTransform = false;
|
||||
|
||||
@ -258,9 +260,9 @@ nsSVGPathGeometryFrame::IsSVGTransformed(gfx::Matrix *aOwnTransform,
|
||||
}
|
||||
|
||||
void
|
||||
nsSVGPathGeometryFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists)
|
||||
SVGGeometryFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists)
|
||||
{
|
||||
if (!static_cast<const nsSVGElement*>(mContent)->HasValidDimensions() ||
|
||||
(!IsVisibleForPainting(aBuilder) && aBuilder->IsForPainting())) {
|
||||
@ -268,16 +270,16 @@ nsSVGPathGeometryFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
}
|
||||
DisplayOutline(aBuilder, aLists);
|
||||
aLists.Content()->AppendNewToTop(
|
||||
new (aBuilder) nsDisplaySVGPathGeometry(aBuilder, this));
|
||||
new (aBuilder) nsDisplaySVGGeometry(aBuilder, this));
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsISVGChildFrame methods
|
||||
|
||||
DrawResult
|
||||
nsSVGPathGeometryFrame::PaintSVG(gfxContext& aContext,
|
||||
const gfxMatrix& aTransform,
|
||||
const nsIntRect* aDirtyRect)
|
||||
SVGGeometryFrame::PaintSVG(gfxContext& aContext,
|
||||
const gfxMatrix& aTransform,
|
||||
const nsIntRect* aDirtyRect)
|
||||
{
|
||||
if (!StyleVisibility()->IsVisible())
|
||||
return DrawResult::SUCCESS;
|
||||
@ -316,7 +318,7 @@ nsSVGPathGeometryFrame::PaintSVG(gfxContext& aContext,
|
||||
}
|
||||
|
||||
nsIFrame*
|
||||
nsSVGPathGeometryFrame::GetFrameForPoint(const gfxPoint& aPoint)
|
||||
SVGGeometryFrame::GetFrameForPoint(const gfxPoint& aPoint)
|
||||
{
|
||||
FillRule fillRule;
|
||||
uint16_t hitTestFlags;
|
||||
@ -340,8 +342,8 @@ nsSVGPathGeometryFrame::GetFrameForPoint(const gfxPoint& aPoint)
|
||||
|
||||
bool isHit = false;
|
||||
|
||||
nsSVGPathGeometryElement* content =
|
||||
static_cast<nsSVGPathGeometryElement*>(mContent);
|
||||
SVGGeometryElement* content =
|
||||
static_cast<SVGGeometryElement*>(mContent);
|
||||
|
||||
// Using ScreenReferenceDrawTarget() opens us to Moz2D backend specific hit-
|
||||
// testing bugs. Maybe we should use a BackendType::CAIRO DT for hit-testing
|
||||
@ -381,7 +383,7 @@ nsSVGPathGeometryFrame::GetFrameForPoint(const gfxPoint& aPoint)
|
||||
}
|
||||
|
||||
nsRect
|
||||
nsSVGPathGeometryFrame::GetCoveredRegion()
|
||||
SVGGeometryFrame::GetCoveredRegion()
|
||||
{
|
||||
gfxMatrix canvasTM = GetCanvasTM();
|
||||
if (canvasTM.PreservesAxisAlignedRectangles()) {
|
||||
@ -403,7 +405,7 @@ nsSVGPathGeometryFrame::GetCoveredRegion()
|
||||
}
|
||||
|
||||
void
|
||||
nsSVGPathGeometryFrame::ReflowSVG()
|
||||
SVGGeometryFrame::ReflowSVG()
|
||||
{
|
||||
NS_ASSERTION(nsSVGUtils::OuterSVGIsCallingReflowSVG(this),
|
||||
"This call is probably a wasteful mistake");
|
||||
@ -457,7 +459,7 @@ nsSVGPathGeometryFrame::ReflowSVG()
|
||||
}
|
||||
|
||||
void
|
||||
nsSVGPathGeometryFrame::NotifySVGChanged(uint32_t aFlags)
|
||||
SVGGeometryFrame::NotifySVGChanged(uint32_t aFlags)
|
||||
{
|
||||
MOZ_ASSERT(aFlags & (TRANSFORM_CHANGED | COORD_CONTEXT_CHANGED),
|
||||
"Invalidation logic may need adjusting");
|
||||
@ -481,9 +483,9 @@ nsSVGPathGeometryFrame::NotifySVGChanged(uint32_t aFlags)
|
||||
// of stroke-dashoffset since, although that can have a percentage value
|
||||
// that is resolved against our coordinate context, it does not affect our
|
||||
// mRect.
|
||||
if (static_cast<nsSVGPathGeometryElement*>(mContent)->GeometryDependsOnCoordCtx() ||
|
||||
if (static_cast<SVGGeometryElement*>(mContent)->GeometryDependsOnCoordCtx() ||
|
||||
StyleSVG()->mStrokeWidth.HasPercent()) {
|
||||
static_cast<nsSVGPathGeometryElement*>(mContent)->ClearAnyCachedPath();
|
||||
static_cast<SVGGeometryElement*>(mContent)->ClearAnyCachedPath();
|
||||
nsSVGUtils::ScheduleReflowSVG(this);
|
||||
}
|
||||
}
|
||||
@ -496,8 +498,8 @@ nsSVGPathGeometryFrame::NotifySVGChanged(uint32_t aFlags)
|
||||
}
|
||||
|
||||
SVGBBox
|
||||
nsSVGPathGeometryFrame::GetBBoxContribution(const Matrix &aToBBoxUserspace,
|
||||
uint32_t aFlags)
|
||||
SVGGeometryFrame::GetBBoxContribution(const Matrix &aToBBoxUserspace,
|
||||
uint32_t aFlags)
|
||||
{
|
||||
SVGBBox bbox;
|
||||
|
||||
@ -506,8 +508,8 @@ nsSVGPathGeometryFrame::GetBBoxContribution(const Matrix &aToBBoxUserspace,
|
||||
return bbox;
|
||||
}
|
||||
|
||||
nsSVGPathGeometryElement* element =
|
||||
static_cast<nsSVGPathGeometryElement*>(mContent);
|
||||
SVGGeometryElement* element =
|
||||
static_cast<SVGGeometryElement*>(mContent);
|
||||
|
||||
bool getFill = (aFlags & nsSVGUtils::eBBoxIncludeFillGeometry) ||
|
||||
((aFlags & nsSVGUtils::eBBoxIncludeFill) &&
|
||||
@ -623,7 +625,7 @@ nsSVGPathGeometryFrame::GetBBoxContribution(const Matrix &aToBBoxUserspace,
|
||||
//
|
||||
// Second, the way we account for non-scaling-stroke by transforming the
|
||||
// path using the transform to the outer-<svg> element is not compatible
|
||||
// with the way that nsSVGPathGeometryFrame::Reflow() inserts a scale
|
||||
// with the way that SVGGeometryFrame::Reflow() inserts a scale
|
||||
// into aToBBoxUserspace and then scales the bounds that we return.
|
||||
SVGContentUtils::AutoStrokeOptions strokeOptions;
|
||||
SVGContentUtils::GetStrokeOptions(&strokeOptions, element,
|
||||
@ -660,14 +662,14 @@ nsSVGPathGeometryFrame::GetBBoxContribution(const Matrix &aToBBoxUserspace,
|
||||
|
||||
// Account for markers:
|
||||
if ((aFlags & nsSVGUtils::eBBoxIncludeMarkers) != 0 &&
|
||||
static_cast<nsSVGPathGeometryElement*>(mContent)->IsMarkable()) {
|
||||
static_cast<SVGGeometryElement*>(mContent)->IsMarkable()) {
|
||||
|
||||
float strokeWidth = nsSVGUtils::GetStrokeWidth(this);
|
||||
MarkerProperties properties = GetMarkerProperties(this);
|
||||
|
||||
if (properties.MarkersExist()) {
|
||||
nsTArray<nsSVGMark> marks;
|
||||
static_cast<nsSVGPathGeometryElement*>(mContent)->GetMarkPoints(&marks);
|
||||
static_cast<SVGGeometryElement*>(mContent)->GetMarkPoints(&marks);
|
||||
uint32_t num = marks.Length();
|
||||
|
||||
// These are in the same order as the nsSVGMark::Type constants.
|
||||
@ -697,10 +699,10 @@ nsSVGPathGeometryFrame::GetBBoxContribution(const Matrix &aToBBoxUserspace,
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGPathGeometryFrame methods:
|
||||
// SVGGeometryFrame methods:
|
||||
|
||||
gfxMatrix
|
||||
nsSVGPathGeometryFrame::GetCanvasTM()
|
||||
SVGGeometryFrame::GetCanvasTM()
|
||||
{
|
||||
NS_ASSERTION(GetParent(), "null parent");
|
||||
|
||||
@ -710,8 +712,8 @@ nsSVGPathGeometryFrame::GetCanvasTM()
|
||||
return content->PrependLocalTransformsTo(parent->GetCanvasTM());
|
||||
}
|
||||
|
||||
nsSVGPathGeometryFrame::MarkerProperties
|
||||
nsSVGPathGeometryFrame::GetMarkerProperties(nsSVGPathGeometryFrame *aFrame)
|
||||
SVGGeometryFrame::MarkerProperties
|
||||
SVGGeometryFrame::GetMarkerProperties(SVGGeometryFrame *aFrame)
|
||||
{
|
||||
NS_ASSERTION(!aFrame->GetPrevContinuation(), "aFrame should be first continuation");
|
||||
|
||||
@ -735,7 +737,7 @@ nsSVGPathGeometryFrame::GetMarkerProperties(nsSVGPathGeometryFrame *aFrame)
|
||||
}
|
||||
|
||||
nsSVGMarkerFrame *
|
||||
nsSVGPathGeometryFrame::MarkerProperties::GetMarkerStartFrame()
|
||||
SVGGeometryFrame::MarkerProperties::GetMarkerStartFrame()
|
||||
{
|
||||
if (!mMarkerStart)
|
||||
return nullptr;
|
||||
@ -744,7 +746,7 @@ nsSVGPathGeometryFrame::MarkerProperties::GetMarkerStartFrame()
|
||||
}
|
||||
|
||||
nsSVGMarkerFrame *
|
||||
nsSVGPathGeometryFrame::MarkerProperties::GetMarkerMidFrame()
|
||||
SVGGeometryFrame::MarkerProperties::GetMarkerMidFrame()
|
||||
{
|
||||
if (!mMarkerMid)
|
||||
return nullptr;
|
||||
@ -753,7 +755,7 @@ nsSVGPathGeometryFrame::MarkerProperties::GetMarkerMidFrame()
|
||||
}
|
||||
|
||||
nsSVGMarkerFrame *
|
||||
nsSVGPathGeometryFrame::MarkerProperties::GetMarkerEndFrame()
|
||||
SVGGeometryFrame::MarkerProperties::GetMarkerEndFrame()
|
||||
{
|
||||
if (!mMarkerEnd)
|
||||
return nullptr;
|
||||
@ -762,9 +764,9 @@ nsSVGPathGeometryFrame::MarkerProperties::GetMarkerEndFrame()
|
||||
}
|
||||
|
||||
void
|
||||
nsSVGPathGeometryFrame::Render(gfxContext* aContext,
|
||||
uint32_t aRenderComponents,
|
||||
const gfxMatrix& aNewTransform)
|
||||
SVGGeometryFrame::Render(gfxContext* aContext,
|
||||
uint32_t aRenderComponents,
|
||||
const gfxMatrix& aNewTransform)
|
||||
{
|
||||
MOZ_ASSERT(!aNewTransform.IsSingular());
|
||||
|
||||
@ -774,8 +776,8 @@ nsSVGPathGeometryFrame::Render(gfxContext* aContext,
|
||||
nsSVGUtils::ToFillRule((GetStateBits() & NS_STATE_SVG_CLIPPATH_CHILD) ?
|
||||
StyleSVG()->mClipRule : StyleSVG()->mFillRule);
|
||||
|
||||
nsSVGPathGeometryElement* element =
|
||||
static_cast<nsSVGPathGeometryElement*>(mContent);
|
||||
SVGGeometryElement* element =
|
||||
static_cast<SVGGeometryElement*>(mContent);
|
||||
|
||||
AntialiasMode aaMode =
|
||||
(StyleSVG()->mShapeRendering == NS_STYLE_SHAPE_RENDERING_OPTIMIZESPEED ||
|
||||
@ -800,7 +802,7 @@ nsSVGPathGeometryFrame::Render(gfxContext* aContext,
|
||||
return;
|
||||
}
|
||||
|
||||
nsSVGPathGeometryElement::SimplePath simplePath;
|
||||
SVGGeometryElement::SimplePath simplePath;
|
||||
RefPtr<Path> path;
|
||||
|
||||
element->GetAsSimplePath(&simplePath);
|
||||
@ -876,19 +878,19 @@ nsSVGPathGeometryFrame::Render(gfxContext* aContext,
|
||||
}
|
||||
|
||||
void
|
||||
nsSVGPathGeometryFrame::PaintMarkers(gfxContext& aContext,
|
||||
const gfxMatrix& aTransform)
|
||||
SVGGeometryFrame::PaintMarkers(gfxContext& aContext,
|
||||
const gfxMatrix& aTransform)
|
||||
{
|
||||
SVGContextPaint* contextPaint = SVGContextPaint::GetContextPaint(mContent);
|
||||
|
||||
if (static_cast<nsSVGPathGeometryElement*>(mContent)->IsMarkable()) {
|
||||
if (static_cast<SVGGeometryElement*>(mContent)->IsMarkable()) {
|
||||
MarkerProperties properties = GetMarkerProperties(this);
|
||||
|
||||
if (properties.MarkersExist()) {
|
||||
float strokeWidth = nsSVGUtils::GetStrokeWidth(this, contextPaint);
|
||||
|
||||
nsTArray<nsSVGMark> marks;
|
||||
static_cast<nsSVGPathGeometryElement*>
|
||||
static_cast<SVGGeometryElement*>
|
||||
(mContent)->GetMarkPoints(&marks);
|
||||
|
||||
uint32_t num = marks.Length();
|
||||
@ -915,7 +917,8 @@ nsSVGPathGeometryFrame::PaintMarkers(gfxContext& aContext,
|
||||
}
|
||||
|
||||
uint16_t
|
||||
nsSVGPathGeometryFrame::GetHitTestFlags()
|
||||
SVGGeometryFrame::GetHitTestFlags()
|
||||
{
|
||||
return nsSVGUtils::GetGeometryHitTestFlags(this);
|
||||
}
|
||||
} // namespace mozilla
|
@ -3,8 +3,8 @@
|
||||
* 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/. */
|
||||
|
||||
#ifndef __NS_SVGPATHGEOMETRYFRAME_H__
|
||||
#define __NS_SVGPATHGEOMETRYFRAME_H__
|
||||
#ifndef __SVGGEOMETRYFRAME_H__
|
||||
#define __SVGGEOMETRYFRAME_H__
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "gfxMatrix.h"
|
||||
@ -16,13 +16,14 @@
|
||||
#include "nsSVGUtils.h"
|
||||
|
||||
namespace mozilla {
|
||||
class SVGGeometryFrame;
|
||||
namespace gfx {
|
||||
class DrawTarget;
|
||||
} // namespace gfx
|
||||
} // namespace mozilla
|
||||
|
||||
class gfxContext;
|
||||
class nsDisplaySVGPathGeometry;
|
||||
class nsDisplaySVGGeometry;
|
||||
class nsIAtom;
|
||||
class nsIFrame;
|
||||
class nsIPresShell;
|
||||
@ -32,25 +33,30 @@ class nsSVGMarkerProperty;
|
||||
|
||||
struct nsRect;
|
||||
|
||||
class nsSVGPathGeometryFrame : public nsFrame
|
||||
, public nsISVGChildFrame
|
||||
nsIFrame*
|
||||
NS_NewSVGGeometryFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
class SVGGeometryFrame : public nsFrame
|
||||
, public nsISVGChildFrame
|
||||
{
|
||||
typedef mozilla::gfx::DrawTarget DrawTarget;
|
||||
|
||||
friend nsIFrame*
|
||||
NS_NewSVGPathGeometryFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
::NS_NewSVGGeometryFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
friend class nsDisplaySVGPathGeometry;
|
||||
friend class ::nsDisplaySVGGeometry;
|
||||
|
||||
protected:
|
||||
explicit nsSVGPathGeometryFrame(nsStyleContext* aContext)
|
||||
explicit SVGGeometryFrame(nsStyleContext* aContext)
|
||||
: nsFrame(aContext)
|
||||
{
|
||||
AddStateBits(NS_FRAME_SVG_LAYOUT | NS_FRAME_MAY_BE_TRANSFORMED);
|
||||
}
|
||||
|
||||
public:
|
||||
NS_DECL_QUERYFRAME_TARGET(nsSVGPathGeometryFrame)
|
||||
NS_DECL_QUERYFRAME_TARGET(SVGGeometryFrame)
|
||||
NS_DECL_QUERYFRAME
|
||||
NS_DECL_FRAMEARENA_HELPERS
|
||||
|
||||
@ -73,7 +79,7 @@ public:
|
||||
/**
|
||||
* Get the "type" of the frame
|
||||
*
|
||||
* @see nsGkAtoms::svgPathGeometryFrame
|
||||
* @see nsGkAtoms::svgGeometryFrame
|
||||
*/
|
||||
virtual nsIAtom* GetType() const override;
|
||||
|
||||
@ -83,7 +89,7 @@ public:
|
||||
#ifdef DEBUG_FRAME_DUMP
|
||||
virtual nsresult GetFrameName(nsAString& aResult) const override
|
||||
{
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGPathGeometry"), aResult);
|
||||
return MakeFrameName(NS_LITERAL_STRING("SVGGeometry"), aResult);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -91,7 +97,7 @@ public:
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists) override;
|
||||
|
||||
// nsSVGPathGeometryFrame methods
|
||||
// SVGGeometryFrame methods
|
||||
gfxMatrix GetCanvasTM();
|
||||
protected:
|
||||
// nsISVGChildFrame interface:
|
||||
@ -141,7 +147,8 @@ private:
|
||||
/**
|
||||
* @param aFrame should be the first continuation
|
||||
*/
|
||||
static MarkerProperties GetMarkerProperties(nsSVGPathGeometryFrame *aFrame);
|
||||
static MarkerProperties GetMarkerProperties(SVGGeometryFrame *aFrame);
|
||||
};
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // __NS_SVGPATHGEOMETRYFRAME_H__
|
||||
#endif // __SVGGEOMETRYFRAME_H__
|
@ -41,7 +41,6 @@ UNIFIED_SOURCES += [
|
||||
'nsSVGMarkerFrame.cpp',
|
||||
'nsSVGMaskFrame.cpp',
|
||||
'nsSVGOuterSVGFrame.cpp',
|
||||
'nsSVGPathGeometryFrame.cpp',
|
||||
'nsSVGPatternFrame.cpp',
|
||||
'nsSVGStopFrame.cpp',
|
||||
'nsSVGSwitchFrame.cpp',
|
||||
@ -52,6 +51,7 @@ UNIFIED_SOURCES += [
|
||||
'SVGFEImageFrame.cpp',
|
||||
'SVGFELeafFrame.cpp',
|
||||
'SVGFEUnstyledLeafFrame.cpp',
|
||||
'SVGGeometryFrame.cpp',
|
||||
'SVGTextFrame.cpp',
|
||||
'SVGViewFrame.cpp',
|
||||
]
|
||||
|
@ -12,8 +12,8 @@
|
||||
#include "mozilla/dom/SVGClipPathElement.h"
|
||||
#include "nsGkAtoms.h"
|
||||
#include "nsSVGEffects.h"
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "nsSVGPathGeometryFrame.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
#include "SVGGeometryFrame.h"
|
||||
#include "nsSVGUtils.h"
|
||||
|
||||
using namespace mozilla;
|
||||
@ -56,10 +56,10 @@ nsSVGClipPathFrame::ApplyClipPath(gfxContext& aContext,
|
||||
IsTrivial(&singleClipPathChild);
|
||||
|
||||
if (singleClipPathChild) {
|
||||
nsSVGPathGeometryFrame* pathFrame = do_QueryFrame(singleClipPathChild);
|
||||
SVGGeometryFrame* pathFrame = do_QueryFrame(singleClipPathChild);
|
||||
if (pathFrame) {
|
||||
nsSVGPathGeometryElement* pathElement =
|
||||
static_cast<nsSVGPathGeometryElement*>(pathFrame->GetContent());
|
||||
SVGGeometryElement* pathElement =
|
||||
static_cast<SVGGeometryElement*>(pathFrame->GetContent());
|
||||
gfxMatrix toChildsUserSpace = pathElement->
|
||||
PrependLocalTransformsTo(GetClipPathTransform(aClippedFrame) * aMatrix,
|
||||
eUserSpaceToParent);
|
||||
@ -251,7 +251,7 @@ nsSVGClipPathFrame::PaintFrameIntoMask(nsIFrame *aFrame,
|
||||
}
|
||||
|
||||
// Our children have NS_STATE_SVG_CLIPPATH_CHILD set on them, and
|
||||
// nsSVGPathGeometryFrame::Render checks for that state bit and paints
|
||||
// SVGGeometryFrame::Render checks for that state bit and paints
|
||||
// only the geometry (opaque black) if set.
|
||||
result &= frame->PaintSVG(aTarget, toChildsUserSpace);
|
||||
|
||||
@ -426,7 +426,7 @@ nsSVGClipPathFrame::IsValid()
|
||||
|
||||
nsIAtom* grandKidType = grandKid->GetType();
|
||||
|
||||
if (grandKidType != nsGkAtoms::svgPathGeometryFrame &&
|
||||
if (grandKidType != nsGkAtoms::svgGeometryFrame &&
|
||||
grandKidType != nsGkAtoms::svgTextFrame) {
|
||||
return false;
|
||||
}
|
||||
@ -434,7 +434,7 @@ nsSVGClipPathFrame::IsValid()
|
||||
continue;
|
||||
}
|
||||
|
||||
if (kidType != nsGkAtoms::svgPathGeometryFrame &&
|
||||
if (kidType != nsGkAtoms::svgGeometryFrame &&
|
||||
kidType != nsGkAtoms::svgTextFrame) {
|
||||
return false;
|
||||
}
|
||||
|
@ -13,11 +13,11 @@
|
||||
#include "nsISupportsImpl.h"
|
||||
#include "nsSVGClipPathFrame.h"
|
||||
#include "nsSVGPaintServerFrame.h"
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "nsSVGFilterFrame.h"
|
||||
#include "nsSVGMaskFrame.h"
|
||||
#include "nsIReflowCallback.h"
|
||||
#include "nsCycleCollectionParticipant.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
#include "SVGUseElement.h"
|
||||
|
||||
using namespace mozilla;
|
||||
@ -526,8 +526,8 @@ nsSVGMarkerProperty*
|
||||
nsSVGEffects::GetMarkerProperty(nsIURI* aURI, nsIFrame* aFrame,
|
||||
const mozilla::FramePropertyDescriptor<nsSVGMarkerProperty>* aProperty)
|
||||
{
|
||||
MOZ_ASSERT(aFrame->GetType() == nsGkAtoms::svgPathGeometryFrame &&
|
||||
static_cast<nsSVGPathGeometryElement*>(aFrame->GetContent())->IsMarkable(),
|
||||
MOZ_ASSERT(aFrame->GetType() == nsGkAtoms::svgGeometryFrame &&
|
||||
static_cast<SVGGeometryElement*>(aFrame->GetContent())->IsMarkable(),
|
||||
"Bad frame");
|
||||
return GetEffectProperty(aURI, aFrame, aProperty);
|
||||
}
|
||||
@ -743,8 +743,8 @@ nsSVGEffects::UpdateEffects(nsIFrame* aFrame)
|
||||
// We can't do that in DoUpdate as the referenced frame may not be valid
|
||||
GetOrCreateFilterProperty(aFrame);
|
||||
|
||||
if (aFrame->GetType() == nsGkAtoms::svgPathGeometryFrame &&
|
||||
static_cast<nsSVGPathGeometryElement*>(aFrame->GetContent())->IsMarkable()) {
|
||||
if (aFrame->GetType() == nsGkAtoms::svgGeometryFrame &&
|
||||
static_cast<SVGGeometryElement*>(aFrame->GetContent())->IsMarkable()) {
|
||||
// Set marker properties here to avoid reference loops
|
||||
nsCOMPtr<nsIURI> markerURL =
|
||||
GetMarkerURI(aFrame, &nsStyleSVG::mMarkerStart);
|
||||
|
@ -13,10 +13,10 @@
|
||||
#include "nsLayoutUtils.h"
|
||||
#include "imgINotificationObserver.h"
|
||||
#include "nsSVGEffects.h"
|
||||
#include "nsSVGPathGeometryFrame.h"
|
||||
#include "mozilla/dom/SVGSVGElement.h"
|
||||
#include "nsSVGUtils.h"
|
||||
#include "SVGContentUtils.h"
|
||||
#include "SVGGeometryFrame.h"
|
||||
#include "SVGImageContext.h"
|
||||
#include "mozilla/dom/SVGImageElement.h"
|
||||
#include "nsContentUtils.h"
|
||||
@ -46,7 +46,7 @@ private:
|
||||
nsSVGImageFrame *mFrame;
|
||||
};
|
||||
|
||||
class nsSVGImageFrame : public nsSVGPathGeometryFrame
|
||||
class nsSVGImageFrame : public SVGGeometryFrame
|
||||
, public nsIReflowCallback
|
||||
{
|
||||
friend nsIFrame*
|
||||
@ -54,7 +54,7 @@ class nsSVGImageFrame : public nsSVGPathGeometryFrame
|
||||
|
||||
protected:
|
||||
explicit nsSVGImageFrame(nsStyleContext* aContext)
|
||||
: nsSVGPathGeometryFrame(aContext)
|
||||
: SVGGeometryFrame(aContext)
|
||||
, mReflowCallbackPosted(false)
|
||||
{
|
||||
EnableVisibilityTracking();
|
||||
@ -72,7 +72,7 @@ public:
|
||||
virtual nsIFrame* GetFrameForPoint(const gfxPoint& aPoint) override;
|
||||
virtual void ReflowSVG() override;
|
||||
|
||||
// nsSVGPathGeometryFrame methods:
|
||||
// SVGGeometryFrame methods:
|
||||
virtual uint16_t GetHitTestFlags() override;
|
||||
|
||||
// nsIFrame interface:
|
||||
@ -154,7 +154,7 @@ nsSVGImageFrame::Init(nsIContent* aContent,
|
||||
NS_ASSERTION(aContent->IsSVGElement(nsGkAtoms::image),
|
||||
"Content is not an SVG image!");
|
||||
|
||||
nsSVGPathGeometryFrame::Init(aContent, aParent, aPrevInFlow);
|
||||
SVGGeometryFrame::Init(aContent, aParent, aPrevInFlow);
|
||||
|
||||
if (GetStateBits() & NS_FRAME_IS_NONDISPLAY) {
|
||||
// Non-display frames are likely to be patterns, masks or the like.
|
||||
@ -240,8 +240,8 @@ nsSVGImageFrame::AttributeChanged(int32_t aNameSpaceID,
|
||||
}
|
||||
}
|
||||
|
||||
return nsSVGPathGeometryFrame::AttributeChanged(aNameSpaceID,
|
||||
aAttribute, aModType);
|
||||
return SVGGeometryFrame::AttributeChanged(aNameSpaceID,
|
||||
aAttribute, aModType);
|
||||
}
|
||||
|
||||
void
|
||||
@ -250,13 +250,13 @@ nsSVGImageFrame::OnVisibilityChange(Visibility aNewVisibility,
|
||||
{
|
||||
nsCOMPtr<nsIImageLoadingContent> imageLoader = do_QueryInterface(mContent);
|
||||
if (!imageLoader) {
|
||||
nsSVGPathGeometryFrame::OnVisibilityChange(aNewVisibility, aNonvisibleAction);
|
||||
SVGGeometryFrame::OnVisibilityChange(aNewVisibility, aNonvisibleAction);
|
||||
return;
|
||||
}
|
||||
|
||||
imageLoader->OnVisibilityChange(aNewVisibility, aNonvisibleAction);
|
||||
|
||||
nsSVGPathGeometryFrame::OnVisibilityChange(aNewVisibility, aNonvisibleAction);
|
||||
SVGGeometryFrame::OnVisibilityChange(aNewVisibility, aNonvisibleAction);
|
||||
}
|
||||
|
||||
gfx::Matrix
|
||||
@ -499,7 +499,7 @@ nsSVGImageFrame::GetType() const
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGPathGeometryFrame methods:
|
||||
// SVGGeometryFrame methods:
|
||||
|
||||
// Lie about our fill/stroke so that covered region and hit detection work properly
|
||||
|
||||
|
@ -10,8 +10,8 @@
|
||||
#include "gfxContext.h"
|
||||
#include "nsSVGEffects.h"
|
||||
#include "mozilla/dom/SVGMarkerElement.h"
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "nsSVGPathGeometryFrame.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
#include "SVGGeometryFrame.h"
|
||||
|
||||
using namespace mozilla::dom;
|
||||
using namespace mozilla::gfx;
|
||||
@ -72,7 +72,7 @@ nsSVGMarkerFrame::GetType() const
|
||||
gfxMatrix
|
||||
nsSVGMarkerFrame::GetCanvasTM()
|
||||
{
|
||||
NS_ASSERTION(mMarkedFrame, "null nsSVGPathGeometry frame");
|
||||
NS_ASSERTION(mMarkedFrame, "null SVGGeometry frame");
|
||||
|
||||
if (mInUse2) {
|
||||
// We're going to be bailing drawing the marker, so return an identity.
|
||||
@ -104,7 +104,7 @@ GetAnonymousChildFrame(nsIFrame* aFrame)
|
||||
nsresult
|
||||
nsSVGMarkerFrame::PaintMark(gfxContext& aContext,
|
||||
const gfxMatrix& aToMarkedFrameUserSpace,
|
||||
nsSVGPathGeometryFrame *aMarkedFrame,
|
||||
SVGGeometryFrame *aMarkedFrame,
|
||||
nsSVGMark *aMark, float aStrokeWidth)
|
||||
{
|
||||
// If the flag is set when we get here, it means this marker frame
|
||||
@ -165,7 +165,7 @@ nsSVGMarkerFrame::PaintMark(gfxContext& aContext,
|
||||
SVGBBox
|
||||
nsSVGMarkerFrame::GetMarkBBoxContribution(const Matrix &aToBBoxUserspace,
|
||||
uint32_t aFlags,
|
||||
nsSVGPathGeometryFrame *aMarkedFrame,
|
||||
SVGGeometryFrame *aMarkedFrame,
|
||||
const nsSVGMark *aMark,
|
||||
float aStrokeWidth)
|
||||
{
|
||||
@ -226,7 +226,7 @@ nsSVGMarkerFrame::SetParentCoordCtxProvider(SVGSVGElement *aContext)
|
||||
|
||||
nsSVGMarkerFrame::AutoMarkerReferencer::AutoMarkerReferencer(
|
||||
nsSVGMarkerFrame *aFrame,
|
||||
nsSVGPathGeometryFrame *aMarkedFrame
|
||||
SVGGeometryFrame *aMarkedFrame
|
||||
MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL)
|
||||
: mFrame(aFrame)
|
||||
{
|
||||
|
@ -16,9 +16,9 @@
|
||||
#include "nsSVGUtils.h"
|
||||
|
||||
class gfxContext;
|
||||
class nsSVGPathGeometryFrame;
|
||||
|
||||
namespace mozilla {
|
||||
class SVGGeometryFrame;
|
||||
namespace dom {
|
||||
class SVGSVGElement;
|
||||
} // namespace dom
|
||||
@ -84,19 +84,19 @@ public:
|
||||
// nsSVGMarkerFrame methods:
|
||||
nsresult PaintMark(gfxContext& aContext,
|
||||
const gfxMatrix& aToMarkedFrameUserSpace,
|
||||
nsSVGPathGeometryFrame *aMarkedFrame,
|
||||
SVGGeometryFrame *aMarkedFrame,
|
||||
nsSVGMark *aMark,
|
||||
float aStrokeWidth);
|
||||
|
||||
SVGBBox GetMarkBBoxContribution(const Matrix &aToBBoxUserspace,
|
||||
uint32_t aFlags,
|
||||
nsSVGPathGeometryFrame *aMarkedFrame,
|
||||
SVGGeometryFrame *aMarkedFrame,
|
||||
const nsSVGMark *aMark,
|
||||
float aStrokeWidth);
|
||||
|
||||
private:
|
||||
// stuff needed for callback
|
||||
nsSVGPathGeometryFrame *mMarkedFrame;
|
||||
SVGGeometryFrame *mMarkedFrame;
|
||||
float mStrokeWidth, mX, mY, mAutoAngle;
|
||||
bool mIsStart; // whether the callback is for a marker-start marker
|
||||
|
||||
@ -112,7 +112,7 @@ private:
|
||||
{
|
||||
public:
|
||||
AutoMarkerReferencer(nsSVGMarkerFrame *aFrame,
|
||||
nsSVGPathGeometryFrame *aMarkedFrame
|
||||
SVGGeometryFrame *aMarkedFrame
|
||||
MOZ_GUARD_OBJECT_NOTIFIER_PARAM);
|
||||
~AutoMarkerReferencer();
|
||||
private:
|
||||
|
@ -18,7 +18,7 @@
|
||||
#include "nsISVGChildFrame.h"
|
||||
#include "nsStyleContext.h"
|
||||
#include "nsSVGEffects.h"
|
||||
#include "nsSVGPathGeometryFrame.h"
|
||||
#include "SVGGeometryFrame.h"
|
||||
#include "mozilla/dom/SVGPatternElement.h"
|
||||
#include "nsSVGUtils.h"
|
||||
#include "nsSVGAnimatedTransformList.h"
|
||||
@ -392,7 +392,7 @@ nsSVGPatternFrame::PaintPattern(const DrawTarget* aDrawTarget,
|
||||
|
||||
if (aSource->IsFrameOfType(nsIFrame::eSVGGeometry)) {
|
||||
// Set the geometrical parent of the pattern we are rendering
|
||||
patternWithChildren->mSource = static_cast<nsSVGPathGeometryFrame*>(aSource);
|
||||
patternWithChildren->mSource = static_cast<SVGGeometryFrame*>(aSource);
|
||||
}
|
||||
|
||||
// Delay checking NS_FRAME_DRAWING_AS_PAINTSERVER bit until here so we can
|
||||
|
@ -15,11 +15,11 @@
|
||||
|
||||
class nsIFrame;
|
||||
class nsSVGLength2;
|
||||
class nsSVGPathGeometryFrame;
|
||||
class nsSVGViewBox;
|
||||
|
||||
namespace mozilla {
|
||||
class SVGAnimatedPreserveAspectRatio;
|
||||
class SVGGeometryFrame;
|
||||
class nsSVGAnimatedTransformList;
|
||||
} // namespace mozilla
|
||||
|
||||
@ -142,7 +142,7 @@ private:
|
||||
// this is a *temporary* reference to the frame of the element currently
|
||||
// referencing our pattern. This must be temporary because different
|
||||
// referencing frames will all reference this one frame
|
||||
nsSVGPathGeometryFrame *mSource;
|
||||
SVGGeometryFrame *mSource;
|
||||
nsAutoPtr<gfxMatrix> mCTM;
|
||||
|
||||
protected:
|
||||
|
@ -46,8 +46,8 @@
|
||||
#include "nsSVGOuterSVGFrame.h"
|
||||
#include "mozilla/dom/SVGClipPathElement.h"
|
||||
#include "mozilla/dom/SVGPathElement.h"
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "nsSVGPathGeometryFrame.h"
|
||||
#include "SVGGeometryElement.h"
|
||||
#include "SVGGeometryFrame.h"
|
||||
#include "nsSVGPaintServerFrame.h"
|
||||
#include "mozilla/dom/SVGSVGElement.h"
|
||||
#include "nsTextFrame.h"
|
||||
@ -414,7 +414,7 @@ nsSVGUtils::GetCanvasTM(nsIFrame *aFrame)
|
||||
return containerFrame->GetCanvasTM();
|
||||
}
|
||||
|
||||
return static_cast<nsSVGPathGeometryFrame*>(aFrame)->GetCanvasTM();
|
||||
return static_cast<SVGGeometryFrame*>(aFrame)->GetCanvasTM();
|
||||
}
|
||||
|
||||
gfxMatrix
|
||||
@ -1277,7 +1277,7 @@ nsSVGUtils::CanOptimizeOpacity(nsIFrame *aFrame)
|
||||
}
|
||||
nsIAtom *type = aFrame->GetType();
|
||||
if (type != nsGkAtoms::svgImageFrame &&
|
||||
type != nsGkAtoms::svgPathGeometryFrame) {
|
||||
type != nsGkAtoms::svgGeometryFrame) {
|
||||
return false;
|
||||
}
|
||||
if (aFrame->StyleEffects()->HasFilters()) {
|
||||
@ -1383,7 +1383,7 @@ nsSVGUtils::PathExtentsToMaxStrokeExtents(const gfxRect& aPathExtents,
|
||||
|
||||
/*static*/ gfxRect
|
||||
nsSVGUtils::PathExtentsToMaxStrokeExtents(const gfxRect& aPathExtents,
|
||||
nsSVGPathGeometryFrame* aFrame,
|
||||
SVGGeometryFrame* aFrame,
|
||||
const gfxMatrix& aMatrix)
|
||||
{
|
||||
bool strokeMayHaveCorners =
|
||||
|
@ -39,7 +39,6 @@ class nsSVGElement;
|
||||
class nsSVGEnum;
|
||||
class nsSVGLength2;
|
||||
class nsSVGOuterSVGFrame;
|
||||
class nsSVGPathGeometryFrame;
|
||||
class nsTextFrame;
|
||||
|
||||
struct nsStyleSVG;
|
||||
@ -48,6 +47,7 @@ struct nsRect;
|
||||
namespace mozilla {
|
||||
class SVGContextPaint;
|
||||
struct SVGContextPaintImpl;
|
||||
class SVGGeometryFrame;
|
||||
namespace dom {
|
||||
class Element;
|
||||
class UserSpaceMetrics;
|
||||
@ -186,6 +186,7 @@ public:
|
||||
typedef mozilla::gfx::Size Size;
|
||||
typedef mozilla::SVGContextPaint SVGContextPaint;
|
||||
typedef mozilla::SVGContextPaintImpl SVGContextPaintImpl;
|
||||
typedef mozilla::SVGGeometryFrame SVGGeometryFrame;
|
||||
typedef mozilla::image::DrawResult DrawResult;
|
||||
|
||||
static void Init();
|
||||
@ -482,7 +483,7 @@ public:
|
||||
nsTextFrame* aFrame,
|
||||
const gfxMatrix& aMatrix);
|
||||
static gfxRect PathExtentsToMaxStrokeExtents(const gfxRect& aPathExtents,
|
||||
nsSVGPathGeometryFrame* aFrame,
|
||||
SVGGeometryFrame* aFrame,
|
||||
const gfxMatrix& aMatrix);
|
||||
|
||||
/**
|
||||
|
@ -24,12 +24,3 @@
|
||||
[SVGSVGElement.prototype.useCurrentView must be removed]
|
||||
expected: FAIL
|
||||
|
||||
[SVGPathElement.prototype.getPointAtLength must be moved to SVGGeometryElement.prototype]
|
||||
expected: FAIL
|
||||
|
||||
[SVGPathElement.prototype.getTotalLength must be moved to SVGGeometryElement.prototype]
|
||||
expected: FAIL
|
||||
|
||||
[SVGPathElement.prototype.pathLength must be moved to SVGGeometryElement.prototype]
|
||||
expected: FAIL
|
||||
|
||||
|
@ -1,20 +1,5 @@
|
||||
[interfaces.html]
|
||||
type: testharness
|
||||
[SVGGeometryElement interface: existence and properties of interface object]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface object length]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface object name]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: existence and properties of interface prototype object's "constructor" property]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: operation isPointInFill(DOMPoint)]
|
||||
expected: FAIL
|
||||
|
||||
@ -306,19 +291,13 @@
|
||||
[SVGTransform interface: svg.createSVGTransform() must inherit property "matrix" with the proper type (8)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGPathElement interface: existence and properties of interface object]
|
||||
expected: FAIL
|
||||
|
||||
[SVGPathElement interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: path must inherit property "isPointInFill" with the proper type (0)]
|
||||
[SVGGeometryElement interface: path must inherit property "isPointInFill" with the proper type (1)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInFill(DOMPoint) on path with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: path must inherit property "isPointInStroke" with the proper type (1)]
|
||||
[SVGGeometryElement interface: path must inherit property "isPointInStroke" with the proper type (2)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on path with too few arguments must throw TypeError]
|
||||
@ -348,13 +327,25 @@
|
||||
[SVGRectElement interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: rect must inherit property "isPointInFill" with the proper type (0)]
|
||||
[SVGGeometryElement interface: rect must inherit property "pathLength" with the proper type (0)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: rect must inherit property "isPointInFill" with the proper type (1)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInFill(DOMPoint) on rect with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: rect must inherit property "isPointInStroke" with the proper type (1)]
|
||||
[SVGGeometryElement interface: rect must inherit property "isPointInStroke" with the proper type (2)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: rect must inherit property "getTotalLength" with the proper type (3)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: rect must inherit property "getPointAtLength" with the proper type (4)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling getPointAtLength(float) on rect with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on rect with too few arguments must throw TypeError]
|
||||
@ -384,18 +375,30 @@
|
||||
[SVGCircleElement interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: circle must inherit property "isPointInFill" with the proper type (0)]
|
||||
[SVGGeometryElement interface: circle must inherit property "pathLength" with the proper type (0)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: circle must inherit property "isPointInFill" with the proper type (1)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInFill(DOMPoint) on circle with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: circle must inherit property "isPointInStroke" with the proper type (1)]
|
||||
[SVGGeometryElement interface: circle must inherit property "isPointInStroke" with the proper type (2)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on circle with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: circle must inherit property "getTotalLength" with the proper type (3)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: circle must inherit property "getPointAtLength" with the proper type (4)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling getPointAtLength(float) on circle with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGElement interface: circle must inherit property "onautocomplete" with the proper type (8)]
|
||||
expected: FAIL
|
||||
|
||||
@ -420,18 +423,30 @@
|
||||
[SVGEllipseElement interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: ellipse must inherit property "isPointInFill" with the proper type (0)]
|
||||
[SVGGeometryElement interface: ellipse must inherit property "pathLength" with the proper type (0)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: ellipse must inherit property "isPointInFill" with the proper type (1)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInFill(DOMPoint) on ellipse with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: ellipse must inherit property "isPointInStroke" with the proper type (1)]
|
||||
[SVGGeometryElement interface: ellipse must inherit property "isPointInStroke" with the proper type (2)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on ellipse with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: ellipse must inherit property "getTotalLength" with the proper type (3)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: ellipse must inherit property "getPointAtLength" with the proper type (4)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling getPointAtLength(float) on ellipse with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGElement interface: ellipse must inherit property "onautocomplete" with the proper type (8)]
|
||||
expected: FAIL
|
||||
|
||||
@ -456,18 +471,30 @@
|
||||
[SVGLineElement interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: line must inherit property "isPointInFill" with the proper type (0)]
|
||||
[SVGGeometryElement interface: line must inherit property "pathLength" with the proper type (0)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: line must inherit property "isPointInFill" with the proper type (1)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInFill(DOMPoint) on line with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: line must inherit property "isPointInStroke" with the proper type (1)]
|
||||
[SVGGeometryElement interface: line must inherit property "isPointInStroke" with the proper type (2)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on line with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: line must inherit property "getTotalLength" with the proper type (3)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: line must inherit property "getPointAtLength" with the proper type (4)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling getPointAtLength(float) on line with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGElement interface: line must inherit property "onautocomplete" with the proper type (8)]
|
||||
expected: FAIL
|
||||
|
||||
@ -492,18 +519,30 @@
|
||||
[SVGPolylineElement interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: polyline must inherit property "isPointInFill" with the proper type (0)]
|
||||
[SVGGeometryElement interface: polyline must inherit property "pathLength" with the proper type (0)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: polyline must inherit property "isPointInFill" with the proper type (1)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInFill(DOMPoint) on polyline with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: polyline must inherit property "isPointInStroke" with the proper type (1)]
|
||||
[SVGGeometryElement interface: polyline must inherit property "isPointInStroke" with the proper type (2)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on polyline with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: polyline must inherit property "getTotalLength" with the proper type (3)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: polyline must inherit property "getPointAtLength" with the proper type (4)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling getPointAtLength(float) on polyline with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGElement interface: polyline must inherit property "onautocomplete" with the proper type (8)]
|
||||
expected: FAIL
|
||||
|
||||
@ -528,18 +567,30 @@
|
||||
[SVGPolygonElement interface: existence and properties of interface prototype object]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: polygon must inherit property "isPointInFill" with the proper type (0)]
|
||||
[SVGGeometryElement interface: polygon must inherit property "pathLength" with the proper type (0)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: polygon must inherit property "isPointInFill" with the proper type (1)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInFill(DOMPoint) on polygon with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: polygon must inherit property "isPointInStroke" with the proper type (1)]
|
||||
[SVGGeometryElement interface: polygon must inherit property "isPointInStroke" with the proper type (2)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling isPointInStroke(DOMPoint) on polygon with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: polygon must inherit property "getTotalLength" with the proper type (3)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: polygon must inherit property "getPointAtLength" with the proper type (4)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: calling getPointAtLength(float) on polygon with too few arguments must throw TypeError]
|
||||
expected: FAIL
|
||||
|
||||
[SVGElement interface: polygon must inherit property "onautocomplete" with the proper type (8)]
|
||||
expected: FAIL
|
||||
|
||||
@ -1557,15 +1608,6 @@
|
||||
[SVGElement interface: feTurbulence must inherit property "onsort" with the proper type (62)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: attribute pathLength]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: operation getTotalLength()]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: operation getPointAtLength(float)]
|
||||
expected: FAIL
|
||||
|
||||
[SVGGeometryElement interface: path must inherit property "isPointInFill" with the proper type (1)]
|
||||
expected: FAIL
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user