Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: include/core/SkTArray.h

Issue 1682083002: Remove SkNEW_APPEND_TO_TARRAY. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/gpu/GrPathProcessor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkTArray.h
diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h
index 86c5eaacf02535953f4581c50d2293c6f746974f..5330e4930725cf5bbf5945e66cf847da68d09fba 100644
--- a/include/core/SkTArray.h
+++ b/include/core/SkTArray.h
@@ -15,15 +15,12 @@
#include <new>
#include <utility>
-template <typename T, bool MEM_COPY = false> class SkTArray;
-template <typename T, bool MEM_COPY> void* operator new(size_t, SkTArray<T, MEM_COPY>*, int);
-
/** When MEM_COPY is true T will be bit copied when moved.
When MEM_COPY is false, T will be copy constructed / destructed.
In all cases T will be default-initialized on allocation,
and its destructor will be called from this object's destructor.
*/
-template <typename T, bool MEM_COPY> class SkTArray {
+template <typename T, bool MEM_COPY = false> class SkTArray {
public:
/**
* Creates an empty array with no initial storage
@@ -464,8 +461,6 @@ private:
}
}
- friend void* operator new<T>(size_t, SkTArray*, int);
-
int fReserveCount;
int fCount;
int fAllocCount;
@@ -476,29 +471,6 @@ private:
};
};
-// Use the below macro (SkNEW_APPEND_TO_TARRAY) rather than calling this directly
-template <typename T, bool MEM_COPY>
-void* operator new(size_t, SkTArray<T, MEM_COPY>* array, int SkDEBUGCODE(atIndex)) {
- // Currently, we only support adding to the end of the array. When the array class itself
- // supports random insertion then this should be updated.
- // SkASSERT(atIndex >= 0 && atIndex <= array->count());
- SkASSERT(atIndex == array->count());
- return array->push_back_raw(1);
-}
-
-// Skia doesn't use C++ exceptions but it may be compiled with them enabled. Having an op delete
-// to match the op new silences warnings about missing op delete when a constructor throws an
-// exception.
-template <typename T, bool MEM_COPY>
-void operator delete(void*, SkTArray<T, MEM_COPY>* /*array*/, int /*atIndex*/) {
- SK_ABORT("Invalid Operation");
-}
-
-// Constructs a new object as the last element of an SkTArray.
-#define SkNEW_APPEND_TO_TARRAY(array_ptr, type_name, args) \
- (new ((array_ptr), (array_ptr)->count()) type_name args)
-
-
/**
* Subclass of SkTArray that contains a preallocated memory block for the array.
*/
« no previous file with comments | « no previous file | src/gpu/GrPathProcessor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698