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.h b/debugger/SkObjectParser.h
index f08ca08..16cd623 100644
--- a/debugger/SkObjectParser.h
+++ b/debugger/SkObjectParser.h
@@ -10,9 +10,8 @@
#ifndef SKOBJECTPARSER_H_
#define SKOBJECTPARSER_H_
-#include <iostream>
-#include <sstream>
#include "SkCanvas.h"
+#include "SkString.h"
/** \class SkObjectParser
The ObjectParser is used to return string information about parameters
@@ -26,13 +25,18 @@
Returns a string about a bitmaps bounds and config.
@param bitmap SkBitmap
*/
- static std::string BitmapToString(const SkBitmap& bitmap);
+ static SkString* BitmapToString(const SkBitmap& bitmap);
/**
Returns a string representation of a boolean.
@param doAA boolean
*/
- static std::string BoolToString(bool doAA);
+ static SkString* BoolToString(bool doAA);
+
+ /**
+ Returns a string representation of the text pointer passed in.
+ */
+ static SkString* CustomTextToString(const char* text);
/**
Returns a string representation of an integer with the text parameter
@@ -40,66 +44,66 @@
@param x integer
@param text
*/
- static std::string IntToString(int x, const char* text);
+ static SkString* IntToString(int x, const char* text);
/**
Returns a string representation of the SkIRects coordinates.
@param rect SkIRect
*/
- static std::string IRectToString(const SkIRect& rect);
+ static SkString* IRectToString(const SkIRect& rect);
/**
Returns a string representation of an SkMatrix's contents
@param matrix SkMatrix
*/
- static std::string MatrixToString(const SkMatrix& matrix);
+ static SkString* MatrixToString(const SkMatrix& matrix);
/**
Returns a string representation of an SkPaint's color
@param paint SkPaint
*/
- static std::string PaintToString(const SkPaint& paint);
+ static SkString* PaintToString(const SkPaint& paint);
/**
Returns a string representation of a SkPath's points.
@param path SkPath
*/
- static std::string PathToString(const SkPath& path);
+ static SkString* PathToString(const SkPath& path);
/**
Returns a string representation of the points in the point array.
@param pts[] Array of SkPoints
@param count
*/
- static std::string PointsToString(const SkPoint pts[], size_t count);
+ static SkString* PointsToString(const SkPoint pts[], size_t count);
/**
Returns a string representation of the SkCanvas PointMode enum.
*/
- static std::string PointModeToString(SkCanvas::PointMode mode);
+ static SkString* PointModeToString(SkCanvas::PointMode mode);
/**
Returns a string representation of the SkRects coordinates.
@param rect SkRect
*/
- static std::string RectToString(const SkRect& rect);
+ static SkString* RectToString(const SkRect& rect);
/**
Returns a string representation of the SkRegion enum.
@param op SkRegion::op enum
*/
- static std::string RegionOpToString(SkRegion::Op op);
+ static SkString* RegionOpToString(SkRegion::Op op);
/**
Returns a string representation of the SkRegion.
@param region SkRegion
*/
- static std::string RegionToString(const SkRegion& region);
+ static SkString* RegionToString(const SkRegion& region);
/**
Returns a string representation of the SkCanvas::SaveFlags enum.
@param flags SkCanvas::SaveFlags enum
*/
- static std::string SaveFlagsToString(SkCanvas::SaveFlags flags);
+ static SkString* SaveFlagsToString(SkCanvas::SaveFlags flags);
/**
Returns a string representation of an SkScalar with the text parameter
@@ -107,13 +111,13 @@
@param x SkScalar
@param text
*/
- static std::string ScalarToString(SkScalar x, const char* text);
+ static SkString* ScalarToString(SkScalar x, const char* text);
/**
Returns a string representation of the char pointer passed in.
@param text const void* that will be cast to a char*
*/
- static std::string TextToString(const void* text, size_t byteLength);
+ static SkString* TextToString(const void* text, size_t byteLength);
};
#endif