Remove SK_DEBUG_PATH_REF

src/core/SkPath.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBuffer.h"
 #include "SkErrorInternals.h"
 #include "SkMath.h"
 #include "SkPath.h"
 #include "SkPathRef.h"
 #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
 // slower than just writing the loop. This seems odd, and hopefully in the
 // future this we appear to have been a fluke...
 #define MIN_COUNT_FOR_MEMSET_TO_BE_FAST 16
 
 ////////////////////////////////////////////////////////////////////////////
 
 /**
@@ skipping 125 matching lines @@
     3. if we encounter Move without a preceeding Close, and forceClose is true, goto #2
     4. if we encounter Line | Quad | Cubic after Close, cons up a Move
 */
 
 ////////////////////////////////////////////////////////////////////////////
 
 // flag to require a moveTo if we begin with something else, like lineTo etc.
 #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
 {
     this->resetFields();
 }
 
 void SkPath::resetFields() {
     //fPathRef is assumed to have been emptied by the caller.
     fLastMoveToIndex = INITIAL_LASTMOVETOINDEX_VALUE;
     fFillType = kWinding_FillType;
     fSegmentMask = 0;
     fBoundsIsDirty = true;
     fConvexity = kUnknown_Convexity;
     fDirection = kUnknown_Direction;
     fIsFinite = false;
     fIsOval = false;
 #ifdef SK_BUILD_FOR_ANDROID
     GEN_ID_INC;
     fSourcePath = NULL;
 #endif
 }
 
 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
 {
     this->copyFields(that);
     SkDEBUGCODE(that.validate();)
 }
 
 SkPath::~SkPath() {
     SkDEBUGCODE(this->validate();)
@@ skipping 2791 matching lines @@
     switch (this->getFillType()) {
         case SkPath::kEvenOdd_FillType:
         case SkPath::kInverseEvenOdd_FillType:
             w &= 1;
             break;
         default:
             break;
     }
     return SkToBool(w);
 }