aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/core/SkPath.h26
-rw-r--r--src/core/SkPath.cpp61
-rw-r--r--src/core/SkPathRef.h97
3 files changed, 17 insertions, 167 deletions
diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index 4e2451b5e0..d4b79cda04 100644
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@@ -30,10 +30,6 @@ class SkString;
class SkPathRef;
class SkRRect;
-#ifndef SK_DEBUG_PATH_REF
- #define SK_DEBUG_PATH_REF 0
-#endif
-
/** \class SkPath
The SkPath class encapsulates compound (multiple contour) geometric paths
@@ -945,29 +941,7 @@ private:
kSegmentMask_SerializationShift = 0 // requires 4 bits
};
-#if SK_DEBUG_PATH_REF
-public:
- /** Debugging wrapper for SkAutoTUnref<SkPathRef> used to track owners (SkPaths)
- of SkPathRefs */
- class PathRefDebugRef {
- public:
- PathRefDebugRef(SkPathRef* pr, SkPath* owner);
- ~PathRefDebugRef();
- void reset(SkPathRef* ref);
- void swap(PathRefDebugRef* other);
- SkPathRef* get() const;
- SkAutoTUnref<SkPathRef>::BlockRefType *operator->() const;
- operator SkPathRef*();
- private:
- SkAutoTUnref<SkPathRef> fPathRef;
- SkPath* fOwner;
- };
-
-private:
- PathRefDebugRef fPathRef;
-#else
SkAutoTUnref<SkPathRef> fPathRef;
-#endif
mutable SkRect fBounds;
int fLastMoveToIndex;
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 7497ab2591..4ff62878b9 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -15,59 +15,6 @@
#include "SkRRect.h"
#include "SkThread.h"
-////////////////////////////////////////////////////////////////////////////
-
-#if SK_DEBUG_PATH_REF
-
-SkPath::PathRefDebugRef::PathRefDebugRef(SkPathRef* pr, SkPath* owner)
- : fPathRef(pr)
- , fOwner(owner)
-{
- pr->addOwner(owner);
-}
-
-SkPath::PathRefDebugRef::~PathRefDebugRef() {
- fPathRef->removeOwner(fOwner);
-}
-
-void SkPath::PathRefDebugRef::reset(SkPathRef* ref) {
- bool diff = (ref != fPathRef.get());
- if (diff && NULL != fPathRef.get()) {
- fPathRef.get()->removeOwner(fOwner);
- }
- fPathRef.reset(ref);
- if (diff && NULL != fPathRef.get()) {
- fPathRef.get()->addOwner(fOwner);
- }
-}
-
-void SkPath::PathRefDebugRef::swap(SkPath::PathRefDebugRef* other) {
- if (other->fPathRef.get() != fPathRef.get()) {
- other->fPathRef->removeOwner(other->fOwner);
- other->fPathRef->addOwner(fOwner);
-
- fPathRef->removeOwner(fOwner);
- fPathRef->addOwner(other->fOwner);
- }
-
- fPathRef.swap(&other->fPathRef);
-}
-
-SkPathRef* SkPath::PathRefDebugRef::get() const { return fPathRef.get(); }
-
-SkAutoTUnref<SkPathRef>::BlockRefType *SkPath::PathRefDebugRef::operator->() const {
- return fPathRef.operator->();
-}
-
-SkPath::PathRefDebugRef::operator SkPathRef*() {
- return fPathRef.operator SkPathRef *();
-}
-
-#endif
-
-////////////////////////////////////////////////////////////////////////////
-
-
SK_DEFINE_INST_COUNT(SkPath);
// This value is just made-up for now. When count is 4, calling memset was much
@@ -213,11 +160,7 @@ static bool compute_pt_bounds(SkRect* bounds, const SkPathRef& ref) {
#define INITIAL_LASTMOVETOINDEX_VALUE ~0
SkPath::SkPath()
-#if SK_DEBUG_PATH_REF
- : fPathRef(SkPathRef::CreateEmpty(), this)
-#else
: fPathRef(SkPathRef::CreateEmpty())
-#endif
#ifdef SK_BUILD_FOR_ANDROID
, fGenerationID(0)
#endif
@@ -242,11 +185,7 @@ void SkPath::resetFields() {
}
SkPath::SkPath(const SkPath& that)
-#if SK_DEBUG_PATH_REF
- : fPathRef(SkRef(that.fPathRef.get()), this)
-#else
: fPathRef(SkRef(that.fPathRef.get()))
-#endif
#ifdef SK_BUILD_FOR_ANDROID
, fGenerationID(0)
#endif
diff --git a/src/core/SkPathRef.h b/src/core/SkPathRef.h
index b670039291..da9f991bc9 100644
--- a/src/core/SkPathRef.h
+++ b/src/core/SkPathRef.h
@@ -29,42 +29,13 @@
class SkPathRef;
-// This path ref should never be deleted once it is created. It should not be global but was made
-// so for checks when SK_DEBUG_PATH_REF is enabled. It we be re-hidden when the debugging code is
-// reverted.
-SkPathRef* gEmptyPathRef;
-
-// Temporary hackery to try to nail down http://code.google.com/p/chromium/issues/detail?id=148637
-#if SK_DEBUG_PATH_REF
- #define PR_CONTAINER SkPath::PathRefDebugRef
- #define SkDEBUGCODE_X(code) code
- #define SkASSERT_X(cond) SK_DEBUGBREAK(cond)
- // We put the mutex in a factory function to protect against static-initializion order
- // fiasco when SkPaths are created before main().
- static SkMutex* owners_mutex() {
- static SkMutex* gOwnersMutex;
- if (!gOwnersMutex) {
- gOwnersMutex = new SkMutex(); // leak!
- }
- return gOwnersMutex;
- }
- // We have a static initializer that calls owners_mutex before main() so that
- // hopefully that we only wind up with one mutex (assuming no threads created
- // before static initialization is finished.)
- static const SkMutex* gOwnersMutexForce = owners_mutex();
-#else
- #define PR_CONTAINER SkAutoTUnref<SkPathRef>
- #define SkDEBUGCODE_X(code) SkDEBUGCODE(code)
- #define SkASSERT_X(cond) SkASSERT(cond)
-#endif
-
class SkPathRef : public ::SkRefCnt {
public:
SK_DECLARE_INST_COUNT(SkPathRef);
class Editor {
public:
- Editor(PR_CONTAINER* pathRef,
+ Editor(SkAutoTUnref<SkPathRef>* pathRef,
int incReserveVerbs = 0,
int incReservePoints = 0) {
if (pathRef->get()->getRefCnt() > 1) {
@@ -76,10 +47,10 @@ public:
}
fPathRef = pathRef->get();
fPathRef->fGenerationID = 0;
- SkDEBUGCODE_X(sk_atomic_inc(&fPathRef->fEditorsAttached);)
+ SkDEBUGCODE(sk_atomic_inc(&fPathRef->fEditorsAttached);)
}
- ~Editor() { SkDEBUGCODE_X(sk_atomic_dec(&fPathRef->fEditorsAttached);) }
+ ~Editor() { SkDEBUGCODE(sk_atomic_dec(&fPathRef->fEditorsAttached);) }
/**
* Returns the array of points.
@@ -145,36 +116,11 @@ public:
};
public:
-#if SK_DEBUG_PATH_REF
- void addOwner(SkPath* owner) {
- SkAutoMutexAcquire ac(owners_mutex());
- for (int i = 0; i < fOwners.count(); ++i) {
- SkASSERT_X(fOwners[i] != owner);
- }
- *fOwners.append() = owner;
- SkASSERT_X((this->getRefCnt() == fOwners.count()) ||
- (this == gEmptyPathRef && this->getRefCnt() == fOwners.count() + 1));
- }
-
- void removeOwner(SkPath* owner) {
- SkAutoMutexAcquire ac(owners_mutex());
- SkASSERT_X((this->getRefCnt() == fOwners.count()) ||
- (this == gEmptyPathRef && this->getRefCnt() == fOwners.count() + 1));
- bool found = false;
- for (int i = 0; !found && i < fOwners.count(); ++i) {
- found = (owner == fOwners[i]);
- if (found) {
- fOwners.remove(i);
- }
- }
- SkASSERT_X(found);
- }
-#endif
-
/**
* Gets a path ref with no verbs or points.
*/
static SkPathRef* CreateEmpty() {
+ static SkPathRef* gEmptyPathRef;
if (!gEmptyPathRef) {
gEmptyPathRef = SkNEW(SkPathRef); // leak!
}
@@ -184,7 +130,7 @@ public:
/**
* Transforms a path ref by a matrix, allocating a new one only if necessary.
*/
- static void CreateTransformedCopy(PR_CONTAINER* dst,
+ static void CreateTransformedCopy(SkAutoTUnref<SkPathRef>* dst,
const SkPathRef& src,
const SkMatrix& matrix) {
src.validate();
@@ -232,7 +178,7 @@ public:
* repopulated with approximately the same number of verbs and points. A new path ref is created
* only if necessary.
*/
- static void Rewind(PR_CONTAINER* pathRef) {
+ static void Rewind(SkAutoTUnref<SkPathRef>* pathRef) {
if (1 == (*pathRef)->getRefCnt()) {
(*pathRef)->validate();
(*pathRef)->fVerbCnt = 0;
@@ -250,21 +196,16 @@ public:
}
virtual ~SkPathRef() {
- SkASSERT_X(this != gEmptyPathRef);
-#if SK_DEBUG_PATH_REF
- SkASSERT_X(!fOwners.count());
-#endif
-
this->validate();
sk_free(fPoints);
- SkDEBUGCODE_X(fPoints = NULL;)
- SkDEBUGCODE_X(fVerbs = NULL;)
- SkDEBUGCODE_X(fVerbCnt = 0x9999999;)
- SkDEBUGCODE_X(fPointCnt = 0xAAAAAAA;)
- SkDEBUGCODE_X(fPointCnt = 0xBBBBBBB;)
- SkDEBUGCODE_X(fGenerationID = 0xEEEEEEEE;)
- SkDEBUGCODE_X(fEditorsAttached = 0x7777777;)
+ SkDEBUGCODE(fPoints = NULL;)
+ SkDEBUGCODE(fVerbs = NULL;)
+ SkDEBUGCODE(fVerbCnt = 0x9999999;)
+ SkDEBUGCODE(fPointCnt = 0xAAAAAAA;)
+ SkDEBUGCODE(fPointCnt = 0xBBBBBBB;)
+ SkDEBUGCODE(fGenerationID = 0xEEEEEEEE;)
+ SkDEBUGCODE(fEditorsAttached = 0x7777777;)
}
int countPoints() const { this->validate(); return fPointCnt; }
@@ -350,7 +291,7 @@ public:
*/
void writeToBuffer(SkWBuffer* buffer) {
this->validate();
- SkDEBUGCODE_X(size_t beforePos = buffer->pos();)
+ SkDEBUGCODE(size_t beforePos = buffer->pos();)
// TODO: write gen ID here. Problem: We don't know if we're cross process or not from
// SkWBuffer. Until this is fixed we write 0.
@@ -383,7 +324,7 @@ private:
fPoints = NULL;
fFreeSpace = 0;
fGenerationID = kEmptyGenID;
- SkDEBUGCODE_X(fEditorsAttached = 0;)
+ SkDEBUGCODE(fEditorsAttached = 0;)
this->validate();
}
@@ -551,7 +492,7 @@ private:
* for the path ref.
*/
int32_t genID() const {
- SkASSERT_X(!fEditorsAttached);
+ SkASSERT(!fEditorsAttached);
if (!fGenerationID) {
if (0 == fPointCnt && 0 == fVerbCnt) {
fGenerationID = kEmptyGenID;
@@ -594,11 +535,7 @@ private:
kEmptyGenID = 1, // GenID reserved for path ref with zero points and zero verbs.
};
mutable int32_t fGenerationID;
- SkDEBUGCODE_X(int32_t fEditorsAttached;) // assert that only one editor in use at any time.
-
-#if SK_DEBUG_PATH_REF
- SkTDArray<SkPath*> fOwners;
-#endif
+ SkDEBUGCODE(int32_t fEditorsAttached;) // assert that only one editor in use at any time.
typedef SkRefCnt INHERITED;
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 05:15:00 +0000