From c9f3b38f67893b22c3e02a6a934bc676e36c5cfc Mon Sep 17 00:00:00 2001 From: "rmistry@google.com" Date: Mon, 22 Apr 2013 12:45:30 +0000 Subject: [PATCH] Sanitizing source files in Skia_Periodic_House_Keeping (SkipBuildbotRuns) git-svn-id: http://skia.googlecode.com/svn/trunk@8795 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkDataTable.cpp | 7 +++---- src/gpu/GrContext.cpp | 2 +- src/gpu/GrInOrderDrawBuffer.cpp | 4 ++-- tests/DataRefTest.cpp | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/core/SkDataTable.cpp b/src/core/SkDataTable.cpp index e5dbd8472b..608d147024 100644 --- a/src/core/SkDataTable.cpp +++ b/src/core/SkDataTable.cpp @@ -27,7 +27,7 @@ SkDataTable::SkDataTable() { SkDataTable::SkDataTable(const void* array, size_t elemSize, int count, FreeProc proc, void* context) { SkASSERT(count > 0); - + fCount = count; fElemSize = elemSize; // non-zero signals we use fElems instead of fDir fU.fElems = (const char*)array; @@ -37,7 +37,7 @@ SkDataTable::SkDataTable(const void* array, size_t elemSize, int count, SkDataTable::SkDataTable(const Dir* dir, int count, FreeProc proc, void* ctx) { SkASSERT(count > 0); - + fCount = count; fElemSize = 0; // 0 signals that we use fDir instead of fElems fU.fDir = dir; @@ -169,7 +169,7 @@ SkDataTable* SkDataTable::NewCopyArrays(const void * const * ptrs, memcpy(elem, ptrs[i], sizes[i]); elem += sizes[i]; } - + return SkNEW_ARGS(SkDataTable, (dir, count, malloc_freeproc, buffer)); } @@ -248,4 +248,3 @@ SkDataTable* SkDataTableBuilder::detachDataTable() { fDir.reset(); return table; } - diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 2a6e20afea..ded4bc1d4c 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -880,7 +880,7 @@ namespace { extern const GrVertexAttrib gPosUVColorAttribs[] = { {kVec2f_GrVertexAttribType, 0, kPosition_GrVertexAttribBinding }, {kVec2f_GrVertexAttribType, sizeof(GrPoint), kLocalCoord_GrVertexAttribBinding }, - {kVec4ub_GrVertexAttribType, 2*sizeof(GrPoint), kColor_GrVertexAttribBinding} + {kVec4ub_GrVertexAttribType, 2*sizeof(GrPoint), kColor_GrVertexAttribBinding} }; extern const GrVertexAttrib gPosColorAttribs[] = { diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp index fae79c84c6..a0dce188a8 100644 --- a/src/gpu/GrInOrderDrawBuffer.cpp +++ b/src/gpu/GrInOrderDrawBuffer.cpp @@ -79,7 +79,7 @@ namespace { extern const GrVertexAttrib kRectPosColorUVAttribs[] = { {kVec2f_GrVertexAttribType, 0, kPosition_GrVertexAttribBinding}, {kVec4ub_GrVertexAttribType, sizeof(GrPoint), kColor_GrVertexAttribBinding}, - {kVec2f_GrVertexAttribType, sizeof(GrPoint)+sizeof(GrColor), + {kVec2f_GrVertexAttribType, sizeof(GrPoint)+sizeof(GrColor), kLocalCoord_GrVertexAttribBinding}, }; @@ -136,7 +136,7 @@ void GrInOrderDrawBuffer::onDrawRect(const GrRect& rect, // We set the draw state's color to white here. This is done so that any batching performed // in our subclass's onDraw() won't get a false from GrDrawState::op== due to a color // mismatch. TODO: Once vertex layout is owned by GrDrawState it should skip comparing the - // constant color in its op== when the kColor layout bit is set and then we can remove + // constant color in its op== when the kColor layout bit is set and then we can remove // this. acr.set(drawState, 0xFFFFFFFF); } diff --git a/tests/DataRefTest.cpp b/tests/DataRefTest.cpp index 63a620fd7e..0cbce3fcd1 100644 --- a/tests/DataRefTest.cpp +++ b/tests/DataRefTest.cpp @@ -154,7 +154,7 @@ static void test_globaltable(skiatest::Reporter* reporter) { SkAutoTUnref table(SkDataTable::NewArrayProc(gData, sizeof(gData[0]), count, NULL, NULL)); - + REPORTER_ASSERT(reporter, table->count() == count); for (int i = 0; i < count; ++i) { size_t size;