GrTArray->SkTArray & docs
Review URL: http://codereview.appspot.com/5005045/
git-svn-id: http://skia.googlecode.com/svn/trunk@2265 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/src/GrAAHairLinePathRenderer.cpp b/gpu/src/GrAAHairLinePathRenderer.cpp
index f60e7cf..d57aa3a 100644
--- a/gpu/src/GrAAHairLinePathRenderer.cpp
+++ b/gpu/src/GrAAHairLinePathRenderer.cpp
@@ -137,8 +137,8 @@
namespace {
-typedef GrTArray<SkPoint, true> PtArray;
-typedef GrTArray<int, true> IntArray;
+typedef SkTArray<SkPoint, true> PtArray;
+typedef SkTArray<int, true> IntArray;
/**
* We convert cubics to quadratics (for now).
@@ -633,8 +633,8 @@
GrMatrix viewM = fTarget->getViewMatrix();
- GrAlignedSTStorage<128, GrPoint> lineStorage;
- GrAlignedSTStorage<128, GrPoint> quadStorage;
+ SkAlignedSTStorage<128, GrPoint> lineStorage;
+ SkAlignedSTStorage<128, GrPoint> quadStorage;
PtArray lines(&lineStorage);
PtArray quads(&quadStorage);
IntArray qSubdivs;
diff --git a/gpu/src/GrBufferAllocPool.h b/gpu/src/GrBufferAllocPool.h
index f9d9e19..acf0289 100644
--- a/gpu/src/GrBufferAllocPool.h
+++ b/gpu/src/GrBufferAllocPool.h
@@ -13,7 +13,8 @@
#include "GrNoncopyable.h"
#include "GrTDArray.h"
-#include "GrTArray.h"
+
+#include "SkTArray.h"
class GrGeometryBuffer;
class GrGpu;
@@ -173,7 +174,7 @@
size_t fMinBlockSize;
BufferType fBufferType;
- GrTArray<BufferBlock> fBlocks;
+ SkTArray<BufferBlock> fBlocks;
int fPreallocBuffersInUse;
int fFirstPreallocBuffer;
SkAutoMalloc fCpuData;
diff --git a/gpu/src/GrDrawTarget.h b/gpu/src/GrDrawTarget.h
index 42723f6..1d61a18 100644
--- a/gpu/src/GrDrawTarget.h
+++ b/gpu/src/GrDrawTarget.h
@@ -1315,10 +1315,10 @@
enum {
kPreallocGeoSrcStateStackCnt = 4,
};
- GrAlignedSTStorage<kPreallocGeoSrcStateStackCnt,
+ SkAlignedSTStorage<kPreallocGeoSrcStateStackCnt,
GeometrySrcState>
fGeoSrcStateStackStorage;
- GrTArray<GeometrySrcState, true> fGeoSrcStateStack;
+ SkTArray<GeometrySrcState, true> fGeoSrcStateStack;
};
diff --git a/gpu/src/GrGpu.h b/gpu/src/GrGpu.h
index 88b50b1..e970554 100644
--- a/gpu/src/GrGpu.h
+++ b/gpu/src/GrGpu.h
@@ -509,9 +509,9 @@
enum {
kPreallocGeomPoolStateStackCnt = 4,
};
- GrAlignedSTStorage<kPreallocGeomPoolStateStackCnt,
+ SkAlignedSTStorage<kPreallocGeomPoolStateStackCnt,
GeometryPoolState> fGeoSrcStateStackStorage;
- GrTArray<GeometryPoolState, true> fGeomPoolStateStack;
+ SkTArray<GeometryPoolState, true> fGeomPoolStateStack;
mutable GrIndexBuffer* fQuadIndexBuffer; // mutable so it can be
// created on-demand
diff --git a/gpu/src/GrGpuGL.h b/gpu/src/GrGpuGL.h
index 47aca3c..b1accf6 100644
--- a/gpu/src/GrGpuGL.h
+++ b/gpu/src/GrGpuGL.h
@@ -194,7 +194,7 @@
friend class GrGLRenderTarget;
- GrTArray<GrGLStencilBuffer::Format, true> fStencilFormats;
+ SkTArray<GrGLStencilBuffer::Format, true> fStencilFormats;
// we want to clear stencil buffers when they are created. We want to clear
// the entire buffer even if it is larger than the color attachment. We
// attach it to this fbo with no color attachment to do the initial clear.
diff --git a/gpu/src/GrInOrderDrawBuffer.h b/gpu/src/GrInOrderDrawBuffer.h
index dbf6144..f0b5c9e 100644
--- a/gpu/src/GrInOrderDrawBuffer.h
+++ b/gpu/src/GrInOrderDrawBuffer.h
@@ -172,7 +172,7 @@
size_t fUsedPoolVertexBytes;
size_t fUsedPoolIndexBytes;
};
- GrTArray<GeometryPoolState> fGeoPoolStateStack;
+ SkTArray<GeometryPoolState> fGeoPoolStateStack;
enum {
@@ -183,11 +183,11 @@
kGeoPoolStatePreAllocCnt = 4,
};
- GrAlignedSTStorage<kDrawPreallocCnt, Draw> fDrawStorage;
- GrAlignedSTStorage<kStatePreallocCnt, SavedDrawState> fStateStorage;
- GrAlignedSTStorage<kClipPreallocCnt, GrClip> fClipStorage;
- GrAlignedSTStorage<kClearPreallocCnt, Clear> fClearStorage;
- GrAlignedSTStorage<kGeoPoolStatePreAllocCnt,
+ SkAlignedSTStorage<kDrawPreallocCnt, Draw> fDrawStorage;
+ SkAlignedSTStorage<kStatePreallocCnt, SavedDrawState> fStateStorage;
+ SkAlignedSTStorage<kClipPreallocCnt, GrClip> fClipStorage;
+ SkAlignedSTStorage<kClearPreallocCnt, Clear> fClearStorage;
+ SkAlignedSTStorage<kGeoPoolStatePreAllocCnt,
GeometryPoolState> fGeoStackStorage;
typedef GrDrawTarget INHERITED;
diff --git a/gpu/src/GrPathRenderer.h b/gpu/src/GrPathRenderer.h
index 815da47..b8e7a4c 100644
--- a/gpu/src/GrPathRenderer.h
+++ b/gpu/src/GrPathRenderer.h
@@ -11,9 +11,10 @@
#define GrPathRenderer_DEFINED
#include "GrDrawTarget.h"
-#include "GrTArray.h"
#include "GrPathRendererChain.h"
+#include "SkTArray.h"
+
class SkPath;
struct GrPoint;
diff --git a/gpu/src/GrPathRendererChain.h b/gpu/src/GrPathRendererChain.h
index 0f4305b..24abda4 100644
--- a/gpu/src/GrPathRendererChain.h
+++ b/gpu/src/GrPathRendererChain.h
@@ -11,7 +11,7 @@
#define GrPathRendererChain_DEFINED
#include "GrRefCnt.h"
-#include "GrTArray.h"
+#include "SkTArray.h"
class GrContext;
class GrDrawTarget;
@@ -55,8 +55,8 @@
bool fInit;
GrContext* fOwner;
UsageFlags fFlags;
- GrAlignedSTStorage<kPreAllocCount, GrPathRenderer*> fStorage;
- GrTArray<GrPathRenderer*, true> fChain;
+ SkAlignedSTStorage<kPreAllocCount, GrPathRenderer*> fStorage;
+ SkTArray<GrPathRenderer*, true> fChain;
};
GR_MAKE_BITFIELD_OPS(GrPathRendererChain::UsageFlags)