Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part II of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6474054
git-svn-id: http://skia.googlecode.com/svn/trunk@5263 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrAAHairLinePathRenderer.h b/src/gpu/GrAAHairLinePathRenderer.h
index cf8b8d3..c04d062 100644
--- a/src/gpu/GrAAHairLinePathRenderer.h
+++ b/src/gpu/GrAAHairLinePathRenderer.h
@@ -28,7 +28,7 @@
const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) SK_OVERRIDE;
-
+
private:
GrAAHairLinePathRenderer(const GrContext* context,
diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp
index 652adcb..36f37ab 100644
--- a/src/gpu/GrAARectRenderer.cpp
+++ b/src/gpu/GrAARectRenderer.cpp
@@ -88,7 +88,7 @@
GrIndexBuffer* GrAARectRenderer::aaStrokeRectIndexBuffer(GrGpu* gpu) {
if (NULL == fAAStrokeRectIndexBuffer) {
- fAAStrokeRectIndexBuffer =
+ fAAStrokeRectIndexBuffer =
gpu->createIndexBuffer(sizeof(gStrokeAARectIdx), false);
if (NULL != fAAStrokeRectIndexBuffer) {
#if GR_DEBUG
diff --git a/src/gpu/GrAllocator.h b/src/gpu/GrAllocator.h
index ae456cd..dc4c3de 100755
--- a/src/gpu/GrAllocator.h
+++ b/src/gpu/GrAllocator.h
@@ -55,8 +55,8 @@
} else if (fOwnFirstBlock) {
fBlocks[0] = GrMalloc(fBlockSize);
}
- }
- void* ret = (char*)fBlocks[fCount/fItemsPerBlock] +
+ }
+ void* ret = (char*)fBlocks[fCount/fItemsPerBlock] +
fItemSize * indexInBlock;
++fCount;
return ret;
@@ -65,8 +65,8 @@
/**
* removes all added items
*/
- void reset() {
- int blockCount = GrMax((unsigned)1,
+ void reset() {
+ int blockCount = GrMax((unsigned)1,
GrUIDivRoundUp(fCount, fItemsPerBlock));
for (int i = 1; i < blockCount; ++i) {
GrFree(fBlocks[i]);
@@ -85,12 +85,12 @@
int count() const {
return fCount;
}
-
+
/**
* is the count 0
*/
bool empty() const { return fCount == 0; }
-
+
/**
* access last item, only call if count() != 0
*/
@@ -98,7 +98,7 @@
GrAssert(fCount);
return (*this)[fCount-1];
}
-
+
/**
* access last item, only call if count() != 0
*/
@@ -106,28 +106,28 @@
GrAssert(fCount);
return (*this)[fCount-1];
}
-
+
/**
* access item by index.
- */
+ */
void* operator[] (int i) {
GrAssert(i >= 0 && i < fCount);
- return (char*)fBlocks[i / fItemsPerBlock] +
+ return (char*)fBlocks[i / fItemsPerBlock] +
fItemSize * (i % fItemsPerBlock);
}
/**
* access item by index.
- */
+ */
const void* operator[] (int i) const {
GrAssert(i >= 0 && i < fCount);
- return (const char*)fBlocks[i / fItemsPerBlock] +
+ return (const char*)fBlocks[i / fItemsPerBlock] +
fItemSize * (i % fItemsPerBlock);
}
private:
static const int NUM_INIT_BLOCK_PTRS = 8;
-
+
SkSTArray<NUM_INIT_BLOCK_PTRS, void*> fBlocks;
size_t fBlockSize;
size_t fItemSize;
@@ -184,19 +184,19 @@
}
fAllocator.reset();
}
-
+
/**
* count of items
*/
int count() const {
return fAllocator.count();
}
-
+
/**
* is the count 0
*/
bool empty() const { return fAllocator.empty(); }
-
+
/**
* access last item, only call if count() != 0
*/
@@ -213,11 +213,11 @@
/**
* access item by index.
- */
+ */
T& operator[] (int i) {
return *(T*)(fAllocator[i]);
}
-
+
/**
* access item by index.
*/
diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index 1187a08..fe56ded 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -216,7 +216,7 @@
}
void acquireMask(GrContext* context,
- const SkClipStack& clip,
+ const SkClipStack& clip,
const GrTextureDesc& desc,
const GrIRect& bound) {
@@ -237,11 +237,11 @@
}
SkClipStack fLastClip;
- // The mask's width & height values are used in setupDrawStateAAClip to
+ // The mask's width & height values are used in setupDrawStateAAClip to
// correctly scale the uvs for geometry drawn with this mask
GrAutoScratchTexture fLastMask;
- // fLastBound stores the bounding box of the clip mask in canvas
- // space. The left and top fields are used to offset the uvs for
+ // fLastBound stores the bounding box of the clip mask in canvas
+ // space. The left and top fields are used to offset the uvs for
// geometry drawn with this mask (in setupDrawStateAAClip)
GrIRect fLastBound;
};
@@ -253,9 +253,9 @@
};
/**
- * The clip mask creator handles the generation of the clip mask. If anti
- * aliasing is requested it will (in the future) generate a single channel
- * (8bit) mask. If no anti aliasing is requested it will generate a 1-bit
+ * The clip mask creator handles the generation of the clip mask. If anti
+ * aliasing is requested it will (in the future) generate a single channel
+ * (8bit) mask. If no anti aliasing is requested it will generate a 1-bit
* mask in the stencil buffer. In the non anti-aliasing case, if the clip
* mask can be represented as a rectangle then scissoring is used. In all
* cases scissoring is used to bound the range of the clip mask.
@@ -299,7 +299,7 @@
return fAACache.getContext();
}
- void setGpu(GrGpu* gpu) {
+ void setGpu(GrGpu* gpu) {
fGpu = gpu;
}
@@ -330,7 +330,7 @@
kStencil_ClipMaskType,
kAlpha_ClipMaskType,
} fCurrClipMaskType;
-
+
GrClipMaskCache fAACache; // cache for the AA path
bool createStencilClipMask(const GrClipData& clipDataIn,
@@ -356,7 +356,7 @@
void getTemp(const GrIRect& bounds, GrAutoScratchTexture* temp);
- void setupCache(const SkClipStack& clip,
+ void setupCache(const SkClipStack& clip,
const GrIRect& bounds);
/**
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index cc68aed..1db2e4a 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -24,7 +24,7 @@
class GrDrawState : public GrRefCnt {
public:
SK_DECLARE_INST_COUNT(GrDrawState)
-
+
/**
* Number of texture stages. Each stage takes as input a color and
* 2D texture coordinates. The color input to the first enabled stage is the
@@ -40,8 +40,8 @@
* or not.
*
* Stages 0 through GrPaint::kTotalStages-1 are reserved for setting up
- * the draw (i.e., textures and filter masks). Stages GrPaint::kTotalStages
- * through kNumStages-1 are earmarked for use by GrTextContext and
+ * the draw (i.e., textures and filter masks). Stages GrPaint::kTotalStages
+ * through kNumStages-1 are earmarked for use by GrTextContext and
* GrPathRenderer-derived classes.
*/
enum {
@@ -49,13 +49,13 @@
kMaxTexCoords = kNumStages
};
- GrDrawState()
+ GrDrawState()
: fRenderTarget(NULL) {
this->reset();
}
- GrDrawState(const GrDrawState& state)
+ GrDrawState(const GrDrawState& state)
: fRenderTarget(NULL) {
*this = state;
@@ -70,7 +70,7 @@
* Resets to the default state.
* Sampler states *will* be modified: textures or CustomStage objects
* will be released.
- */
+ */
void reset() {
this->disableStages();
@@ -147,7 +147,7 @@
////
/**
- * Sets a constant fractional coverage to be applied to the draw. The
+ * Sets a constant fractional coverage to be applied to the draw. The
* initial value (after construction or reset()) is 0xff. The constant
* coverage is ignored when per-vertex coverage is provided.
*/
@@ -280,22 +280,22 @@
/**
* A common pattern is to compute a color with the initial stages and then
* modulate that color by a coverage value in later stage(s) (AA, mask-
- * filters, glyph mask, etc). Color-filters, xfermodes, etc should be
- * computed based on the pre-coverage-modulated color. The division of
- * stages between color-computing and coverage-computing is specified by
+ * filters, glyph mask, etc). Color-filters, xfermodes, etc should be
+ * computed based on the pre-coverage-modulated color. The division of
+ * stages between color-computing and coverage-computing is specified by
* this method. Initially this is kNumStages (all stages
* are color-computing).
*/
void setFirstCoverageStage(int firstCoverageStage) {
GrAssert((unsigned)firstCoverageStage <= kNumStages);
- fFirstCoverageStage = firstCoverageStage;
+ fFirstCoverageStage = firstCoverageStage;
}
/**
* Gets the index of the first coverage-computing stage.
*/
int getFirstCoverageStage() const {
- return fFirstCoverageStage;
+ return fFirstCoverageStage;
}
///@}
@@ -495,7 +495,7 @@
*
* @param target The render target to set.
*/
- void setRenderTarget(GrRenderTarget* target) {
+ void setRenderTarget(GrRenderTarget* target) {
GrSafeAssign(fRenderTarget, target);
}
@@ -607,7 +607,7 @@
/* 1-pixel wide line
2D implicit line eq (a*x + b*y +c = 0). 4th component unused */
kHairLine_EdgeType,
- /* Quadratic specified by u^2-v canonical coords (only 2
+ /* Quadratic specified by u^2-v canonical coords (only 2
components used). Coverage based on signed distance with negative
being inside, positive outside. Edge specified in window space
(y-down) */
@@ -623,7 +623,7 @@
};
/**
- * Determines the interpretation per-vertex edge data when the
+ * Determines the interpretation per-vertex edge data when the
* kEdge_VertexLayoutBit is set (see GrDrawTarget). When per-vertex edges
* are not specified the value of this setting has no effect.
*/
@@ -753,7 +753,7 @@
* @return the current draw face(s).
*/
DrawFace getDrawFace() const { return fDrawFace; }
-
+
/// @}
///////////////////////////////////////////////////////////////////////////
@@ -795,7 +795,7 @@
}
bool operator !=(const GrDrawState& s) const { return !(*this == s); }
- // Most stages are usually not used, so conditionals here
+ // Most stages are usually not used, so conditionals here
// reduce the expected number of bytes touched by 50%.
GrDrawState& operator =(const GrDrawState& s) {
memcpy(this->podStart(), s.podStart(), this->podSize());
@@ -843,7 +843,7 @@
GrColor fPodStartMarker;
};
GrColor fColorFilterColor;
- DrawFace fDrawFace;
+ DrawFace fDrawFace;
VertexEdgeType fVertexEdgeType;
GrStencilSettings fStencilSettings;
union {
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index 5b90480..a567699 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -26,7 +26,7 @@
* generate the new masks. (We attempted to force the compiler to generate the
* masks using recursive templates but always wound up with static initializers
* under gcc, even if they were just a series of immediate->memory moves.)
- *
+ *
*/
void gen_mask_arrays(GrVertexLayout* stageTexCoordMasks,
GrVertexLayout* texCoordMasks) {
@@ -44,14 +44,14 @@
}
}
-/**
+/**
* Run this function to generate the code that declares the global masks.
*/
void gen_globals() {
GrVertexLayout stageTexCoordMasks[GrDrawState::kNumStages];
GrVertexLayout texCoordMasks[GrDrawState::kMaxTexCoords];
gen_mask_arrays(stageTexCoordMasks, texCoordMasks);
-
+
GrPrintf("const GrVertexLayout gStageTexCoordMasks[] = {\n");
for (int s = 0; s < GrDrawState::kNumStages; ++s) {
GrPrintf(" 0x%x,\n", stageTexCoordMasks[s]);
@@ -136,7 +136,7 @@
/**
* Functions for computing offsets of various components from the layout
* bitfield.
- *
+ *
* Order of vertex components:
* Position
* Tex Coord 0
@@ -529,7 +529,7 @@
GrAssert(NULL != indices);
this->releasePreviousIndexSource();
geoSrc.fIndexSrc = kNone_GeometrySrcType;
-
+
acquired = this->onReserveIndexSpace(indexCount, indices);
}
if (acquired) {
@@ -539,7 +539,7 @@
*indices = NULL;
}
return acquired;
-
+
}
bool GrDrawTarget::StageUsesTexCoords(GrVertexLayout layout, int stage) {
@@ -695,7 +695,7 @@
void GrDrawTarget::popGeometrySource() {
// if popping last element then pops are unbalanced with pushes
GrAssert(fGeoSrcStateStack.count() > 1);
-
+
this->geometrySourceWillPop(fGeoSrcStateStack.fromBack(1));
this->releasePreviousVertexSource();
this->releasePreviousIndexSource();
@@ -902,7 +902,7 @@
// stenciling is enabled. Having color writes disabled is effectively
// (0,1). The same applies when coverage is known to be 0.
if ((kZero_GrBlendCoeff == *srcCoeff && dstCoeffIsOne) ||
- (!(layout & kCoverage_VertexLayoutBit) &&
+ (!(layout & kCoverage_VertexLayoutBit) &&
0 == drawState.getCoverage())) {
if (drawState.getStencil().doesWrite()) {
return kDisableBlend_BlendOptFlag |
@@ -915,7 +915,7 @@
// check for coverage due to constant coverage, per-vertex coverage,
// edge aa or coverage texture stage
bool hasCoverage = forceCoverage ||
- 0xffffffff != drawState.getCoverage() ||
+ 0xffffffff != drawState.getCoverage() ||
(layout & kCoverage_VertexLayoutBit) ||
(layout & kEdge_VertexLayoutBit);
for (int s = drawState.getFirstCoverageStage();
@@ -959,7 +959,7 @@
} else if (srcAIsOne) {
// the dst coeff is effectively zero so blend works out to:
// cS + (c)(0)D + (1-c)D = cS + (1-c)D.
- // If Sa is 1 then we can replace Sa with c
+ // If Sa is 1 then we can replace Sa with c
// and set dst coeff to 1-Sa.
*dstCoeff = kISA_GrBlendCoeff;
return kCoverageAsAlpha_BlendOptFlag;
@@ -1026,7 +1026,7 @@
////////////////////////////////////////////////////////////////////////////////
-void GrDrawTarget::drawRect(const GrRect& rect,
+void GrDrawTarget::drawRect(const GrRect& rect,
const GrMatrix* matrix,
const GrRect* srcRects[],
const GrMatrix* srcMatrices[]) {
@@ -1038,7 +1038,7 @@
return;
}
- SetRectVertices(rect, matrix, srcRects,
+ SetRectVertices(rect, matrix, srcRects,
srcMatrices, layout, geo.vertices());
drawNonIndexed(kTriangleFan_GrPrimitiveType, 0, 4);
@@ -1061,10 +1061,10 @@
}
void GrDrawTarget::SetRectVertices(const GrRect& rect,
- const GrMatrix* matrix,
- const GrRect* srcRects[],
+ const GrMatrix* matrix,
+ const GrRect* srcRects[],
const GrMatrix* srcMatrices[],
- GrVertexLayout layout,
+ GrVertexLayout layout,
void* vertices) {
#if GR_DEBUG
// check that the layout and srcRects agree
@@ -1189,7 +1189,7 @@
fTarget = NULL;
this->set(target, vertexLayout, vertexCount, indexCount);
}
-
+
GrDrawTarget::AutoReleaseGeometry::AutoReleaseGeometry() {
fTarget = NULL;
}
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index 030b092..5f241a6 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -114,7 +114,7 @@
* 1. The caller intends to somehow specify coverage. This can be
* specified either by enabling a coverage stage on the GrDrawState or
* via the vertex layout.
- * 2. Other than enabling coverage stages, the current configuration of
+ * 2. Other than enabling coverage stages, the current configuration of
* the target's GrDrawState is as it will be at draw time.
* 3. If a vertex source has not yet been specified then all stages with
* non-NULL textures will be referenced by the vertex layout.
@@ -131,7 +131,7 @@
bool canTweakAlphaForCoverage() const;
/**
- * Given the current draw state and hw support, will HW AA lines be used
+ * Given the current draw state and hw support, will HW AA lines be used
* (if line primitive type is drawn)? If a vertex source has not yet been
* specified then the function assumes that all stages with non-NULL
* textures will be referenced by the vertex layout.
@@ -143,7 +143,7 @@
* Flags that indicate the layout of vertex data. Vertices always contain
* positions and may also contain up to GrDrawState::kMaxTexCoords sets
* of 2D texture coordinates, per-vertex colors, and per-vertex coverage.
- * Each stage can
+ * Each stage can
* use any of the texture coordinates as its input texture coordinates or it
* may use the positions as texture coordinates.
*
@@ -154,8 +154,8 @@
* example StageTexCoordVertexLayoutBit(0, 2) and
* StagePosAsTexCoordVertexLayoutBit(0) cannot both be specified.
*
- * The order in memory is always (position, texture coord 0, ..., color,
- * coverage) with any unused fields omitted. Note that this means that if
+ * The order in memory is always (position, texture coord 0, ..., color,
+ * coverage) with any unused fields omitted. Note that this means that if
* only texture coordinates 1 is referenced then there is no texture
* coordinates 0 and the order would be (position, texture coordinate 1
* [, color][, coverage]).
@@ -238,7 +238,7 @@
* that the draw target make room for some amount of vertex and/or index
* data. The target provides ptrs to hold the vertex and/or index data.
*
- * The data is writable up until the next drawIndexed, drawNonIndexed,
+ * The data is writable up until the next drawIndexed, drawNonIndexed,
* drawIndexedInstances, or pushGeometrySource. At this point the data is
* frozen and the ptrs are no longer valid.
*
@@ -247,7 +247,7 @@
*
* 3. Vertex and Index Buffers. This is most useful for geometry that will
* is long-lived. When the data in the buffer is consumed depends on the
- * GrDrawTarget subclass. For deferred subclasses the caller has to
+ * GrDrawTarget subclass. For deferred subclasses the caller has to
* guarantee that the data is still available in the buffers at playback.
* (TODO: Make this more automatic as we have done for read/write pixels)
*/
@@ -255,7 +255,7 @@
/**
* Reserves space for vertices and/or indices. Zero can be specifed as
* either the vertex or index count if the caller desires to only reserve
- * space for only indices or only vertices. If zero is specifed for
+ * space for only indices or only vertices. If zero is specifed for
* vertexCount then the vertex source will be unmodified and likewise for
* indexCount.
*
@@ -276,7 +276,7 @@
* 0.
* @param indexCount the number of indices to reserve space for. Can be 0.
* @param vertices will point to reserved vertex space if vertexCount is
- * non-zero. Illegal to pass NULL if vertexCount > 0.
+ * non-zero. Illegal to pass NULL if vertexCount > 0.
* @param indices will point to reserved index space if indexCount is
* non-zero. Illegal to pass NULL if indexCount > 0.
*/
@@ -352,7 +352,7 @@
* before indexed draw call.
*/
void setIndexSourceToBuffer(const GrIndexBuffer* buffer);
-
+
/**
* Resets vertex source. Drawing from reset vertices is illegal. Set vertex
* source to reserved, array, or buffer before next draw. May be able to free
@@ -360,7 +360,7 @@
* reserveVertexSpace.
*/
void resetVertexSource();
-
+
/**
* Resets index source. Indexed Drawing from reset indices is illegal. Set
* index source to reserved, array, or buffer before next indexed draw. May
@@ -368,7 +368,7 @@
* or reserveIndexSpace.
*/
void resetIndexSource();
-
+
/**
* Query to find out if the vertex or index source is reserved.
*/
@@ -497,11 +497,11 @@
}
/**
- * Clear the current render target if one isn't passed in. Ignores the
- * clip and all other draw state (blend mode, stages, etc). Clears the
+ * Clear the current render target if one isn't passed in. Ignores the
+ * clip and all other draw state (blend mode, stages, etc). Clears the
* whole thing if rect is NULL, otherwise just the rect.
*/
- virtual void clear(const GrIRect* rect,
+ virtual void clear(const GrIRect* rect,
GrColor color,
GrRenderTarget* renderTarget = NULL) = 0;
@@ -534,7 +534,7 @@
* // Therefore, rt is set on the GrDrawState
* // that will be restored after asr's
* // destructor rather than target's current
- * // GrDrawState.
+ * // GrDrawState.
*/
class AutoStateRestore : ::GrNoncopyable {
public:
@@ -573,7 +573,7 @@
////////////////////////////////////////////////////////////////////////////
- /**
+ /**
* Sets the view matrix to I and preconcats all stage matrices enabled in
* mask by the view inverse. Destructor undoes these changes.
*/
@@ -622,7 +622,7 @@
private:
void reset();
-
+
GrDrawTarget* fTarget;
void* fVertices;
void* fIndices;
@@ -644,9 +644,9 @@
GrDrawTarget* fTarget;
const GrClipData* fClip;
};
-
+
////////////////////////////////////////////////////////////////////////////
-
+
class AutoGeometryPush : ::GrNoncopyable {
public:
AutoGeometryPush(GrDrawTarget* target) {
@@ -906,7 +906,7 @@
kArray_GeometrySrcType, //<! src was set using set*SourceToArray
kBuffer_GeometrySrcType //<! src was set using set*SourceToBuffer
};
-
+
struct GeometrySrcState {
GeometrySrcType fVertexSrc;
union {
@@ -915,7 +915,7 @@
// valid if src type is reserved or array
int fVertexCount;
};
-
+
GeometrySrcType fIndexSrc;
union {
// valid if src type is buffer
@@ -923,7 +923,7 @@
// valid if src type is reserved or array
int fIndexCount;
};
-
+
GrVertexLayout fVertexLayout;
};
@@ -952,7 +952,7 @@
virtual void willReserveVertexAndIndexSpace(GrVertexLayout vertexLayout,
int vertexCount,
int indexCount) {}
-
+
// implemented by subclass to allocate space for reserved geom
virtual bool onReserveVertexSpace(GrVertexLayout vertexLayout,
@@ -1021,7 +1021,7 @@
Caps fCaps;
// subclasses must call this in their destructors to ensure all vertex
- // and index sources have been released (including those held by
+ // and index sources have been released (including those held by
// pushGeometrySource())
void releaseGeometry();
@@ -1031,7 +1031,7 @@
int vertexCount,
void** vertices);
bool reserveIndexSpace(int indexCount, void** indices);
-
+
// called by drawIndexed and drawNonIndexed. Use a negative indexCount to
// indicate non-indexed drawing.
bool checkDraw(GrPrimitiveType type, int startVertex,
@@ -1040,11 +1040,11 @@
// called when setting a new vert/idx source to unref prev vb/ib
void releasePreviousVertexSource();
void releasePreviousIndexSource();
-
+
enum {
kPreallocGeoSrcStateStackCnt = 4,
};
- SkSTArray<kPreallocGeoSrcStateStackCnt,
+ SkSTArray<kPreallocGeoSrcStateStackCnt,
GeometrySrcState, true> fGeoSrcStateStack;
typedef GrRefCnt INHERITED;
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index 923f711..f38b819 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -147,7 +147,7 @@
const void* srcData, size_t rowBytes) {
this->handleDirtyContext();
GrTexture* tex = this->onCreateTexture(desc, srcData, rowBytes);
- if (NULL != tex &&
+ if (NULL != tex &&
(kRenderTarget_GrTextureFlagBit & desc.fFlags) &&
!(kNoStencil_GrTextureFlagBit & desc.fFlags)) {
GrAssert(NULL != tex->asRenderTarget());
@@ -162,7 +162,7 @@
bool GrGpu::attachStencilBufferToRenderTarget(GrRenderTarget* rt) {
GrAssert(NULL == rt->getStencilBuffer());
- GrStencilBuffer* sb =
+ GrStencilBuffer* sb =
this->getContext()->findStencilBuffer(rt->width(),
rt->height(),
rt->numSamples());
@@ -233,11 +233,11 @@
return this->onCreatePath(path);
}
-void GrGpu::clear(const GrIRect* rect,
- GrColor color,
+void GrGpu::clear(const GrIRect* rect,
+ GrColor color,
GrRenderTarget* renderTarget) {
GrRenderTarget* oldRT = NULL;
- if (NULL != renderTarget &&
+ if (NULL != renderTarget &&
renderTarget != this->drawState()->getRenderTarget()) {
oldRT = this->drawState()->getRenderTarget();
this->drawState()->setRenderTarget(renderTarget);
@@ -489,12 +489,12 @@
int vertexCount,
void** vertices) {
GeometryPoolState& geomPoolState = fGeomPoolStateStack.back();
-
+
GrAssert(vertexCount > 0);
GrAssert(NULL != vertices);
-
+
this->prepareVertexPool();
-
+
*vertices = fVertexPool->makeSpace(vertexLayout,
vertexCount,
&geomPoolState.fPoolVertexBuffer,
@@ -508,7 +508,7 @@
bool GrGpu::onReserveIndexSpace(int indexCount, void** indices) {
GeometryPoolState& geomPoolState = fGeomPoolStateStack.back();
-
+
GrAssert(indexCount > 0);
GrAssert(NULL != indices);
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h
index f502dba2..d700de5 100644
--- a/src/gpu/GrGpu.h
+++ b/src/gpu/GrGpu.h
@@ -57,7 +57,7 @@
// The GrContext sets itself as the owner of this Gpu object
void setContext(GrContext* context) {
- GrAssert(NULL == fContext);
+ GrAssert(NULL == fContext);
fContext = context;
fClipMaskManager.setContext(context);
}
@@ -197,7 +197,7 @@
* However, the caller (GrContext) may have transformations to apply and can
* simply fold in the y-flip for free. On the other hand, the subclass may
* be able to do it for free itself. For example, the subclass may have to
- * do memcpys to handle rowBytes that aren't tight. It could do the y-flip
+ * do memcpys to handle rowBytes that aren't tight. It could do the y-flip
* concurrently.
*
* This function returns true if a y-flip is required to put the pixels in
@@ -290,7 +290,7 @@
void removeResource(GrResource* resource);
// GrDrawTarget overrides
- virtual void clear(const GrIRect* rect,
+ virtual void clear(const GrIRect* rect,
GrColor color,
GrRenderTarget* renderTarget = NULL) SK_OVERRIDE;
@@ -321,7 +321,7 @@
* Can the provided configuration act as a color render target?
*/
bool isConfigRenderable(GrPixelConfig config) const {
- GrAssert(kGrPixelConfigCount > config);
+ GrAssert(kGrPixelConfigCount > config);
return fConfigRenderSupport[config];
}
@@ -406,12 +406,12 @@
struct GeometryPoolState {
const GrVertexBuffer* fPoolVertexBuffer;
int fPoolStartVertex;
-
+
const GrIndexBuffer* fPoolIndexBuffer;
int fPoolStartIndex;
};
- const GeometryPoolState& getGeomPoolState() {
- return fGeomPoolStateStack.back();
+ const GeometryPoolState& getGeomPoolState() {
+ return fGeomPoolStateStack.back();
}
// The state of the scissor is controlled by the clip manager
@@ -453,7 +453,7 @@
// assumed 3D context state and dirty any state cache.
virtual void onResetContext() = 0;
-
+
// overridden by API-specific derived class to create objects.
virtual GrTexture* onCreateTexture(const GrTextureDesc& desc,
const void* srcData,
@@ -466,7 +466,7 @@
bool dynamic) = 0;
virtual GrPath* onCreatePath(const SkPath& path) = 0;
- // overridden by API-specific derivated class to perform the clear and
+ // overridden by API-specific derivated class to perform the clear and
// clearRect. NULL rect means clear whole target.
virtual void onClear(const GrIRect* rect, GrColor color) = 0;
@@ -522,7 +522,7 @@
// Should attach the SB to the RT. Returns false if compatible sb could
// not be created.
virtual bool createStencilBufferForRenderTarget(GrRenderTarget* rt,
- int width,
+ int width,
int height) = 0;
// attaches an existing SB to an existing RT.
@@ -540,23 +540,23 @@
private:
GrContext* fContext; // not reffed (context refs gpu)
-
+
ResetTimestamp fResetTimestamp;
GrVertexBufferAllocPool* fVertexPool;
GrIndexBufferAllocPool* fIndexPool;
-
+
// counts number of uses of vertex/index pool in the geometry stack
int fVertexPoolUseCnt;
int fIndexPoolUseCnt;
-
+
enum {
kPreallocGeomPoolStateStackCnt = 4,
};
SkSTArray<kPreallocGeomPoolStateStackCnt,
GeometryPoolState, true> fGeomPoolStateStack;
-
+
mutable GrIndexBuffer* fQuadIndexBuffer; // mutable so it can be
// created on-demand
diff --git a/src/gpu/GrGpuVertex.h b/src/gpu/GrGpuVertex.h
index d093e2d..570a77c 100644
--- a/src/gpu/GrGpuVertex.h
+++ b/src/gpu/GrGpuVertex.h
@@ -15,7 +15,7 @@
#include "GrPoint.h"
#if GR_TEXT_SCALAR_IS_USHORT
- typedef uint16_t GrTextScalar;
+ typedef uint16_t GrTextScalar;
#define GrIntToTextScalar(x) ((uint16_t)x)
#define GrFixedToTextScalar(x) (x)
#elif GR_TEXT_SCALAR_IS_FIXED
@@ -23,7 +23,7 @@
#define GrIntToTextScalar(x) GrIntToFixed(x)
#define GrFixedToTextScalar(x) (x)
#elif GR_TEXT_SCALAR_IS_FLOAT
- typedef float GrTextScalar;
+ typedef float GrTextScalar;
#define GrIntToTextScalar(x) ((GrTextScalar)x)
#define GrFixedToTextScalar(x) GrFixedToFloat(x)
#else
@@ -45,12 +45,12 @@
fX = GrIntToTextScalar(x);
fY = GrIntToTextScalar(y);
}
-
+
void setX(GrFixed x, GrFixed y) {
fX = GrFixedToTextScalar(x);
fY = GrFixedToTextScalar(y);
}
-
+
// rect fan is counter-clockwise
void setRectFan(GrTextScalar l, GrTextScalar t, GrTextScalar r,
diff --git a/src/gpu/GrPathRenderer.h b/src/gpu/GrPathRenderer.h
index de7f253..5cbaab1 100644
--- a/src/gpu/GrPathRenderer.h
+++ b/src/gpu/GrPathRenderer.h
@@ -22,7 +22,7 @@
/**
* Base class for drawing paths into a GrDrawTarget.
*
- * Derived classes can use stages GrPaint::kTotalStages through
+ * Derived classes can use stages GrPaint::kTotalStages through
* GrDrawState::kNumStages-1. The stages before GrPaint::kTotalStages
* are reserved for setting up the draw (i.e., textures and filter masks).
*/
@@ -75,7 +75,7 @@
/**
* Returns true if this path renderer is able to render the path.
- * Returning false allows the caller to fallback to another path renderer
+ * Returning false allows the caller to fallback to another path renderer
* This function is called when searching for a path renderer capable of
* rendering a path.
*
@@ -92,7 +92,7 @@
bool antiAlias) const = 0;
/**
* Draws the path into the draw target. If requiresStencilBuffer returned
- * false then the target may be setup for stencil rendering (since the
+ * false then the target may be setup for stencil rendering (since the
* path renderer didn't claim that it needs to use the stencil internally).
*
* @param path the path to draw.
diff --git a/src/gpu/GrPathUtils.cpp b/src/gpu/GrPathUtils.cpp
index 2d4abe0..e0ddea8 100644
--- a/src/gpu/GrPathUtils.cpp
+++ b/src/gpu/GrPathUtils.cpp
@@ -201,13 +201,13 @@
// We invert the control pt matrix and post concat to both sides to get M.
UVpts.setAll(0, GR_ScalarHalf, GR_Scalar1,
0, 0, GR_Scalar1,
- SkScalarToPersp(GR_Scalar1),
- SkScalarToPersp(GR_Scalar1),
+ SkScalarToPersp(GR_Scalar1),
+ SkScalarToPersp(GR_Scalar1),
SkScalarToPersp(GR_Scalar1));
m.setAll(qPts[0].fX, qPts[1].fX, qPts[2].fX,
qPts[0].fY, qPts[1].fY, qPts[2].fY,
- SkScalarToPersp(GR_Scalar1),
- SkScalarToPersp(GR_Scalar1),
+ SkScalarToPersp(GR_Scalar1),
+ SkScalarToPersp(GR_Scalar1),
SkScalarToPersp(GR_Scalar1));
if (!m.invert(&m)) {
// The quad is degenerate. Hopefully this is rare. Find the pts that are
@@ -348,7 +348,7 @@
// When the ab and cd tangents are nearly parallel with vector from d to a the constraint that
// the quad point falls between the tangents becomes hard to enforce and we are likely to hit
// the max subdivision count. However, in this case the cubic is approaching a line and the
- // accuracy of the quad point isn't so important. We check if the two middle cubic control
+ // accuracy of the quad point isn't so important. We check if the two middle cubic control
// points are very close to the baseline vector. If so then we just pick quadratic points on the
// control polygon.
diff --git a/src/gpu/GrPlotMgr.h b/src/gpu/GrPlotMgr.h
index 38589f3..6dd7114 100644
--- a/src/gpu/GrPlotMgr.h
+++ b/src/gpu/GrPlotMgr.h
@@ -32,7 +32,7 @@
delete[] fBusy;
}
}
-
+
void reset() {
Gr_bzero(fBusy, fDim.fX * fDim.fY);
}
diff --git a/src/gpu/GrRectanizer.cpp b/src/gpu/GrRectanizer.cpp
index 8df3b05..87ea92e 100644
--- a/src/gpu/GrRectanizer.cpp
+++ b/src/gpu/GrRectanizer.cpp
@@ -38,7 +38,7 @@
struct Row {
GrIPoint16 fLoc;
int fRowHeight;
-
+
bool canAddWidth(int width, int containerWidth) const {
return fLoc.fX + width <= containerWidth;
}
diff --git a/src/gpu/GrSWMaskHelper.h b/src/gpu/GrSWMaskHelper.h
index 44b15e2..c780769 100644
--- a/src/gpu/GrSWMaskHelper.h
+++ b/src/gpu/GrSWMaskHelper.h
@@ -39,22 +39,22 @@
*/
class GrSWMaskHelper : public GrNoncopyable {
public:
- GrSWMaskHelper(GrContext* context)
+ GrSWMaskHelper(GrContext* context)
: fContext(context) {
}
// set up the internal state in preparation for draws. Since many masks
- // may be accumulated in the helper during creation, "resultBounds"
- // allows the caller to specify the region of interest - to limit the
+ // may be accumulated in the helper during creation, "resultBounds"
+ // allows the caller to specify the region of interest - to limit the
// amount of work.
bool init(const GrIRect& resultBounds, const GrMatrix* matrix);
// Draw a single rect into the accumulation bitmap using the specified op
- void draw(const GrRect& rect, SkRegion::Op op,
+ void draw(const GrRect& rect, SkRegion::Op op,
bool antiAlias, uint8_t alpha);
// Draw a single path into the accumuation bitmap using the specified op
- void draw(const SkPath& path, SkRegion::Op op,
+ void draw(const SkPath& path, SkRegion::Op op,
GrPathFill fill, bool antiAlias, uint8_t alpha);
// Helper function to get a scratch texture suitable for capturing the
@@ -80,14 +80,14 @@
GrMatrix* matrix);
// This utility routine is used to add a path's mask to some other draw.
- // The ClipMaskManager uses it to accumulate clip masks while the
+ // The ClipMaskManager uses it to accumulate clip masks while the
// GrSoftwarePathRenderer uses it to fulfill a drawPath call.
- // It draws with "texture" as a path mask into "target" using "rect" as
+ // It draws with "texture" as a path mask into "target" using "rect" as
// geometry and the current drawState. The current drawState is altered to
// accommodate the mask.
- // Note that this method assumes that the GrPaint::kTotalStages slot in
+ // Note that this method assumes that the GrPaint::kTotalStages slot in
// the draw state can be used to hold the mask texture stage.
- // This method is really only intended to be used with the
+ // This method is really only intended to be used with the
// output of DrawPathMaskToTexture.
static void DrawToTargetWithPathMask(GrTexture* texture,
GrDrawTarget* target,
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 16b859f..edac161 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -19,7 +19,7 @@
// TODO: We could allow the SW path to also handle non-AA paths but
// this would mean that GrDefaultPathRenderer would never be called
// (since it appears after the SW renderer in the path renderer
- // chain). Some testing would need to be done r.e. performance
+ // chain). Some testing would need to be done r.e. performance
// and consistency of the resulting images before removing
// the "!antiAlias" clause from the above test
return false;
@@ -32,7 +32,7 @@
////////////////////////////////////////////////////////////////////////////////
// gets device coord bounds of path (not considering the fill) and clip. The
-// path bounds will be a subset of the clip bounds. returns false if
+// path bounds will be a subset of the clip bounds. returns false if
// path bounds would be empty.
bool get_path_and_clip_bounds(const GrDrawTarget* target,
const SkPath& path,
@@ -48,7 +48,7 @@
target->getClip()->getConservativeBounds(rt, devClipBounds);
- // TODO: getConservativeBounds already intersects with the
+ // TODO: getConservativeBounds already intersects with the
// render target's bounding box. Remove this next line
if (!devPathBounds->intersect(*devClipBounds)) {
return false;
@@ -81,22 +81,22 @@
}
GrRect rect;
if (devClipBounds.fTop < devPathBounds.fTop) {
- rect.iset(devClipBounds.fLeft, devClipBounds.fTop,
+ rect.iset(devClipBounds.fLeft, devClipBounds.fTop,
devClipBounds.fRight, devPathBounds.fTop);
target->drawSimpleRect(rect, NULL);
}
if (devClipBounds.fLeft < devPathBounds.fLeft) {
- rect.iset(devClipBounds.fLeft, devPathBounds.fTop,
+ rect.iset(devClipBounds.fLeft, devPathBounds.fTop,
devPathBounds.fLeft, devPathBounds.fBottom);
target->drawSimpleRect(rect, NULL);
}
if (devClipBounds.fRight > devPathBounds.fRight) {
- rect.iset(devPathBounds.fRight, devPathBounds.fTop,
+ rect.iset(devPathBounds.fRight, devPathBounds.fTop,
devClipBounds.fRight, devPathBounds.fBottom);
target->drawSimpleRect(rect, NULL);
}
if (devClipBounds.fBottom > devPathBounds.fBottom) {
- rect.iset(devClipBounds.fLeft, devPathBounds.fBottom,
+ rect.iset(devClipBounds.fLeft, devPathBounds.fBottom,
devClipBounds.fRight, devClipBounds.fBottom);
target->drawSimpleRect(rect, NULL);
}
@@ -133,8 +133,8 @@
}
SkAutoTUnref<GrTexture> texture(
- GrSWMaskHelper::DrawPathMaskToTexture(fContext, path,
- devPathBounds, fill,
+ GrSWMaskHelper::DrawPathMaskToTexture(fContext, path,
+ devPathBounds, fill,
antiAlias, &vm));
if (NULL == texture) {
return false;
diff --git a/src/gpu/GrSoftwarePathRenderer.h b/src/gpu/GrSoftwarePathRenderer.h
index 6e18b59..7884cbb 100644
--- a/src/gpu/GrSoftwarePathRenderer.h
+++ b/src/gpu/GrSoftwarePathRenderer.h
@@ -20,7 +20,7 @@
*/
class GrSoftwarePathRenderer : public GrPathRenderer {
public:
- GrSoftwarePathRenderer(GrContext* context)
+ GrSoftwarePathRenderer(GrContext* context)
: fContext(context) {
}
@@ -34,7 +34,7 @@
const GrVec* translate,
GrDrawTarget* target,
bool antiAlias) SK_OVERRIDE;
-
+
private:
GrContext* fContext;
diff --git a/src/gpu/GrStencil.h b/src/gpu/GrStencil.h
index b4aa70e..1af98e6 100644
--- a/src/gpu/GrStencil.h
+++ b/src/gpu/GrStencil.h
@@ -274,7 +274,7 @@
fFlags |= writes ? kDoesWrite_StencilFlag : kDoesNotWrite_StencilFlag;
return writes;
}
-
+
void invalidate() {
// write an illegal value to the first member
fPassOps[0] = (GrStencilOp)(uint8_t)-1;
@@ -284,18 +284,18 @@
bool operator == (const GrStencilSettings& s) const {
static const size_t gCompareSize = sizeof(GrStencilSettings) -
sizeof(fFlags);
- GrAssert((const char*)&fFlags + sizeof(fFlags) ==
+ GrAssert((const char*)&fFlags + sizeof(fFlags) ==
(const char*)this + sizeof(GrStencilSettings));
if (this->isDisabled() & s.isDisabled()) { // using & not &&
return true;
}
return 0 == memcmp(this, &s, gCompareSize);
}
-
+
bool operator != (const GrStencilSettings& s) const {
return !(*this == s);
}
-
+
GrStencilSettings& operator =(const GrStencilSettings& s) {
memcpy(this, &s, sizeof(GrStencilSettings));
return *this;
@@ -305,7 +305,7 @@
friend class GrClipMaskManager;
enum {
- kMaxStencilClipPasses = 2 // maximum number of passes to add a clip
+ kMaxStencilClipPasses = 2 // maximum number of passes to add a clip
// element to the stencil buffer.
};
@@ -316,15 +316,15 @@
* needs to be drawn to the client portion of the stencil first.
* 2. How many passes are needed.
* 3. What those passes are.
- * 4. The fill rule that should actually be used to render (will
+ * 4. The fill rule that should actually be used to render (will
* always be non-inverted).
*
- * @param op the set op to combine this element with the
+ * @param op the set op to combine this element with the
* existing clip
* @param stencilClipMask mask with just the stencil bit used for clipping
* enabled.
* @param invertedFill is this path inverted
- * @param numPasses out: the number of passes needed to add the
+ * @param numPasses out: the number of passes needed to add the
* element to the clip.
* @param settings out: the stencil settings to use for each pass
*
@@ -332,7 +332,7 @@
* stencil clip bit. Will only be true if canBeDirect is true.
* numPasses will be 1 if return value is true.
*/
- static bool GetClipPasses(SkRegion::Op op,
+ static bool GetClipPasses(SkRegion::Op op,
bool canBeDirect,
unsigned int stencilClipMask,
bool invertedFill,
diff --git a/src/gpu/GrStencilBuffer.cpp b/src/gpu/GrStencilBuffer.cpp
index 7f733f4..bf14f48 100644
--- a/src/gpu/GrStencilBuffer.cpp
+++ b/src/gpu/GrStencilBuffer.cpp
@@ -62,7 +62,7 @@
namespace {
// we should never have more than one stencil buffer with same combo of
// (width,height,samplecount)
-void gen_stencil_key_values(int width,
+void gen_stencil_key_values(int width,
int height,
int sampleCnt,
GrCacheID* cacheID) {
@@ -77,8 +77,8 @@
}
}
-GrResourceKey GrStencilBuffer::ComputeKey(int width,
- int height,
+GrResourceKey GrStencilBuffer::ComputeKey(int width,
+ int height,
int sampleCnt) {
GrCacheID id(GrStencilBuffer::GetResourceType());
gen_stencil_key_values(width, height, sampleCnt, &id);
diff --git a/src/gpu/GrTBSearch.h b/src/gpu/GrTBSearch.h
index 2697f37..1d77c95 100644
--- a/src/gpu/GrTBSearch.h
+++ b/src/gpu/GrTBSearch.h
@@ -18,7 +18,7 @@
// we should insert it at 0
return ~0;
}
-
+
int high = count - 1;
int low = 0;
while (high > low) {
@@ -29,12 +29,12 @@
high = index;
}
}
-
+
// check if we found it
if (EQ(array[high], target)) {
return high;
}
-
+
// now return the ~ of where we should insert it
if (LT(array[high], target)) {
high += 1;
diff --git a/src/gpu/GrTDArray.h b/src/gpu/GrTDArray.h
index 731001a..0e5b6bb 100644
--- a/src/gpu/GrTDArray.h
+++ b/src/gpu/GrTDArray.h
@@ -72,7 +72,7 @@
T* begin() const { return fArray; }
T* end() const { return fArray + fCount; }
- T* back() const { GrAssert(fCount); return fArray + (fCount - 1); }
+ T* back() const { GrAssert(fCount); return fArray + (fCount - 1); }
T* prepend() {
this->growAt(0);
diff --git a/src/gpu/GrTLList.h b/src/gpu/GrTLList.h
index ea310ac..e875118 100644
--- a/src/gpu/GrTLList.h
+++ b/src/gpu/GrTLList.h
@@ -30,7 +30,7 @@
T* head() const { return fHead; }
T* tail() const { return fTail; }
-
+
void addToHead(T*);
void addToTail(T*);
void removeFromList(T*);
diff --git a/src/gpu/GrTemplates.h b/src/gpu/GrTemplates.h
index 4378d70..69720dc 100644
--- a/src/gpu/GrTemplates.h
+++ b/src/gpu/GrTemplates.h
@@ -40,20 +40,20 @@
template <typename T> class GrAutoTRestore : public GrNoncopyable {
public:
GrAutoTRestore() : fPtr(NULL), fVal() {}
-
+
GrAutoTRestore(T* ptr) {
fPtr = ptr;
if (NULL != ptr) {
fVal = *ptr;
}
}
-
+
~GrAutoTRestore() {
if (NULL != fPtr) {
*fPtr = fVal;
}
}
-
+
// restores previously saved value (if any) and saves value for passed T*
void reset(T* ptr) {
if (NULL != fPtr) {
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index 23b16dd..edd92db 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -111,10 +111,10 @@
/*
We need to call preConcatMatrix with our viewmatrix's inverse, for each
- texture and mask in the paint. However, computing the inverse can be
+ texture and mask in the paint. However, computing the inverse can be
expensive, and its possible we may not have any textures or masks, so these
two loops are written such that we only compute the inverse (once) if we
- need it. We do this on our copy of the paint rather than directly on the
+ need it. We do this on our copy of the paint rather than directly on the
draw target because we re-provide the paint to the context when we have
to flush our glyphs or draw a glyph as a path midstream.
*/
@@ -142,7 +142,7 @@
fVertices = NULL;
fMaxVertices = 0;
- fVertexLayout =
+ fVertexLayout =
GrDrawTarget::kTextFormat_VertexLayoutBit |
GrDrawTarget::StageTexCoordVertexLayoutBit(kGlyphMaskStage, 0);
}
@@ -272,7 +272,7 @@
fMaxVertices = maxQuadVertices;
}
bool success = fDrawTarget->reserveVertexAndIndexSpace(
- fVertexLayout,
+ fVertexLayout,
fMaxVertices,
0,
GrTCast<void**>(&fVertices),
diff --git a/src/gpu/GrTextStrike_impl.h b/src/gpu/GrTextStrike_impl.h
index 1b6392c..a3f37b3 100644
--- a/src/gpu/GrTextStrike_impl.h
+++ b/src/gpu/GrTextStrike_impl.h
@@ -16,16 +16,16 @@
Key(GrFontScaler* scaler) {
fFontScalerKey = scaler->getKey();
}
-
+
uint32_t getHash() const { return fFontScalerKey->getHash(); }
-
+
static bool LT(const GrTextStrike& strike, const Key& key) {
return *strike.getFontScalerKey() < *key.fFontScalerKey;
}
static bool EQ(const GrTextStrike& strike, const Key& key) {
return *strike.getFontScalerKey() == *key.fFontScalerKey;
}
-
+
private:
const GrKey* fFontScalerKey;
};
@@ -50,7 +50,7 @@
GrTextStrike* GrFontCache::getStrike(GrFontScaler* scaler) {
this->validate();
-
+
Key key(scaler);
GrTextStrike* strike = fCache.find(key);
if (NULL == strike) {
@@ -79,16 +79,16 @@
class GrTextStrike::Key {
public:
Key(GrGlyph::PackedID id) : fPackedID(id) {}
-
+
uint32_t getHash() const { return fPackedID; }
-
+
static bool LT(const GrGlyph& glyph, const Key& key) {
return glyph.fPackedID < key.fPackedID;
}
static bool EQ(const GrGlyph& glyph, const Key& key) {
return glyph.fPackedID == key.fPackedID;
}
-
+
private:
GrGlyph::PackedID fPackedID;
};
diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index 182c90e..ce6109b 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -17,7 +17,7 @@
SK_DEFINE_INST_COUNT(GrTexture)
GR_DEFINE_RESOURCE_CACHE_TYPE(GrTexture)
-/**
+/**
* This method allows us to interrupt the normal deletion process and place
* textures back in the texture cache when their ref count goes to zero.
*/
@@ -31,7 +31,7 @@
nonConstThis->resetFlag((GrTextureFlags) kReturnToCache_FlagBit);
nonConstThis->INHERITED::getContext()->addExistingTextureToCache(nonConstThis);
- // Note: "this" texture might be freed inside addExistingTextureToCache
+ // Note: "this" texture might be freed inside addExistingTextureToCache
// if it is purged.
return;
}
@@ -117,7 +117,7 @@
enum TextureBits {
/*
* The kNPOT bit is set when the texture is NPOT and is being repeated
- * but the hardware doesn't support that feature.
+ * but the hardware doesn't support that feature.
*/
kNPOT_TextureBit = 0x1,
/*
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index f7e5152..5566086 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -59,7 +59,7 @@
// all the blur tests.
#define BLUR_SIGMA_SCALE 0.6f
// This constant represents the screen alignment criterion in texels for
-// requiring texture domain clamping to prevent color bleeding when drawing
+// requiring texture domain clamping to prevent color bleeding when drawing
// a sub region of a larger source image.
#define COLOR_BLEED_TOLERANCE SkFloatToScalar(0.001f)
@@ -84,7 +84,7 @@
SkAutoCachedTexture()
: fDevice(NULL)
, fTexture(NULL) {
- }
+ }
SkAutoCachedTexture(SkGpuDevice* device,
const SkBitmap& bitmap,
@@ -118,7 +118,7 @@
}
return result;
}
-
+
private:
SkGpuDevice* fDevice;
GrTexture* fTexture;
@@ -199,7 +199,7 @@
// if this RT is also a texture, hold a ref on it
fTexture = fRenderTarget->asTexture();
SkSafeRef(fTexture);
-
+
// Create a pixel ref for the underlying SkBitmap. We prefer a texture pixel
// ref to a render target pixel reft. The pixel ref may get ref'ed outside
// the device via accessBitmap. This external ref may outlive the device.
@@ -267,7 +267,7 @@
}
// The SkGpuDevice gives the context the render target (e.g., in gainFocus)
- // This call gives the context a chance to relinquish it
+ // This call gives the context a chance to relinquish it
fContext->setRenderTarget(NULL);
SkSafeUnref(fTexture);
@@ -599,7 +599,7 @@
constantColor,
&textures[kColorFilterTextureIdx],
grPaint);
- } else if (!skPaint2GrPaintNoShader(dev, skPaint, true, false,
+ } else if (!skPaint2GrPaintNoShader(dev, skPaint, true, false,
&textures[kColorFilterTextureIdx], grPaint)) {
return false;
}
@@ -1120,7 +1120,7 @@
if (!drawWithGPUMaskFilter(fContext, *devPathPtr, paint.getMaskFilter(),
*draw.fMatrix, *draw.fClip, draw.fBounder,
&grPaint, pathFillType)) {
- SkPaint::Style style = doFill ? SkPaint::kFill_Style :
+ SkPaint::Style style = doFill ? SkPaint::kFill_Style :
SkPaint::kStroke_Style;
drawWithMaskFilter(fContext, *devPathPtr, paint.getMaskFilter(),
*draw.fMatrix, *draw.fClip, draw.fBounder,
@@ -1371,7 +1371,7 @@
// detect pixel disalignment
if (SkScalarAbs(SkScalarRoundToScalar(transformedRect.left()) -
transformedRect.left()) < COLOR_BLEED_TOLERANCE &&
- SkScalarAbs(SkScalarRoundToScalar(transformedRect.top()) -
+ SkScalarAbs(SkScalarRoundToScalar(transformedRect.top()) -
transformedRect.top()) < COLOR_BLEED_TOLERANCE &&
SkScalarAbs(transformedRect.width() - srcRect.width()) <
COLOR_BLEED_TOLERANCE &&
@@ -1387,7 +1387,7 @@
// Only gets called if hasAlignedSamples returned false.
// So we can assume that sampling is axis aligned but not texel aligned.
GrAssert(!hasAlignedSamples(srcRect, transformedRect));
- SkRect innerSrcRect(srcRect), innerTransformedRect,
+ SkRect innerSrcRect(srcRect), innerTransformedRect,
outerTransformedRect(transformedRect);
innerSrcRect.inset(SK_ScalarHalf, SK_ScalarHalf);
m.mapRect(&innerTransformedRect, innerSrcRect);
@@ -1453,7 +1453,7 @@
SkFloatToScalar(srcRect.fRight * wInv),
SkFloatToScalar(srcRect.fBottom * hInv));
- bool needsTextureDomain = false;
+ bool needsTextureDomain = false;
if (sampler->textureParams()->isBilerp()) {
// Need texture domain if drawing a sub rect.
needsTextureDomain = srcRect.width() < bitmap.width() || srcRect.height() < bitmap.height();
@@ -1464,7 +1464,7 @@
SkMatrix srcToDeviceMatrix(m);
srcToDeviceMatrix.postConcat(*draw.fMatrix);
srcToDeviceMatrix.mapRect(&transformedRect, floatSrcRect);
-
+
if (hasAlignedSamples(floatSrcRect, transformedRect)) {
// Samples are texel-aligned, so filtering is futile
sampler->textureParams()->setBilerp(false);
@@ -1474,7 +1474,7 @@
mayColorBleed(floatSrcRect, transformedRect, m);
}
}
- }
+ }
GrRect textureDomain = GrRect::MakeEmpty();
@@ -1495,7 +1495,7 @@
} else {
top = bottom = GrScalarHalf(paintRect.top() + paintRect.bottom());
}
- textureDomain.setLTRB(left, top, right, bottom);
+ textureDomain.setLTRB(left, top, right, bottom);
sampler->setCustomStage(SkNEW_ARGS(GrTextureDomainEffect,
(texture,
textureDomain)))->unref();
@@ -1589,7 +1589,7 @@
filteredTexture->unref();
}
}
-
+
fContext->drawRectToRect(grPaint,
GrRect::MakeXYWH(GrIntToScalar(left),
GrIntToScalar(top),
@@ -1633,7 +1633,7 @@
filteredTexture->unref();
}
}
-
+
const SkBitmap& bm = dev->accessBitmap(false);
int w = bm.width();
int h = bm.height();
@@ -1682,7 +1682,7 @@
SkAutoCachedTexture act(this, src, sampler->textureParams(), &texture);
result->setConfig(src.config(), src.width(), src.height());
- GrRect rect = GrRect::MakeWH(SkIntToScalar(src.width()),
+ GrRect rect = GrRect::MakeWH(SkIntToScalar(src.width()),
SkIntToScalar(src.height()));
GrTexture* resultTexture = filter_texture(fContext, texture, filter, rect);
if (resultTexture) {
diff --git a/src/gpu/gl/GrGLPath.h b/src/gpu/gl/GrGLPath.h
index f9febb4..dfe3405 100644
--- a/src/gpu/gl/GrGLPath.h
+++ b/src/gpu/gl/GrGLPath.h
@@ -26,7 +26,7 @@
GrGLPath(GrGpuGL* gpu, const SkPath& path);
virtual ~GrGLPath();
GrGLuint pathID() const { return fPathID; }
- // TODO: Figure out how to get an approximate size of the path in Gpu
+ // TODO: Figure out how to get an approximate size of the path in Gpu
// memory.
virtual size_t sizeInBytes() const SK_OVERRIDE { return 100; }
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index 989b7c6..b755f75 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -127,17 +127,17 @@
/**
Smear alpha across all four channels. This is incompatible with
- kSwapRAndB, kMulRGBByAlpha* and kSmearRed. It is prefereable
- to perform the smear outside the shader using
- GL_ARB_texture_swizzle if possible rather than setting this
+ kSwapRAndB, kMulRGBByAlpha* and kSmearRed. It is prefereable
+ to perform the smear outside the shader using
+ GL_ARB_texture_swizzle if possible rather than setting this
flag.
*/
kSmearAlpha_InConfigFlag = 0x02,
/**
- Smear the red channel across all four channels. This flag is
- incompatible with kSwapRAndB, kMulRGBByAlpha*and kSmearAlpha.
- It is preferable to use GL_ARB_texture_swizzle instead of this
+ Smear the red channel across all four channels. This flag is
+ incompatible with kSwapRAndB, kMulRGBByAlpha*and kSmearAlpha.
+ It is preferable to use GL_ARB_texture_swizzle instead of this
flag.
*/
kSmearRed_InConfigFlag = 0x04,
diff --git a/src/gpu/gl/GrGLTexture.h b/src/gpu/gl/GrGLTexture.h
index 1095d53..2e9ee17 100644
--- a/src/gpu/gl/GrGLTexture.h
+++ b/src/gpu/gl/GrGLTexture.h
@@ -83,7 +83,7 @@
virtual void invalidateCachedState() SK_OVERRIDE { fTexParams.invalidate(); }
- // these functions
+ // these functions
const TexParams& getCachedTexParams(GrGpu::ResetTimestamp* timestamp) const {
*timestamp = fTexParamsTimestamp;
return fTexParams;
diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index ae19b2e..2cfdd0d 100644
--- a/src/gpu/gl/GrGpuGL.h
+++ b/src/gpu/gl/GrGpuGL.h
@@ -27,7 +27,7 @@
GrGpuGL(const GrGLContextInfo& ctxInfo);
virtual ~GrGpuGL();
- const GrGLInterface* glInterface() const {
+ const GrGLInterface* glInterface() const {
return fGLContextInfo.interface();
}
GrGLBinding glBinding() const { return fGLContextInfo.binding(); }
@@ -84,9 +84,9 @@
virtual void onForceRenderTargetFlush() SK_OVERRIDE;
virtual bool onReadPixels(GrRenderTarget* target,
- int left, int top,
+ int left, int top,
int width, int height,
- GrPixelConfig,
+ GrPixelConfig,
void* buffer,
size_t rowBytes,
bool invertY) SK_OVERRIDE;
diff --git a/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp b/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
index 4b55a5d..ef8eccc 100644
--- a/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
+++ b/src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp
@@ -25,7 +25,7 @@
const GrGLInterface* GrGLCreateNativeInterface() {
// wglGetProcAddress requires a context.
// GL Function pointers retrieved in one context may not be valid in another
- // context. For that reason we create a new GrGLInterface each time we're
+ // context. For that reason we create a new GrGLInterface each time we're
// called.
if (NULL != wglGetCurrentContext()) {
const char* versionString = (const char*) glGetString(GL_VERSION);
@@ -118,7 +118,7 @@
GR_GL_GET_PROC(GetQueryiv);
GR_GL_GET_PROC(GetQueryObjectiv);
GR_GL_GET_PROC(GetQueryObjectuiv);
- if (glVer > GR_GL_VER(3,3) ||
+ if (glVer > GR_GL_VER(3,3) ||
GrGLHasExtensionFromString("GL_ARB_timer_query", extString)) {
GR_GL_GET_PROC(GetQueryObjecti64v);
GR_GL_GET_PROC(GetQueryObjectui64v);
@@ -166,7 +166,7 @@
// First look for GL3.0 FBO or GL_ARB_framebuffer_object (same since
// GL_ARB_framebuffer_object doesn't use ARB suffix.)
- if (glVer > GR_GL_VER(3,0) ||
+ if (glVer > GR_GL_VER(3,0) ||
GrGLHasExtensionFromString("GL_ARB_framebuffer_object", extString)) {
GR_GL_GET_PROC(GenFramebuffers);
GR_GL_GET_PROC(GetFramebufferAttachmentParameteriv);
diff --git a/src/gpu/gl/win/SkNativeGLContext_win.cpp b/src/gpu/gl/win/SkNativeGLContext_win.cpp
index 9650bc1..0082920 100644
--- a/src/gpu/gl/win/SkNativeGLContext_win.cpp
+++ b/src/gpu/gl/win/SkNativeGLContext_win.cpp
@@ -84,7 +84,7 @@
this->destroyGLContext();
return NULL;
}
-
+
PIXELFORMATDESCRIPTOR pfd;
ZeroMemory(&pfd, sizeof(pfd));
pfd.nSize = sizeof(pfd);
@@ -95,20 +95,20 @@
pfd.cDepthBits = 0;
pfd.cStencilBits = 0;
pfd.iLayerType = PFD_MAIN_PLANE;
-
+
int pixelFormat = 0;
if (!(pixelFormat = ChoosePixelFormat(fDeviceContext, &pfd))) {
SkDebugf("No matching pixel format descriptor.\n");
this->destroyGLContext();
return NULL;
}
-
+
if (!SetPixelFormat(fDeviceContext, pixelFormat, &pfd)) {
SkDebugf("Could not set the pixel format %d.\n", pixelFormat);
this->destroyGLContext();
return NULL;
}
-
+
if (!(fGlRenderContext = wglCreateContext(fDeviceContext))) {
SkDebugf("Could not create rendering context.\n");
this->destroyGLContext();
diff --git a/src/gpu/gr_unittests.cpp b/src/gpu/gr_unittests.cpp
index 4d11721..a0f0c18 100644
--- a/src/gpu/gr_unittests.cpp
+++ b/src/gpu/gr_unittests.cpp
@@ -101,7 +101,7 @@
GrTBinHashKey<BogusEntry, kDataLenUsedForKey> keyB;
keyB.setKeyData(testStringB);
GrAssert(keyA.compare(keyB) < 0);
- GrAssert(keyA.getHash() != keyB.getHash());
+ GrAssert(keyA.getHash() != keyB.getHash());
}
diff --git a/src/gpu/ios/GrGLDefaultInterface_iOS.cpp b/src/gpu/ios/GrGLDefaultInterface_iOS.cpp
index 19d7ae0..ae43d98 100644
--- a/src/gpu/ios/GrGLDefaultInterface_iOS.cpp
+++ b/src/gpu/ios/GrGLDefaultInterface_iOS.cpp
@@ -123,18 +123,18 @@
interface->fDeleteRenderbuffers = glDeleteRenderbuffers;
interface->fFramebufferRenderbuffer = glFramebufferRenderbuffer;
interface->fBindRenderbuffer = glBindRenderbuffer;
-
+
#if GL_OES_mapbuffer
interface->fMapBuffer = glMapBufferOES;
interface->fUnmapBuffer = glUnmapBufferOES;
#endif
-
+
#if GL_APPLE_framebuffer_multisample
interface->fRenderbufferStorageMultisample = glRenderbufferStorageMultisampleAPPLE;
interface->fResolveMultisampleFramebuffer = glResolveMultisampleFramebufferAPPLE;
#endif
interface->fBindFragDataLocationIndexed = NULL;
-
+
interface->fBindingsExported = kES2_GrGLBinding;
}
glInterface.get()->ref();