AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Housekeeper-Nightly

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@13181 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2014-01-25 07:01:49 +00:00
parent 709ca75f03
commit d2ac07b64b
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/core/SkBitmap.h
View File

@ -257,7 +257,7 @@ public:
* On failure, the bitmap will be set to empty and return false.
*/
bool allocPixels(const SkImageInfo&, SkPixelRefFactory*, SkColorTable*);
/**
* Allocate a pixelref to match the specified image info, using the default
* allocator.
@ -267,7 +267,7 @@ public:
bool allocPixels(const SkImageInfo& info) {
return this->allocPixels(info, NULL, NULL);
}
/**
* Install a pixelref that wraps the specified pixels and rowBytes, and
* optional ReleaseProc and context. When the pixels are no longer
@ -278,7 +278,7 @@ public:
bool installPixels(const SkImageInfo&, void* pixels, size_t rowBytes,
void (*ReleaseProc)(void* addr, void* context),
void* context);
/**
* If the bitmap's config can be represented as SkImageInfo, return true,
* and if info is not-null, set it to the bitmap's info. If it cannot be

4
include/gpu/GrTextContext.h
View File

@ -55,7 +55,7 @@ private:
class ManagedTextContext : public TextContextClass {
public:
~ManagedTextContext() {}
ManagedTextContext(GrContext* context,
const GrPaint& grPaint,
const SkPaint& skPaint,
@ -77,7 +77,7 @@ private:
GrTTextContextManager<TextContextClass>* fManager;
};
public:
GrTTextContextManager() {
fAllocation = sk_malloc_throw(sizeof(ManagedTextContext));

4
src/core/SkBitmap.cpp
View File

@ -488,7 +488,7 @@ void SkBitmap::setPixels(void* p, SkColorTable* ctable) {
bool SkBitmap::allocPixels(Allocator* allocator, SkColorTable* ctable) {
HeapAllocator stdalloc;
if (NULL == allocator) {
allocator = &stdalloc;
}
@ -515,7 +515,7 @@ bool SkBitmap::allocPixels(const SkImageInfo& info, SkPixelRefFactory* factory,
if (NULL == factory) {
factory = &defaultFactory;
}
SkPixelRef* pr = factory->create(info, ctable);
if (NULL == pr) {
return reset_return_false(this);

1
src/core/SkMallocPixelRef.cpp
View File

@ -245,4 +245,3 @@ SkPixelRef* SkMallocPixelRef::PRFactory::create(const SkImageInfo& info,
SkColorTable* ctable) {
return SkMallocPixelRef::NewAllocate(info, info.minRowBytes(), ctable);
}

6
src/gpu/SkGpuDevice.cpp
View File

@ -291,7 +291,7 @@ SkGpuDevice::~SkGpuDevice() {
if (fDrawProcs) {
delete fDrawProcs;
}
delete fTextContextManager;
// The GrContext takes a ref on the target. We don't want to cause the render
@ -1880,11 +1880,11 @@ void SkGpuDevice::drawPosText(const SkDraw& draw, const void* text,
SkAutoTDelete<GrTextContext> context(fTextContextManager->create(fContext, grPaint, paint));
GrDistanceFieldTextContext* dfContext =
static_cast<GrDistanceFieldTextContext*>(context.get());
SkAutoGlyphCache autoCache(dfContext->getSkPaint(), &this->fLeakyProperties, NULL);
SkGlyphCache* cache = autoCache.getCache();
GrFontScaler* fontScaler = get_gr_font_scaler(cache);
dfContext->drawPosText((const char *)text, byteLength, pos, constY, scalarsPerPos,
cache, fontScaler);
#endif