Replaced all instances of std strings and vectors in favor of SkStrings and SkTDArrays within skia code
Review URL: https://codereview.appspot.com/6445088
git-svn-id: http://skia.googlecode.com/svn/trunk@4995 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/debugger/SkObjectParser.cpp b/debugger/SkObjectParser.cpp
index 68774c2..af12083 100644
--- a/debugger/SkObjectParser.cpp
+++ b/debugger/SkObjectParser.cpp
@@ -10,189 +10,174 @@
/* TODO(chudy): Replace all std::strings with char */
-std::string SkObjectParser::BitmapToString(const SkBitmap& bitmap) {
- const char* mBitmap("SkBitmap: Data unavailable");
+SkString* SkObjectParser::BitmapToString(const SkBitmap& bitmap) {
+ SkString* mBitmap = new SkString("SkBitmap: Data unavailable");
return mBitmap;
}
-std::string SkObjectParser::BoolToString(bool doAA) {
+SkString* SkObjectParser::BoolToString(bool doAA) {
+ SkString* mBool = new SkString("Bool doAA: ");
if (doAA) {
- return "bool doAA: True";
+ mBool->append("True");
} else {
- return "bool doAA: False";
+ mBool->append("False");
}
+ return mBool;
}
-std::string SkObjectParser::IntToString(int x, const char* text) {
- std::stringstream ss;
- ss << text << x;
- return ss.str();
+SkString* SkObjectParser::CustomTextToString(const char* text) {
+ SkString* mText = new SkString(text);
+ return mText;
}
-std::string SkObjectParser::IRectToString(const SkIRect& rect) {
- std::stringstream ss;
- ss << "SkIRect: ";
- ss << "L: " << rect.left() << ",";
- ss << "T: " << rect.top() << ",";
- ss << "R: " << rect.right() << ",";
- ss << "B: " << rect.bottom();
- return ss.str();
+SkString* SkObjectParser::IntToString(int x, const char* text) {
+ SkString* mInt = new SkString(text);
+ mInt->append(" ");
+ mInt->appendScalar(SkIntToScalar(x));
+ return mInt;
}
-std::string SkObjectParser::MatrixToString(const SkMatrix& matrix) {
- std::stringstream ss;
- /* NOTE(chudy): Cleaner looking than loops. */
- /* TODO(chudy): Decide whether to remove html part in order to really
- * seperate view / model. */
- ss << "SkMatrix:<br/>(";
- ss << matrix.get(0) << "), (";
- ss << matrix.get(1) << "), (";
- ss << matrix.get(2) << "), <br/>(";
- ss << matrix.get(3) << "), (";
- ss << matrix.get(4) << "), (";
- ss << matrix.get(5) << "), <br/>(";
- ss << matrix.get(6) << "), (";
- ss << matrix.get(7) << "), (";
- ss << matrix.get(8) << ")";
- return ss.str();
-}
-
-std::string SkObjectParser::PaintToString(const SkPaint& paint) {
- std::stringstream ss;
- SkColor color = paint.getColor();
- ss << "SkPaint: 0x" << std::hex << std::uppercase << color;
- return ss.str();
-}
-
-std::string SkObjectParser::PathToString(const SkPath& path) {
- std::string mPath;
- std::stringstream ss;
- mPath.append("SkPath: ");
-
- for (int i=0; i<path.countPoints(); i++) {
- ss << "(" << path.getPoint(i).fX << ", " << path.getPoint(i).fY << ") ";
- mPath.append(ss.str());
- ss.str("");
- }
-
- return mPath;
-}
-
-std::string SkObjectParser::PointsToString(const SkPoint pts[], size_t count) {
- std::stringstream ss;
- ss << "SkPoint pts[]: ";
- for (unsigned int i = 0; i < count; i++) {
- ss << "(" << pts[i].fX << "," << pts[i].fY << ") ";
- }
- return ss.str();
-}
-
-std::string SkObjectParser::PointModeToString(SkCanvas::PointMode mode) {
- std::string mMode("SkCanvas::PointMode: ");
- if (mode == SkCanvas::kPoints_PointMode) {
- mMode.append("kPoints_PointMode");
- } else if (mode == SkCanvas::kLines_PointMode) {
- mMode.append("kLines_Mode");
- } else if (mode == SkCanvas::kPolygon_PointMode) {
- mMode.append("kPolygon_PointMode");
- }
-
- return mMode;
-}
-
-std::string SkObjectParser::RectToString(const SkRect& rect) {
- std::string mRect("SkRect: ");
- std::stringstream ss;
-
- mRect.append("(");
- ss << rect.left();
- mRect.append(ss.str());
-
- ss.str("");
- mRect.append(", ");
- ss << rect.top();
- mRect.append(ss.str());
-
- ss.str("");
- mRect.append(", ");
- ss << rect.right();
- mRect.append(ss.str());
-
- ss.str("");
- mRect.append(", ");
- ss << rect.bottom();
- mRect.append(ss.str());
- mRect.append(")");
-
+SkString* SkObjectParser::IRectToString(const SkIRect& rect) {
+ SkString* mRect = new SkString("SkIRect: ");
+ mRect->append("L: ");
+ mRect->appendScalar(rect.left());
+ mRect->append(", T: ");
+ mRect->appendScalar(rect.top());
+ mRect->append(", R: ");
+ mRect->appendScalar(rect.right());
+ mRect->append(", B: ");
+ mRect->appendScalar(rect.bottom());
return mRect;
}
-std::string SkObjectParser::RegionOpToString(SkRegion::Op op) {
- std::string mOp("SkRegion::Op: ");
-
- if (op == SkRegion::kDifference_Op) {
- mOp.append("kDifference_Op");
- } else if (op == SkRegion::kIntersect_Op) {
- mOp.append("kIntersect_Op");
- } else if (op == SkRegion::kUnion_Op) {
- mOp.append("kUnion_Op");
- } else if (op == SkRegion::kXOR_Op) {
- mOp.append("kXOR_Op");
- } else if (op == SkRegion::kReverseDifference_Op) {
- mOp.append("kReverseDifference_Op");
- } else if (op == SkRegion::kReplace_Op) {
- mOp.append("kReplace_Op");
- } else {
- mOp.append("Unknown Type");
+SkString* SkObjectParser::MatrixToString(const SkMatrix& matrix) {
+ SkString* mMatrix = new SkString("SkMatrix: (");
+ for (int i = 0; i < 8; i++) {
+ mMatrix->appendScalar(matrix.get(i));
+ mMatrix->append("), (");
}
+ mMatrix->appendScalar(matrix.get(8));
+ mMatrix->append(")");
+ return mMatrix;
+}
+SkString* SkObjectParser::PaintToString(const SkPaint& paint) {
+ SkColor color = paint.getColor();
+ SkString* mPaint = new SkString("SkPaint: 0x");
+ mPaint->appendHex(color);
+ return mPaint;
+}
+
+SkString* SkObjectParser::PathToString(const SkPath& path) {
+ SkString* mPath = new SkString("SkPath: ");
+ for (int i = 0; i < path.countPoints(); i++) {
+ mPath->append("(");
+ mPath->appendScalar(path.getPoint(i).fX);
+ mPath->append(", ");
+ mPath->appendScalar(path.getPoint(i).fY);
+ mPath->append(") ");
+ }
+ return mPath;
+}
+
+SkString* SkObjectParser::PointsToString(const SkPoint pts[], size_t count) {
+ SkString* mPoints = new SkString("SkPoints pts[]: ");
+ for (unsigned int i = 0; i < count; i++) {
+ mPoints->append("(");
+ mPoints->appendScalar(pts[i].fX);
+ mPoints->append(",");
+ mPoints->appendScalar(pts[i].fY);
+ mPoints->append(")");
+ }
+ return mPoints;
+}
+
+SkString* SkObjectParser::PointModeToString(SkCanvas::PointMode mode) {
+ SkString* mMode = new SkString("SkCanvas::PointMode: ");
+ if (mode == SkCanvas::kPoints_PointMode) {
+ mMode->append("kPoints_PointMode");
+ } else if (mode == SkCanvas::kLines_PointMode) {
+ mMode->append("kLines_Mode");
+ } else if (mode == SkCanvas::kPolygon_PointMode) {
+ mMode->append("kPolygon_PointMode");
+ }
+ return mMode;
+}
+
+SkString* SkObjectParser::RectToString(const SkRect& rect) {
+ SkString* mRect = new SkString("SkRect: ");
+ mRect->append("(");
+ mRect->appendScalar(rect.left());
+ mRect->append(", ");
+ mRect->appendScalar(rect.top());
+ mRect->append(", ");
+ mRect->appendScalar(rect.right());
+ mRect->append(", ");
+ mRect->appendScalar(rect.bottom());
+ mRect->append(")");
+ return mRect;
+}
+
+SkString* SkObjectParser::RegionOpToString(SkRegion::Op op) {
+ SkString* mOp = new SkString("SkRegion::Op: ");
+ if (op == SkRegion::kDifference_Op) {
+ mOp->append("kDifference_Op");
+ } else if (op == SkRegion::kIntersect_Op) {
+ mOp->append("kIntersect_Op");
+ } else if (op == SkRegion::kUnion_Op) {
+ mOp->append("kUnion_Op");
+ } else if (op == SkRegion::kXOR_Op) {
+ mOp->append("kXOR_Op");
+ } else if (op == SkRegion::kReverseDifference_Op) {
+ mOp->append("kReverseDifference_Op");
+ } else if (op == SkRegion::kReplace_Op) {
+ mOp->append("kReplace_Op");
+ } else {
+ mOp->append("Unknown Type");
+ }
return mOp;
}
-std::string SkObjectParser::RegionToString(const SkRegion& region) {
- return "SkRegion: Data unavailable.";
+SkString* SkObjectParser::RegionToString(const SkRegion& region) {
+ SkString* mRegion = new SkString("SkRegion: Data unavailable.");
+ return mRegion;
}
-std::string SkObjectParser::SaveFlagsToString(SkCanvas::SaveFlags flags) {
- std::string mFlags;
- mFlags.append("SkCanvas::SaveFlags: ");
-
+SkString* SkObjectParser::SaveFlagsToString(SkCanvas::SaveFlags flags) {
+ SkString* mFlags = new SkString("SkCanvas::SaveFlags: ");
if(flags == SkCanvas::kMatrixClip_SaveFlag) {
- mFlags.append("kMatrixClip_SaveFlag");
+ mFlags->append("kMatrixClip_SaveFlag");
} else if (flags == SkCanvas::kClip_SaveFlag) {
- mFlags.append("kClip_SaveFlag");
+ mFlags->append("kClip_SaveFlag");
} else if (flags == SkCanvas::kHasAlphaLayer_SaveFlag) {
- mFlags.append("kHasAlphaLayer_SaveFlag");
+ mFlags->append("kHasAlphaLayer_SaveFlag");
} else if (flags == SkCanvas::kFullColorLayer_SaveFlag) {
- mFlags.append("kFullColorLayer_SaveFlag");
+ mFlags->append("kFullColorLayer_SaveFlag");
} else if (flags == SkCanvas::kClipToLayer_SaveFlag) {
- mFlags.append("kClipToLayer_SaveFlag");
+ mFlags->append("kClipToLayer_SaveFlag");
} else if (flags == SkCanvas::kMatrixClip_SaveFlag) {
- mFlags.append("kMatrixClip_SaveFlag");
+ mFlags->append("kMatrixClip_SaveFlag");
} else if (flags == SkCanvas::kARGB_NoClipLayer_SaveFlag) {
- mFlags.append("kARGB_NoClipLayer_SaveFlag");
+ mFlags->append("kARGB_NoClipLayer_SaveFlag");
} else if (flags == SkCanvas::kARGB_ClipLayer_SaveFlag) {
- mFlags.append("kARGB_ClipLayer_SaveFlag");
+ mFlags->append("kARGB_ClipLayer_SaveFlag");
} else {
- mFlags.append("Data Unavailable");
+ mFlags->append("Data Unavailable");
}
-
return mFlags;
}
-std::string SkObjectParser::ScalarToString(SkScalar x, const char* text) {
- std::string mScalar;
- mScalar.append(text);
-
- std::stringstream ss;
- ss << x;
- mScalar.append(ss.str());
+SkString* SkObjectParser::ScalarToString(SkScalar x, const char* text) {
+ SkString* mScalar = new SkString(text);
+ mScalar->append(" ");
+ mScalar->appendScalar(x);
return mScalar;
}
-std::string SkObjectParser::TextToString(const void* text, size_t byteLength) {
+SkString* SkObjectParser::TextToString(const void* text, size_t byteLength) {
char result[6+byteLength];
strcpy(result,"Text: ");
strcat(result, (char*)text);
- return result;
+ SkString* mText = new SkString(result);
+ return mText;
}