From f3dc199c0b18e35ac8de4075ecbede7a484f1b0d Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Thu, 1 Nov 2012 02:01:27 +0000 Subject: [PATCH] Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk@6228 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/gpu/SkGpuDevice.h | 4 ++-- src/gpu/GrResourceCache.cpp | 8 ++++---- src/gpu/GrResourceCache.h | 12 ++++++------ src/image/SkSurface_Gpu.cpp | 4 ++-- src/image/SkSurface_Picture.cpp | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h index 0a5f36e65b..1e78b4a2b9 100644 --- a/include/gpu/SkGpuDevice.h +++ b/include/gpu/SkGpuDevice.h @@ -29,8 +29,8 @@ class SK_API SkGpuDevice : public SkDevice { public: /** * New device that will create an offscreen renderTarget based on the - * config, width, height, and sampleCount. The device's storage will not - * count against the GrContext's texture cache budget. The device's pixels + * config, width, height, and sampleCount. The device's storage will not + * count against the GrContext's texture cache budget. The device's pixels * will be uninitialized. */ SkGpuDevice(GrContext*, SkBitmap::Config, int width, int height, int sampleCount = 0); diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp index 825b122bfa..a1f1d794e5 100644 --- a/src/gpu/GrResourceCache.cpp +++ b/src/gpu/GrResourceCache.cpp @@ -176,7 +176,7 @@ void GrResourceCache::attachToHead(GrResourceEntry* entry, // is relying on the texture. class GrTFindUnreffedFunctor { public: - bool operator()(const GrResourceEntry* entry) const { + bool operator()(const GrResourceEntry* entry) const { return 1 == entry->resource()->getRefCnt(); } }; @@ -213,7 +213,7 @@ bool GrResourceCache::hasKey(const GrResourceKey& key) const { return NULL != fCache.find(key); } -void GrResourceCache::addResource(const GrResourceKey& key, +void GrResourceCache::addResource(const GrResourceKey& key, GrResource* resource, uint32_t ownershipFlags) { GrAssert(NULL == resource->getCacheEntry()); @@ -275,8 +275,8 @@ void GrResourceCache::makeNonExclusive(GrResourceEntry* entry) { #endif if (entry->resource()->isValid()) { - // Since scratch textures still count against the cache budget even - // when they have been removed from the cache, re-adding them doesn't + // Since scratch textures still count against the cache budget even + // when they have been removed from the cache, re-adding them doesn't // alter the budget information. attachToHead(entry, kIgnore_BudgetBehavior); fCache.insert(entry->key(), entry); diff --git a/src/gpu/GrResourceCache.h b/src/gpu/GrResourceCache.h index 4ee7015d11..c56edf6a5d 100644 --- a/src/gpu/GrResourceCache.h +++ b/src/gpu/GrResourceCache.h @@ -230,7 +230,7 @@ public: /** * Search for an entry with the same Key. If found, return it. * If not found, return null. - * If ownershipFlags includes kNoOtherOwners and a resource is returned + * If ownershipFlags includes kNoOtherOwners and a resource is returned * then that resource has no other refs to it. * If ownershipFlags includes kHide and a resource is returned then that * resource will not be returned from future 'find' calls until it is @@ -238,21 +238,21 @@ public: * For a resource to be completely exclusive to a caller both kNoOtherOwners * and kHide must be specified. */ - GrResource* find(const GrResourceKey& key, + GrResource* find(const GrResourceKey& key, uint32_t ownershipFlags = 0); /** - * Add the new resource to the cache (by creating a new cache entry based - * on the provided key and resource). + * Add the new resource to the cache (by creating a new cache entry based + * on the provided key and resource). * * Ownership of the resource is transferred to the resource cache, * which will unref() it when it is purged or deleted. * * If ownershipFlags includes kHide, subsequent calls to 'find' will not - * return 'resource' until it is 'freed' (and recycled) or makeNonExclusive + * return 'resource' until it is 'freed' (and recycled) or makeNonExclusive * is called. */ - void addResource(const GrResourceKey& key, + void addResource(const GrResourceKey& key, GrResource* resource, uint32_t ownershipFlags = 0); diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp index 90d2e274d1..3c1842a464 100644 --- a/src/image/SkSurface_Gpu.cpp +++ b/src/image/SkSurface_Gpu.cpp @@ -97,7 +97,7 @@ void SkSurface_Gpu::onCopyOnWrite(SkImage* image, SkCanvas* canvas) { SkTextureImageSetTexture(image, NULL); return; } - + fDevice->context()->copyTexture(rt->asTexture(), tex->asRenderTarget()); SkTextureImageSetTexture(image, tex); @@ -135,7 +135,7 @@ SkSurface* SkSurface::NewRenderTarget(GrContext* ctx, const SkImage::Info& info, if (NULL == tex) { return NULL; } - + return SkNEW_ARGS(SkSurface_Gpu, (ctx, tex->asRenderTarget())); } diff --git a/src/image/SkSurface_Picture.cpp b/src/image/SkSurface_Picture.cpp index 3f82634b31..80fc1f45f6 100644 --- a/src/image/SkSurface_Picture.cpp +++ b/src/image/SkSurface_Picture.cpp @@ -77,7 +77,7 @@ void SkSurface_Picture::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, } void SkSurface_Picture::onCopyOnWrite(SkImage* cachedImage, SkCanvas*) { - // We always spawn a copy of the recording picture when we + // We always spawn a copy of the recording picture when we // are asked for a snapshot, so we never need to do anything here. } -- 2.34.1