Change append to appendf for call sites with no format arguments.

Original CL: http://codereview.appspot.com/5685062/

Review URL: https://codereview.appspot.com/5686059

git-svn-id: http://skia.googlecode.com/svn/trunk@3225 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/bench/TextBench.cpp b/bench/TextBench.cpp
index 63a7167..ed8fb0e 100644 (file)
--- a/bench/TextBench.cpp
+++ b/bench/TextBench.cpp
@@ -81,13 +81,13 @@ protected:
     virtual const char* onGetName() {
         fName.printf("text_%g", SkScalarToFloat(fPaint.getTextSize()));
         if (fDoPos) {
-            fName.appendf("_pos");
+            fName.append("_pos");
         }
         fName.appendf("_%s", fontQualityName(fPaint));
         if (SK_ColorBLACK != fPaint.getColor()) {
             fName.appendf("_%02X", fPaint.getAlpha());
         } else {
-            fName.appendf("_BK");
+            fName.append("_BK");
         }
         return fName.c_str();
     }

diff --git a/experimental/Debugger/SkDebugDumper.cpp b/experimental/Debugger/SkDebugDumper.cpp
index 29b5049..8ecbec1 100644 (file)
--- a/experimental/Debugger/SkDebugDumper.cpp
+++ b/experimental/Debugger/SkDebugDumper.cpp
@@ -47,7 +47,7 @@ static void appendFlattenable(SkString* str, const SkFlattenable* ptr,
 static SkString dumpMatrix(SkDumpCanvas* canvas) {
     SkString str;
     SkMatrix m = canvas->getTotalMatrix();
-    str.appendf("Matrix:");
+    str.append("Matrix:");
     str.appendf("Translate (%0.4g, %0.4g) ", 
                  SkScalarToFloat(m.get(SkMatrix::kMTransX)), 
                  SkScalarToFloat(m.get(SkMatrix::kMTransY)));
@@ -73,13 +73,13 @@ static SkString dumpClip(SkDumpCanvas* canvas) {
         SkPoint pts[maxPts];
         int numPts = p.getPoints(pts, maxPts);
         
-        str.appendf("Clip: [ ");
+        str.append("Clip: [ ");
         for (int i = 0; i < numPts; ++i) {
             str.appendf("(%0.4g, %0.4g)", pts[i].x(), pts[i].y());
             if (i < numPts-1)
-                str.appendf(" , ");
+                str.append(" , ");
         }
-        str.appendf(" ]");
+        str.append(" ]");
     }
     return str;
 }

diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index e190c91..868149f 100644 (file)
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -489,7 +489,7 @@ void GrGLProgram::genEdgeCoverage(const GrGLContextInfo& gl,
             segments->fFSCode.appendf("\tfloat edgeAlpha = abs(dot(vec3(gl_FragCoord.xy,1), %s.xyz));\n", fsName);
             segments->fFSCode.append("\tedgeAlpha = max(1.0 - edgeAlpha, 0.0);\n");
         } else if (GrDrawState::kQuad_EdgeType == fProgramDesc.fVertexEdgeType) {
-            segments->fFSCode.appendf("\tfloat edgeAlpha;\n");
+            segments->fFSCode.append("\tfloat edgeAlpha;\n");
             // keep the derivative instructions outside the conditional 
             segments->fFSCode.appendf("\tvec2 duvdx = dFdx(%s.xy);\n", fsName);
             segments->fFSCode.appendf("\tvec2 duvdy = dFdy(%s.xy);\n", fsName);
@@ -501,7 +501,7 @@ void GrGLProgram::genEdgeCoverage(const GrGLContextInfo& gl,
                                       "\t\t               2.0*%s.x*duvdy.x - duvdy.y);\n",
                                       fsName, fsName);
             segments->fFSCode.appendf("\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName, fsName);
-            segments->fFSCode.appendf("\t\tedgeAlpha = clamp(0.5 - edgeAlpha / length(gF), 0.0, 1.0);\n"
+            segments->fFSCode.append("\t\tedgeAlpha = clamp(0.5 - edgeAlpha / length(gF), 0.0, 1.0);\n"
                                       "\t}\n");
             if (kES2_GrGLBinding == gl.binding()) {
                 segments->fHeader.printf("#extension GL_OES_standard_derivatives: enable\n");
@@ -816,7 +816,7 @@ bool GrGLProgram::genProgram(const GrGLContextInfo& gl,
                                  all_zeros_vec(4));
         wroteFragColorZero = true;
     } else if (SkXfermode::kDst_Mode != fProgramDesc.fColorFilterXfermode) {
-        segments.fFSCode.appendf("\tvec4 filteredColor;\n");
+        segments.fFSCode.append("\tvec4 filteredColor;\n");
         const char* color = adjustInColor(inColor);
         addColorFilter(&segments.fFSCode, "filteredColor", uniformCoeff,
                        colorCoeff, color);
@@ -831,7 +831,7 @@ bool GrGLProgram::genProgram(const GrGLContextInfo& gl,
                                          COL_MATRIX_VEC_UNI_NAME);
         programData->fUniLocations.fColorMatrixUni = kUseUniform;
         programData->fUniLocations.fColorMatrixVecUni = kUseUniform;
-        segments.fFSCode.appendf("\tvec4 matrixedColor;\n");
+        segments.fFSCode.append("\tvec4 matrixedColor;\n");
         const char* color = adjustInColor(inColor);
         addColorMatrix(&segments.fFSCode, "matrixedColor", color);
         inColor = "matrixedColor";
@@ -1642,7 +1642,7 @@ void genConvolutionFS(int stageNum,
     segments->fFSCode.appendf("\t\t%s += %s;\n",
                               coordVar.c_str(),
                               imageIncrementName);
-    segments->fFSCode.appendf("\t}\n");
+    segments->fFSCode.append("\t}\n");
     segments->fFSCode.appendf("\t%s = %s%s;\n", fsOutColor,
                               sumVar.c_str(), modulate.c_str());
 }

diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp
index db62498..c9b4a95 100644 (file)
--- a/src/utils/SkDumpCanvas.cpp
+++ b/src/utils/SkDumpCanvas.cpp
@@ -49,7 +49,7 @@ static void dumpVerbs(const SkPath& path, SkString* str) {
                              pts[2].fX, pts[2].fY, pts[3].fX, pts[3].fY);
                 break;
             case SkPath::kClose_Verb:
-                str->appendf("X");
+                str->append("X");
                 break;
             case SkPath::kDone_Verb:
                 return;

diff --git a/tests/WArrayTest.cpp b/tests/WArrayTest.cpp
index 428ca5f..daab543 100644 (file)
--- a/tests/WArrayTest.cpp
+++ b/tests/WArrayTest.cpp
@@ -108,7 +108,7 @@ static SkString stringify_advance_data(
     bool leadingSpace = false;
     while (data != NULL) {
       if (leadingSpace) {
-        result.appendf(" ");
+        result.append(" ");
       } else {
         leadingSpace = true;
       }
@@ -121,11 +121,11 @@ static SkString stringify_advance_data(
           result.appendf("%d[", data->fStartId);
           for (int i = 0; i < data->fAdvance.count(); ++i) {
             if (i > 0) {
-              result.appendf(" ");
+              result.append(" ");
             }
             result.appendf("%d", data->fAdvance[i]);
           }
-          result.appendf("]");
+          result.append("]");
           break;
         case SkAdvancedTypefaceMetrics::AdvanceMetric<int16_t>::kDefault:
           result.appendf("<Default=%d>", data->fAdvance[0]);