diff options
| -rw-r--r-- | bench/PathBench.cpp | 2 | ||||
| -rw-r--r-- | debugger/SkObjectParser.cpp | 2 | ||||
| -rw-r--r-- | samplecode/SampleFatBits.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkPath.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLProgramStage.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLShaderBuilder.cpp | 6 | ||||
| -rw-r--r-- | src/pdf/SkPDFFont.cpp | 6 |
7 files changed, 11 insertions, 11 deletions
diff --git a/bench/PathBench.cpp b/bench/PathBench.cpp index be16c75e5f..6e522ec67c 100644 --- a/bench/PathBench.cpp +++ b/bench/PathBench.cpp @@ -673,7 +673,7 @@ private: // Chrome creates its own round rects with each corner possibly being different. // In its "zero radius" incarnation it creates degenerate round rects. -// Note: PathTest::test_arb_round_rect_is_convex and +// Note: PathTest::test_arb_round_rect_is_convex and // test_arb_zero_rad_round_rect_is_rect perform almost exactly // the same test (but with no drawing) class ArbRoundRectBench : public SkBenchmark { diff --git a/debugger/SkObjectParser.cpp b/debugger/SkObjectParser.cpp index 4bee8715f1..892df99db7 100644 --- a/debugger/SkObjectParser.cpp +++ b/debugger/SkObjectParser.cpp @@ -18,7 +18,7 @@ SkString* SkObjectParser::BitmapToString(const SkBitmap& bitmap) { mBitmap->appendS32(bitmap.height()); const char* gConfigStrings[] = { - "None", "A1", "A8", "Index8", "RGB565", "ARGB4444", "ARGB8888", "RLE8" + "None", "A1", "A8", "Index8", "RGB565", "ARGB4444", "ARGB8888", "RLE8" }; SkASSERT(SkBitmap::kConfigCount == 8); diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp index c1ea13d3f5..c25d70ba90 100644 --- a/samplecode/SampleFatBits.cpp +++ b/samplecode/SampleFatBits.cpp @@ -371,7 +371,7 @@ protected: fFB.drawLine(canvas, fPts); } fFB.drawFG(canvas); - + { SkString str; str.printf("%s %s %s", diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp index b8df23b671..343350b850 100644 --- a/src/core/SkPath.cpp +++ b/src/core/SkPath.cpp @@ -1032,7 +1032,7 @@ static int build_arc_points(const SkRect& oval, SkScalar startAngle, return 1; } else if (0 == oval.width() && 0 == oval.height()) { // Chrome will sometimes create 0 radius round rects. Having degenerate - // quad segments in the path prevents the path from being recognized as + // quad segments in the path prevents the path from being recognized as // a rect. // TODO: optimizing the case where only one of width or height is zero // should also be considered. This case, however, doesn't seem to be diff --git a/src/gpu/gl/GrGLProgramStage.cpp b/src/gpu/gl/GrGLProgramStage.cpp index 06a6f6db52..4702f378f5 100644 --- a/src/gpu/gl/GrGLProgramStage.cpp +++ b/src/gpu/gl/GrGLProgramStage.cpp @@ -17,7 +17,7 @@ GrGLProgramStage::~GrGLProgramStage() { /////////////////////////////////////////////////////////////////////////////// -void GrGLProgramStage::setData(const GrGLUniformManager&, const GrCustomStage&) { +void GrGLProgramStage::setData(const GrGLUniformManager&, const GrCustomStage&) { } GrGLProgramStage::StageKey GrGLProgramStage::GenTextureKey(const GrCustomStage& stage, diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp index 2f24b07c15..04fe63e534 100644 --- a/src/gpu/gl/GrGLShaderBuilder.cpp +++ b/src/gpu/gl/GrGLShaderBuilder.cpp @@ -292,13 +292,13 @@ const char* GrGLShaderBuilder::fragmentPosition() { fFSHeader.append("layout(origin_upper_left) in vec4 gl_FragCoord;\n"); fSetupFragPosition = true; } - return "gl_FragCoord"; + return "gl_FragCoord"; } else { static const char* kCoordName = "fragCoordYDown"; if (!fSetupFragPosition) { GrAssert(GrGLUniformManager::kInvalidUniformHandle == fRTHeightUniform); const char* rtHeightName; - + // temporarily change the stage index because we're inserting a uniform whose name // shouldn't be mangled to be stage-specific. int oldStageIdx = fCurrentStage; @@ -308,7 +308,7 @@ const char* GrGLShaderBuilder::fragmentPosition() { "RTHeight", &rtHeightName); fCurrentStage = oldStageIdx; - + this->fFSCode.prependf("\tvec4 %s = vec4(gl_FragCoord.x, %s - gl_FragCoord.y, gl_FragCoord.zw);\n", kCoordName, rtHeightName); fSetupFragPosition = true; diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp index 39712811b7..9a8f13600b 100644 --- a/src/pdf/SkPDFFont.cpp +++ b/src/pdf/SkPDFFont.cpp @@ -707,7 +707,7 @@ SkPDFFont::~SkPDFFont() { index = i; } } - + SkDEBUGCODE(int indexFound;) SkASSERT(index == -1 || (Find(SkTypeface::UniqueID(fTypeface.get()), @@ -776,7 +776,7 @@ SkPDFFont* SkPDFFont::GetFontResource(SkTypeface* typeface, uint16_t glyphID) { // This only is to catch callers who pass invalid glyph ids. // If glyph id is invalid, then we will create duplicate entries // for True Type fonts. - SkAdvancedTypefaceMetrics::FontType fontType = + SkAdvancedTypefaceMetrics::FontType fontType = fontMetrics.get() ? fontMetrics.get()->fType : SkAdvancedTypefaceMetrics::kOther_Font; @@ -784,7 +784,7 @@ SkPDFFont* SkPDFFont::GetFontResource(SkTypeface* typeface, uint16_t glyphID) { fontType == SkAdvancedTypefaceMetrics::kTrueType_Font) { CanonicalFonts()[relatedFontIndex].fFont->ref(); return CanonicalFonts()[relatedFontIndex].fFont; - } + } } else { SkAdvancedTypefaceMetrics::PerGlyphInfo info; info = SkAdvancedTypefaceMetrics::kGlyphNames_PerGlyphInfo; |