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@12232 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-11-12 07:02:05 +00:00
parent 50a7600d05
commit 11a253b686
6 changed files with 1873 additions and 1874 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/SkDraw.cpp
View File

@ -1749,7 +1749,7 @@ void SkDraw::drawText(const char text[], size_t byteLength,
// transform our starting point // transform our starting point
#if SK_DISTANCEFIELD_FONTS #if SK_DISTANCEFIELD_FONTS
if (!(procFlags & SkDrawProcs::kSkipBakedGlyphTransform_Flag)) if (!(procFlags & SkDrawProcs::kSkipBakedGlyphTransform_Flag))
#endif #endif
{ {
SkPoint loc; SkPoint loc;

4
src/gpu/GrDistanceFieldTextContext.cpp
View File

@ -23,7 +23,7 @@ SK_CONF_DECLARE(bool, c_DumpFontCache, "gpu.dumpFontCache", false,
"Dump the contents of the font cache before every purge."); "Dump the contents of the font cache before every purge.");
GrDistanceFieldTextContext::GrDistanceFieldTextContext(GrContext* context, GrDistanceFieldTextContext::GrDistanceFieldTextContext(GrContext* context,
const GrPaint& paint, const GrPaint& paint,
SkColor color, SkColor color,
SkScalar textRatio) SkScalar textRatio)
@ -137,7 +137,7 @@ void GrDistanceFieldTextContext::drawPackedGlyph(GrGlyph::PackedID packed,
// not valid, need to find a different solution for this // not valid, need to find a different solution for this
vx += SkIntToFixed(glyph->fBounds.fLeft); vx += SkIntToFixed(glyph->fBounds.fLeft);
vy += SkIntToFixed(glyph->fBounds.fTop); vy += SkIntToFixed(glyph->fBounds.fTop);
// keep them as ints until we've done the clip-test // keep them as ints until we've done the clip-test
GrFixed width = glyph->fBounds.width(); GrFixed width = glyph->fBounds.width();
GrFixed height = glyph->fBounds.height(); GrFixed height = glyph->fBounds.height();

17
src/gpu/GrTextStrike.cpp
View File

@ -361,12 +361,12 @@ bool GrTextStrike::getGlyphAtlas(GrGlyph* glyph, GrFontScaler* scaler) {
for (int i = 0; i < dfWidth*dfHeight; ++i) { for (int i = 0; i < dfWidth*dfHeight; ++i) {
unsigned char val; unsigned char val;
double outerval = outerDist[i]; double outerval = outerDist[i];
if (outerval < 0.0) { if (outerval < 0.0) {
outerval = 0.0; outerval = 0.0;
} }
double innerval = innerDist[i]; double innerval = innerDist[i];
if (innerval < 0.0) { if (innerval < 0.0) {
innerval = 0.0; innerval = 0.0;
} }
double dist = outerval - innerval; double dist = outerval - innerval;
if (dist <= -DISTANCE_FIELD_RANGE) { if (dist <= -DISTANCE_FIELD_RANGE) {
@ -378,9 +378,9 @@ bool GrTextStrike::getGlyphAtlas(GrGlyph* glyph, GrFontScaler* scaler) {
} }
*dfPtr++ = val; *dfPtr++ = val;
} }
// copy to atlas // copy to atlas
plot = fAtlasMgr->addToAtlas(&fAtlas, dfWidth, dfHeight, dfStorage.get(), plot = fAtlasMgr->addToAtlas(&fAtlas, dfWidth, dfHeight, dfStorage.get(),
&glyph->fAtlasLocation); &glyph->fAtlasLocation);
} else { } else {
@ -394,8 +394,8 @@ bool GrTextStrike::getGlyphAtlas(GrGlyph* glyph, GrFontScaler* scaler) {
return false; return false;
} }
plot = fAtlasMgr->addToAtlas(&fAtlas, glyph->width(), plot = fAtlasMgr->addToAtlas(&fAtlas, glyph->width(),
glyph->height(), storage.get(), glyph->height(), storage.get(),
&glyph->fAtlasLocation); &glyph->fAtlasLocation);
#if SK_DISTANCEFIELD_FONTS #if SK_DISTANCEFIELD_FONTS
} }
@ -408,4 +408,3 @@ bool GrTextStrike::getGlyphAtlas(GrGlyph* glyph, GrFontScaler* scaler) {
glyph->fPlot = plot; glyph->fPlot = plot;
return true; return true;
} }

3718
src/gpu/SkGpuDevice.cpp
View File

File diff suppressed because it is too large Load Diff

4
src/gpu/effects/GrDistanceFieldTextureEffect.cpp
View File

@ -14,7 +14,7 @@
#include "GrTexture.h" #include "GrTexture.h"
// The distance field is constructed as unsigned char values, so that the zero value is at 128. // The distance field is constructed as unsigned char values, so that the zero value is at 128.
// Hence our zero threshold is 128/255. // Hence our zero threshold is 128/255.
#define THRESHOLD "0.50196078431" #define THRESHOLD "0.50196078431"
class GrGLDistanceFieldTextureEffect : public GrGLVertexEffect { class GrGLDistanceFieldTextureEffect : public GrGLVertexEffect {
@ -47,7 +47,7 @@ public:
kVec2f_GrSLType); kVec2f_GrSLType);
builder->fsCodeAppend(";\n"); builder->fsCodeAppend(";\n");
builder->fsCodeAppend("\tfloat distance = texColor.r;\n"); builder->fsCodeAppend("\tfloat distance = texColor.r;\n");
// this gives us a smooth step across approximately one fragment // this gives us a smooth step across approximately one fragment
// (assuming a radius of the diagonal of the fragment, hence a factor of sqrt(2)/2) // (assuming a radius of the diagonal of the fragment, hence a factor of sqrt(2)/2)
builder->fsCodeAppend("\tfloat afwidth = 0.7071*length(vec2(dFdx(distance), dFdy(distance)));\n"); builder->fsCodeAppend("\tfloat afwidth = 0.7071*length(vec2(dFdx(distance), dFdy(distance)));\n");
builder->fsCodeAppend("\tfloat val = smoothstep("THRESHOLD"-afwidth, "THRESHOLD"+afwidth, distance);\n"); builder->fsCodeAppend("\tfloat val = smoothstep("THRESHOLD"-afwidth, "THRESHOLD"+afwidth, distance);\n");

2
src/gpu/effects/GrDistanceFieldTextureEffect.h
View File

@ -14,7 +14,7 @@
class GrGLDistanceFieldTextureEffect; class GrGLDistanceFieldTextureEffect;
/** /**
* The output color of this effect is a modulation of the input color and a sample from a * The output color of this effect is a modulation of the input color and a sample from a
* distance field texture (using a smoothed step function near 0.5). * distance field texture (using a smoothed step function near 0.5).
* It allows explicit specification of the filtering and wrap modes (GrTextureParams). The input * It allows explicit specification of the filtering and wrap modes (GrTextureParams). The input
* coords are a custom attribute. * coords are a custom attribute.