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@10477 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-08-01 07:01:05 +00:00
parent 92ffe7d10e
commit 5d4b7733ae
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bench/GameBench.cpp
View File

@ -140,7 +140,7 @@ protected:
SkPaint p2; // for drawVertices path
p2.setColor(0xFF000000);
p2.setFilterBitmap(true);
p2.setShader(SkShader::CreateBitmapShader(fAtlas,
p2.setShader(SkShader::CreateBitmapShader(fAtlas,
SkShader::kClamp_TileMode,
SkShader::kClamp_TileMode))->unref();
@ -197,14 +197,14 @@ protected:
curCell = (curCell + 1) % (kNumAtlasedX*kNumAtlasedY);
if (fUseDrawVertices) {
SkPoint uvs[4] = {
SkPoint uvs[4] = {
{ SkIntToScalar(src.fLeft), SkIntToScalar(src.fBottom) },
{ SkIntToScalar(src.fLeft), SkIntToScalar(src.fTop) },
{ SkIntToScalar(src.fRight), SkIntToScalar(src.fTop) },
{ SkIntToScalar(src.fRight), SkIntToScalar(src.fBottom) },
};
canvas->drawVertices(SkCanvas::kTriangles_VertexMode,
4, verts, uvs, NULL, NULL,
4, verts, uvs, NULL, NULL,
indices, 6, p2);
} else {
canvas->drawBitmapRect(fAtlas, &src, dst, &p);

2
src/fonts/SkFontMgr_fontconfig.cpp
View File

@ -282,7 +282,7 @@ protected:
SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
return stream.get() ? this->createFromStream(stream, ttcIndex) : NULL;
}
virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
unsigned styleBits) SK_OVERRIDE {
return FontConfigTypeface::LegacyCreateTypeface(NULL, familyName,

2
src/ports/SkFontHost_fontconfig.cpp
View File

@ -211,5 +211,3 @@ void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
SkTypeface* FontConfigTypeface::onRefMatchingStyle(Style style) const {
return LegacyCreateTypeface(this, NULL, style);
}