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

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@8383 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-03-26 07:01:04 +00:00
parent 0e3f6212c7
commit e60ed08a35
9 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debugger/SkDrawCommand.cpp
View File

@ -498,7 +498,7 @@ void DrawTextC::execute(SkCanvas* canvas) {
}
DrawTextOnPath::DrawTextOnPath(const void* text, size_t byteLength,
const SkPath& path, const SkMatrix* matrix,
const SkPath& path, const SkMatrix* matrix,
const SkPaint& paint) {
fText = new char[byteLength];
memcpy(fText, text, byteLength);
@ -527,8 +527,8 @@ void DrawTextOnPath::execute(SkCanvas* canvas) {
}
DrawVertices::DrawVertices(SkCanvas::VertexMode vmode, int vertexCount,
const SkPoint vertices[], const SkPoint texs[],
const SkColor colors[], SkXfermode* xfermode,
const SkPoint vertices[], const SkPoint texs[],
const SkColor colors[], SkXfermode* xfermode,
const uint16_t indices[], int indexCount,
const SkPaint& paint) {
fVmode = vmode;

4
debugger/SkDrawCommand.h
View File

@ -407,8 +407,8 @@ private:
class DrawVertices : public SkDrawCommand {
public:
DrawVertices(SkCanvas::VertexMode vmode, int vertexCount,
const SkPoint vertices[], const SkPoint texs[],
const SkColor colors[], SkXfermode* xfermode,
const SkPoint vertices[], const SkPoint texs[],
const SkColor colors[], SkXfermode* xfermode,
const uint16_t indices[], int indexCount,
const SkPaint& paint);
virtual ~DrawVertices();

2
include/core/SkFontHost.h
View File

@ -92,7 +92,7 @@ public:
static LCDOrder GetSubpixelOrder();
private:
/**
* DEPRECATED -- will be DESTROYED
*

4
include/ports/SkFontMgr.h
View File

@ -79,11 +79,11 @@ protected:
virtual SkTypeface* onCreateFromData(SkData*, int ttcIndex) = 0;
virtual SkTypeface* onCreateFromStream(SkStream*, int ttcIndex) = 0;
virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) = 0;
private:
static SkFontMgr* Factory(); // implemented by porting layer
static SkMutex* Mutex(); // implemented by porting layer
typedef SkRefCnt INHERITED;
};

1
src/core/SkTypeface.cpp
View File

@ -198,4 +198,3 @@ size_t SkTypeface::onGetTableData(SkFontTableTag tag, size_t offset,
? SkFontStream::GetTableData(stream, ttcIndex, tag, offset, length, data)
: 0;
}

2
src/gpu/GrDrawTarget.cpp
View File

@ -690,7 +690,7 @@ void GrDrawTargetCaps::reset() {
fHWAALineSupport = false;
fShaderDerivativeSupport = false;
fGeometryShaderSupport = false;
fDualSourceBlendingSupport = false;
fDualSourceBlendingSupport = false;
fBufferLockSupport = false;
fPathStencilingSupport = false;

1
src/ports/SkFontHost_fontconfig.cpp
View File

@ -230,4 +230,3 @@ void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
desc->setFamilyName(this->getFamilyName());
*isLocalStream = SkToBool(this->getLocalStream());
}

6
src/ports/SkFontHost_mac.cpp
View File

@ -1853,17 +1853,17 @@ protected:
virtual SkFontStyleSet* onCreateStyleSet(int index) SK_OVERRIDE {
return NULL;
}
virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
const SkFontStyle&) SK_OVERRIDE {
return NULL;
}
virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
const SkFontStyle&) SK_OVERRIDE {
return NULL;
}
virtual SkTypeface* onCreateFromData(SkData* data,
int ttcIndex) SK_OVERRIDE {
AutoCFRelease<CGDataProviderRef> pr(SkCreateDataProviderFromData(data));

5
src/utils/mac/SkStream_mac.cpp
View File

@ -38,14 +38,14 @@ static void release_info_proc(void* info) {
CGDataProviderRef SkCreateDataProviderFromStream(SkStream* stream) {
stream->ref(); // unref will be called when the provider is deleted
const void* addr = stream->getMemoryBase();
if (addr) {
// special-case when the stream is just a block of ram
return CGDataProviderCreateWithData(stream, addr, stream->getLength(),
unref_proc);
}
CGDataProviderSequentialCallbacks rec;
sk_bzero(&rec, sizeof(rec));
rec.version = 0;
@ -65,4 +65,3 @@ CGDataProviderRef SkCreateDataProviderFromData(SkData* data) {
return CGDataProviderCreateWithData(data, data->data(), data->size(),
unref_proc);
}