2d9e543a58
- Replace sk_memory_order with std::memory_order. - Remove SkAtomic<T>. SkPath was the only user of SkAtomic<T>, for its fConvexity and fFirstDirection fields. I've replaced them with std::atomic types, and funneled access to them through methods that enforce the relaxed memory order like SkAtomic<T> did. For fConvexity, we can use the exisiting setConvexity() and getConvexityOrUnknown() methods, adding a private const setConvexity() to mutate convexity from const methods. For fFirstDirection I've added private setFirstDirection() and getFirstDirection() methods. Removing SkAtomic<T> means SkAtomics.h no longer needs SkNoncopyable.h. I've had to update a bunch of other headers that were depending on transitive inclusion. Change-Id: Ib238be71a121519db6e970a9a8955834e1298c87 Reviewed-on: https://skia-review.googlesource.com/c/174220 Commit-Queue: Brian Salomon <bsalomon@google.com> Auto-Submit: Mike Klein <mtklein@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
96 lines
3.2 KiB
C++
96 lines
3.2 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SkSVGValue_DEFINED
|
|
#define SkSVGValue_DEFINED
|
|
|
|
#include "SkColor.h"
|
|
#include "SkMatrix.h"
|
|
#include "SkNoncopyable.h"
|
|
#include "SkPath.h"
|
|
#include "SkSVGTypes.h"
|
|
#include "SkTypes.h"
|
|
|
|
class SkSVGValue : public SkNoncopyable {
|
|
public:
|
|
enum class Type {
|
|
kClip,
|
|
kColor,
|
|
kDashArray,
|
|
kFillRule,
|
|
kLength,
|
|
kLineCap,
|
|
kLineJoin,
|
|
kNumber,
|
|
kPaint,
|
|
kPath,
|
|
kPoints,
|
|
kSpreadMethod,
|
|
kString,
|
|
kTransform,
|
|
kViewBox,
|
|
kVisibility,
|
|
};
|
|
|
|
Type type() const { return fType; }
|
|
|
|
template <typename T>
|
|
const T* as() const {
|
|
return fType == T::TYPE ? static_cast<const T*>(this) : nullptr;
|
|
}
|
|
|
|
protected:
|
|
SkSVGValue(Type t) : fType(t) { }
|
|
|
|
private:
|
|
Type fType;
|
|
|
|
typedef SkNoncopyable INHERITED;
|
|
};
|
|
|
|
template <typename T, SkSVGValue::Type ValueType>
|
|
class SkSVGWrapperValue final : public SkSVGValue {
|
|
public:
|
|
static constexpr Type TYPE = ValueType;
|
|
|
|
explicit SkSVGWrapperValue(const T& v)
|
|
: INHERITED(ValueType)
|
|
, fWrappedValue(v) { }
|
|
|
|
operator const T&() const { return fWrappedValue; }
|
|
const T* operator->() const { return &fWrappedValue; }
|
|
|
|
private:
|
|
// Stack-only
|
|
void* operator new(size_t) = delete;
|
|
void* operator new(size_t, void*) = delete;
|
|
|
|
const T& fWrappedValue;
|
|
|
|
typedef SkSVGValue INHERITED;
|
|
};
|
|
|
|
using SkSVGClipValue = SkSVGWrapperValue<SkSVGClip , SkSVGValue::Type::kClip >;
|
|
using SkSVGColorValue = SkSVGWrapperValue<SkSVGColorType , SkSVGValue::Type::kColor >;
|
|
using SkSVGFillRuleValue = SkSVGWrapperValue<SkSVGFillRule , SkSVGValue::Type::kFillRule >;
|
|
using SkSVGLengthValue = SkSVGWrapperValue<SkSVGLength , SkSVGValue::Type::kLength >;
|
|
using SkSVGPathValue = SkSVGWrapperValue<SkPath , SkSVGValue::Type::kPath >;
|
|
using SkSVGTransformValue = SkSVGWrapperValue<SkSVGTransformType, SkSVGValue::Type::kTransform >;
|
|
using SkSVGViewBoxValue = SkSVGWrapperValue<SkSVGViewBoxType , SkSVGValue::Type::kViewBox >;
|
|
using SkSVGPaintValue = SkSVGWrapperValue<SkSVGPaint , SkSVGValue::Type::kPaint >;
|
|
using SkSVGLineCapValue = SkSVGWrapperValue<SkSVGLineCap , SkSVGValue::Type::kLineCap >;
|
|
using SkSVGLineJoinValue = SkSVGWrapperValue<SkSVGLineJoin , SkSVGValue::Type::kLineJoin >;
|
|
using SkSVGNumberValue = SkSVGWrapperValue<SkSVGNumberType , SkSVGValue::Type::kNumber >;
|
|
using SkSVGPointsValue = SkSVGWrapperValue<SkSVGPointsType , SkSVGValue::Type::kPoints >;
|
|
using SkSVGStringValue = SkSVGWrapperValue<SkSVGStringType , SkSVGValue::Type::kString >;
|
|
using SkSVGSpreadMethodValue = SkSVGWrapperValue<SkSVGSpreadMethod ,
|
|
SkSVGValue::Type::kSpreadMethod>;
|
|
using SkSVGVisibilityValue = SkSVGWrapperValue<SkSVGVisibility , SkSVGValue::Type::kVisibility>;
|
|
using SkSVGDashArrayValue = SkSVGWrapperValue<SkSVGDashArray , SkSVGValue::Type::kDashArray >;
|
|
|
|
#endif // SkSVGValue_DEFINED
|