mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-03-04 07:40:42 +00:00
b2d67698b9
The Canvas2D specification says that if a path has no active sub-paths, and a primitive is drawn, that the first point of that primitive becomes the start of the newly created sub-path that will be created for it. So if we prune a point when a path has no active sub-paths, and then a new primitive comes in that does not start with that same point, we risk not installing the pruned point as the start of that new sub-path. To solve this, we need to detect if a path has no active sub-paths while we are building it. This adds PathBuilder::IsActive() to help with that. Then before we go to add a primitive, we check if there is a pruned point on a path that is not active yet, and if so, install the correct start point with a MoveTo. This also makes IsActive and IsEmpty required so to ensure all our path implementations behave consistently rather than having any surprising unimplemented behavior. Differential Revision: https://phabricator.services.mozilla.com/D184891
115 lines
3.5 KiB
C++
115 lines
3.5 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/. */
|
|
|
|
#ifndef MOZILLA_GFX_PATH_SKIA_H_
|
|
#define MOZILLA_GFX_PATH_SKIA_H_
|
|
|
|
#include "2D.h"
|
|
#include "skia/include/core/SkPath.h"
|
|
|
|
namespace mozilla {
|
|
namespace gfx {
|
|
|
|
class PathSkia;
|
|
|
|
class PathBuilderSkia : public PathBuilder {
|
|
public:
|
|
MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(PathBuilderSkia, override)
|
|
|
|
PathBuilderSkia(const Matrix& aTransform, const SkPath& aPath,
|
|
FillRule aFillRule);
|
|
explicit PathBuilderSkia(FillRule aFillRule);
|
|
|
|
void MoveTo(const Point& aPoint) override;
|
|
void LineTo(const Point& aPoint) override;
|
|
void BezierTo(const Point& aCP1, const Point& aCP2,
|
|
const Point& aCP3) override;
|
|
void QuadraticBezierTo(const Point& aCP1, const Point& aCP2) override;
|
|
void Close() override;
|
|
void Arc(const Point& aOrigin, float aRadius, float aStartAngle,
|
|
float aEndAngle, bool aAntiClockwise = false) override;
|
|
already_AddRefed<Path> Finish() override;
|
|
|
|
void AppendPath(const SkPath& aPath);
|
|
|
|
BackendType GetBackendType() const override { return BackendType::SKIA; }
|
|
|
|
bool IsActive() const override { return mPath.countPoints() > 0; }
|
|
|
|
static already_AddRefed<PathBuilder> Create(FillRule aFillRule);
|
|
|
|
private:
|
|
friend class PathSkia;
|
|
|
|
void SetFillRule(FillRule aFillRule);
|
|
|
|
SkPath mPath;
|
|
FillRule mFillRule;
|
|
};
|
|
|
|
class PathSkia : public Path {
|
|
public:
|
|
MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(PathSkia, override)
|
|
|
|
PathSkia(SkPath& aPath, FillRule aFillRule, Point aCurrentPoint = Point(),
|
|
Point aBeginPoint = Point())
|
|
: mFillRule(aFillRule),
|
|
mCurrentPoint(aCurrentPoint),
|
|
mBeginPoint(aBeginPoint) {
|
|
mPath.swap(aPath);
|
|
}
|
|
|
|
BackendType GetBackendType() const override { return BackendType::SKIA; }
|
|
|
|
already_AddRefed<PathBuilder> CopyToBuilder(
|
|
FillRule aFillRule) const override;
|
|
already_AddRefed<PathBuilder> TransformedCopyToBuilder(
|
|
const Matrix& aTransform, FillRule aFillRule) const override;
|
|
|
|
bool ContainsPoint(const Point& aPoint,
|
|
const Matrix& aTransform) const override;
|
|
|
|
bool StrokeContainsPoint(const StrokeOptions& aStrokeOptions,
|
|
const Point& aPoint,
|
|
const Matrix& aTransform) const override;
|
|
|
|
Rect GetBounds(const Matrix& aTransform = Matrix()) const override;
|
|
|
|
Rect GetStrokedBounds(const StrokeOptions& aStrokeOptions,
|
|
const Matrix& aTransform = Matrix()) const override;
|
|
|
|
Rect GetFastBounds(
|
|
const Matrix& aTransform = Matrix(),
|
|
const StrokeOptions* aStrokeOptions = nullptr) const override;
|
|
|
|
void StreamToSink(PathSink* aSink) const override;
|
|
|
|
FillRule GetFillRule() const override { return mFillRule; }
|
|
|
|
const SkPath& GetPath() const { return mPath; }
|
|
|
|
Maybe<Rect> AsRect() const override;
|
|
|
|
bool GetFillPath(const StrokeOptions& aStrokeOptions,
|
|
const Matrix& aTransform, SkPath& aFillPath,
|
|
const Maybe<Rect>& aClipRect = Nothing()) const;
|
|
|
|
bool IsEmpty() const override;
|
|
|
|
private:
|
|
friend class DrawTargetSkia;
|
|
|
|
SkPath mPath;
|
|
FillRule mFillRule;
|
|
Point mCurrentPoint;
|
|
Point mBeginPoint;
|
|
};
|
|
|
|
} // namespace gfx
|
|
} // namespace mozilla
|
|
|
|
#endif /* MOZILLA_GFX_PATH_SKIA_H_ */
|