Sanitizing source files in Skia_Periodic_House_Keeping (SkipBuildbotRuns)
git-svn-id: http://skia.googlecode.com/svn/trunk@8795 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
3d0b0500bd
commit
c9f3b38f67
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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[] = {
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -154,7 +154,7 @@ static void test_globaltable(skiatest::Reporter* reporter) {
|
||||
|
||||
SkAutoTUnref<SkDataTable> 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;
|
||||
|
Loading…
Reference in New Issue
Block a user