From 0c23faf222c24529781139495a5f4f4ab61f7cb2 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Sun, 3 Mar 2013 07:16:29 +0000 Subject: [PATCH] Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk@7948 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkTypeface.cpp | 1 - src/gpu/GrContext.cpp | 2 +- src/gpu/effects/GrTextureDomainEffect.cpp | 10 +++++----- src/ports/SkFontHost_mac.cpp | 19 +++++++++---------- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp index e7004502bd..ce1892702c 100644 --- a/src/core/SkTypeface.cpp +++ b/src/core/SkTypeface.cpp @@ -151,4 +151,3 @@ void SkTypeface::onFilterRec(SkScalerContextRec*) const {} void SkTypeface::onGetFontDescriptor(SkFontDescriptor* desc) const { desc->setStyle(this->style()); } - diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 4722e68c9d..a3b26a615c 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -1669,7 +1669,7 @@ bool GrContext::writeRenderTargetPixels(GrRenderTarget* target, } // writeRenderTargetPixels can be called in the midst of drawing another - // object (e.g., when uploading a SW path rendering to the gpu while + // object (e.g., when uploading a SW path rendering to the gpu while // drawing a rect) so preserve the current geometry. GrDrawTarget::AutoGeometryAndStatePush agasp(fGpu, GrDrawTarget::kReset_ASRInit); GrDrawState* drawState = fGpu->drawState(); diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp index 5b1c72f77a..3c70951246 100644 --- a/src/gpu/effects/GrTextureDomainEffect.cpp +++ b/src/gpu/effects/GrTextureDomainEffect.cpp @@ -72,9 +72,9 @@ void GrGLTextureDomainEffect::emitCode(GrGLShaderBuilder* builder, GrAssert(GrTextureDomainEffect::kDecal_WrapMode == effect.wrapMode()); if (kImagination_GrGLVendor == builder->ctxInfo().vendor()) { - // On the NexusS and GalaxyNexus, the other path (with the 'any' - // call) causes the compilation error "Calls to any function that - // may require a gradient calculation inside a conditional block + // On the NexusS and GalaxyNexus, the other path (with the 'any' + // call) causes the compilation error "Calls to any function that + // may require a gradient calculation inside a conditional block // may return undefined results". This appears to be an issue with // the 'any' call since even the simple "result=black; if (any()) // result=white;" code fails to compile. @@ -83,9 +83,9 @@ void GrGLTextureDomainEffect::emitCode(GrGLShaderBuilder* builder, builder->appendTextureLookupAndModulate(&builder->fFSCode, inputColor, samplers[0], coords); builder->fFSCode.appendf(";\n"); - builder->fFSCode.appendf("\tfloat x = abs(2.0*(%s.x - %s.x)/(%s.z - %s.x) - 1.0);\n", + builder->fFSCode.appendf("\tfloat x = abs(2.0*(%s.x - %s.x)/(%s.z - %s.x) - 1.0);\n", coords, domain, domain, domain); - builder->fFSCode.appendf("\tfloat y = abs(2.0*(%s.y - %s.y)/(%s.w - %s.y) - 1.0);\n", + builder->fFSCode.appendf("\tfloat y = abs(2.0*(%s.y - %s.y)/(%s.w - %s.y) - 1.0);\n", coords, domain, domain, domain); builder->fFSCode.appendf("\tfloat blend = step(1.0, max(x, y));\n"); builder->fFSCode.appendf("\t%s = mix(inside, outside, blend);\n", outputColor); diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index f631995f05..83c811a684 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -1825,11 +1825,11 @@ SkScalerContext* SkTypeface_Mac::onCreateScalerContext(const SkDescriptor* desc) void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const { unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag | SkScalerContext::kAutohinting_Flag; - + rec->fFlags &= ~flagsWeDontSupport; - + bool lcdSupport = supports_LCD(); - + // Only two levels of hinting are supported. // kNo_Hinting means avoid CoreGraphics outline dilation. // kNormal_Hinting means CoreGraphics outline dilation is allowed. @@ -1841,18 +1841,18 @@ void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const { hinting = SkPaint::kNormal_Hinting; } rec->setHinting(hinting); - + // FIXME: lcd smoothed un-hinted rasterization unsupported. // Tracked by http://code.google.com/p/skia/issues/detail?id=915 . // There is no current means to honor a request for unhinted lcd, // so arbitrarilly ignore the hinting request and honor lcd. - + // Hinting and smoothing should be orthogonal, but currently they are not. // CoreGraphics has no API to influence hinting. However, its lcd smoothed // output is drawn from auto-dilated outlines (the amount of which is // determined by AppleFontSmoothing). Its regular anti-aliased output is // drawn from un-dilated outlines. - + // The behavior of Skia is as follows: // [AA][no-hint]: generate AA using CoreGraphic's AA output. // [AA][yes-hint]: use CoreGraphic's LCD output and reduce it to a single @@ -1860,7 +1860,7 @@ void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const { // [LCD][no-hint]: curently unable to honor, and must pick which to respect. // Currenly side with LCD, effectively ignoring the hinting setting. // [LCD][yes-hint]: generate LCD using CoreGraphic's LCD output. - + if (isLCDFormat(rec->fMaskFormat)) { if (lcdSupport) { //CoreGraphics creates 555 masks for smoothed text anyway. @@ -1870,7 +1870,7 @@ void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const { rec->fMaskFormat = SkMask::kA8_Format; } } - + // Unhinted A8 masks (those not derived from LCD masks) must respect SK_GAMMA_APPLY_TO_A8. // All other masks can use regular gamma. if (SkMask::kA8_Format == rec->fMaskFormat && SkPaint::kNo_Hinting == hinting) { @@ -1893,9 +1893,8 @@ static const char* get_str(CFStringRef ref, SkString* str) { void SkTypeface_Mac::onGetFontDescriptor(SkFontDescriptor* desc) const { this->INHERITED::onGetFontDescriptor(desc); SkString tmpStr; - + desc->setFamilyName(get_str(CTFontCopyFamilyName(fFontRef), &tmpStr)); desc->setFullName(get_str(CTFontCopyFullName(fFontRef), &tmpStr)); desc->setPostscriptName(get_str(CTFontCopyPostScriptName(fFontRef), &tmpStr)); } -