diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkFontHost.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/GrAAHairLinePathRenderer.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/effects/GrEdgeEffect.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/effects/GrEdgeEffect.h | 4 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLProgram.cpp | 4 | ||||
| -rwxr-xr-x | src/ports/SkFontHost_mac.cpp | 22 | ||||
| -rw-r--r-- | src/ports/SkFontHost_none.cpp | 1 |
7 files changed, 18 insertions, 20 deletions
diff --git a/src/core/SkFontHost.cpp b/src/core/SkFontHost.cpp index bafc45ab79..acd020b12d 100644 --- a/src/core/SkFontHost.cpp +++ b/src/core/SkFontHost.cpp @@ -83,7 +83,7 @@ SkTypeface* SkFontMgr::matchFamilyStyle(const char familyName[], return this->onMatchFamilyStyle(familyName, fs); } -SkTypeface* SkFontMgr::matchFaceStyle(const SkTypeface* face, +SkTypeface* SkFontMgr::matchFaceStyle(const SkTypeface* face, const SkFontStyle& fs) { return this->onMatchFaceStyle(face, fs); } @@ -111,4 +111,3 @@ SkFontMgr* SkFontMgr::RefDefault() { return SkRef(gFM); #endif } - diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp index 079c826e4e..9e24bed338 100644 --- a/src/gpu/GrAAHairLinePathRenderer.cpp +++ b/src/gpu/GrAAHairLinePathRenderer.cpp @@ -615,7 +615,7 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path, GrEffectRef* hairLineEffect = GrEdgeEffect::Create(GrEdgeEffect::kHairLine_EdgeType); GrEffectRef* hairQuadEffect = GrEdgeEffect::Create(GrEdgeEffect::kHairQuad_EdgeType); - + target->setIndexSourceToBuffer(fLinesIndexBuffer); int lines = 0; int nBufLines = fLinesIndexBuffer->maxQuads(); diff --git a/src/gpu/effects/GrEdgeEffect.cpp b/src/gpu/effects/GrEdgeEffect.cpp index f02fa35ae0..dd7474fd00 100644 --- a/src/gpu/effects/GrEdgeEffect.cpp +++ b/src/gpu/effects/GrEdgeEffect.cpp @@ -52,7 +52,7 @@ public: builder->fsCodeAppendf("\t\t\tvec2 gF = vec2(2.0*%s.x*duvdx.x - duvdx.y,\n" "\t\t\t 2.0*%s.x*duvdy.x - duvdy.y);\n", fsName, fsName); - builder->fsCodeAppendf("\t\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName, + builder->fsCodeAppendf("\t\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName, fsName); builder->fsCodeAppendf("\t\t\tedgeAlpha = " "clamp(0.5 - edgeAlpha / length(gF), 0.0, 1.0);\n\t\t}\n"); diff --git a/src/gpu/effects/GrEdgeEffect.h b/src/gpu/effects/GrEdgeEffect.h index c6238a2e09..5bbe05f623 100644 --- a/src/gpu/effects/GrEdgeEffect.h +++ b/src/gpu/effects/GrEdgeEffect.h @@ -13,7 +13,7 @@ class GrGLEdgeEffect; /** - * The output of this effect is one of three different edge types: hairlines, quads, + * The output of this effect is one of three different edge types: hairlines, quads, * and hairline quads. */ @@ -50,7 +50,7 @@ public: static SkAutoTUnref<GrEffectRef> gUnref0(gEdgeEffectRef[0]); static SkAutoTUnref<GrEffectRef> gUnref1(gEdgeEffectRef[1]); static SkAutoTUnref<GrEffectRef> gUnref2(gEdgeEffectRef[2]); - + gEdgeEffectRef[type]->ref(); return gEdgeEffectRef[type]; } diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index 1c8f884afc..5f567912f6 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -163,13 +163,13 @@ void GrGLProgram::BuildDesc(const GrDrawState& drawState, hasCoverage = requiresAttributeCoverage; } } - + if (hasCoverage) { // color filter is applied between color/coverage computation if (SkXfermode::kDst_Mode != desc->fColorFilterXfermode) { desc->fFirstCoverageStage = firstCoverageStage; } - + // If we're stenciling then we want to discard samples that have zero coverage if (drawState.getStencil().doesWrite()) { desc->fDiscardIfZeroCoverage = true; diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp index c5209ba968..d204b1361d 100755 --- a/src/ports/SkFontHost_mac.cpp +++ b/src/ports/SkFontHost_mac.cpp @@ -429,7 +429,7 @@ public: { SkASSERT(fontRef); } - + SkTypeface_Mac(const SkFontStyle& fs, SkFontID fontID, bool isFixedPitch, CTFontRef fontRef, const char name[]) : SkTypeface(fontstyle2stylebits(fs), fontID, isFixedPitch) @@ -439,7 +439,7 @@ public: { SkASSERT(fontRef); } - + SkString fName; AutoCFRelease<CTFontRef> fFontRef; SkFontStyle fFontStyle; @@ -1918,7 +1918,7 @@ static SkFontStyle desc2fontstyle(CTFontDescriptorRef desc) { if (!find_dict_float(dict, kCTFontSlantTrait, &slant)) { slant = 0; } - + return SkFontStyle(unit_weight_to_fontstyle(weight), unit_width_to_fontstyle(width), slant ? SkFontStyle::kItalic_Slant @@ -1932,14 +1932,14 @@ static SkTypeface* createFromDesc(CFStringRef cfFamilyName, if (NULL == ctFont) { return NULL; } - + SkString str; CFStringToSkString(cfFamilyName, &str); - + bool isFixedPitch; (void)computeStyleBits(ctFont, &isFixedPitch); SkFontID fontID = CTFontRef_to_SkFontID(ctFont); - + return new SkTypeface_Mac(desc2fontstyle(desc), fontID, isFixedPitch, ctFont, str.c_str()); } @@ -1951,7 +1951,7 @@ public: , fFamilyName(familyName) { CFRetain(familyName); } - + virtual ~SkFontStyleSet_Mac() { CFSafeRelease(fArray); CFRelease(fFamilyName); @@ -1978,10 +1978,10 @@ public: virtual SkTypeface* createTypeface(int index) SK_OVERRIDE { SkASSERT((unsigned)index < (unsigned)CFArrayGetCount(fArray)); CTFontDescriptorRef desc = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fArray, index); - + return createFromDesc(fFamilyName, desc); } - + private: CFArrayRef fArray; CFStringRef fFamilyName; @@ -2035,10 +2035,10 @@ protected: CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks)); - + CFDictionaryAddValue(cfAttr, kCTFontFamilyNameAttribute, this->stringAt(index)); - + AutoCFRelease<CTFontDescriptorRef> desc( CTFontDescriptorCreateWithAttributes(cfAttr)); return SkNEW_ARGS(SkFontStyleSet_Mac, (this->stringAt(index), desc)); diff --git a/src/ports/SkFontHost_none.cpp b/src/ports/SkFontHost_none.cpp index 6abb75db9d..5e3eb085ca 100644 --- a/src/ports/SkFontHost_none.cpp +++ b/src/ports/SkFontHost_none.cpp @@ -26,4 +26,3 @@ SkTypeface* SkFontHost::CreateTypefaceFromFile(char const*) { SkDEBUGFAIL("SkFontHost::CreateTypefaceFromFile unimplemented"); return NULL; } - |