More SkDrawCommand cleanup

debugger/SkDrawCommand.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkDrawCommand.h"
@@ skipping 95 matching lines @@
 
     this->fInfo.push(SkObjectParser::RegionToString(region));
     this->fInfo.push(SkObjectParser::RegionOpToString(op));
 }
 
 void ClipRegion::execute(SkCanvas* canvas) {
     canvas->clipRegion(*this->fRegion, this->fOp);
 }
 
 ClipRect::ClipRect(const SkRect& rect, SkRegion::Op op, bool doAA) {
-    this->fRect = ▭
-    this->fOp = op;
-    this->fDoAA = doAA;
-    this->fDrawType = CLIP_RECT;
+    fRect = rect;
+    fOp = op;
+    fDoAA = doAA;
+    fDrawType = CLIP_RECT;
 
-    this->fInfo.push(SkObjectParser::RectToString(rect));
-    this->fInfo.push(SkObjectParser::RegionOpToString(op));
-    this->fInfo.push(SkObjectParser::BoolToString(doAA));
+    fInfo.push(SkObjectParser::RectToString(rect));
+    fInfo.push(SkObjectParser::RegionOpToString(op));
+    fInfo.push(SkObjectParser::BoolToString(doAA));
 }
 
 void ClipRect::execute(SkCanvas* canvas) {
-    canvas->clipRect(*this->fRect, this->fOp, this->fDoAA);
+    canvas->clipRect(fRect, fOp, fDoAA);
 }
 
 ClipRRect::ClipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA) {
-    this->fRRect = rrect;
-    this->fOp = op;
-    this->fDoAA = doAA;
-    this->fDrawType = CLIP_RRECT;
+    fRRect = rrect;
+    fOp = op;
+    fDoAA = doAA;
+    fDrawType = CLIP_RRECT;
 
-    this->fInfo.push(SkObjectParser::RRectToString(rrect));
-    this->fInfo.push(SkObjectParser::RegionOpToString(op));
-    this->fInfo.push(SkObjectParser::BoolToString(doAA));
+    fInfo.push(SkObjectParser::RRectToString(rrect));
+    fInfo.push(SkObjectParser::RegionOpToString(op));
+    fInfo.push(SkObjectParser::BoolToString(doAA));
 }
 
 void ClipRRect::execute(SkCanvas* canvas) {
-    canvas->clipRRect(this->fRRect, this->fOp, this->fDoAA);
+    canvas->clipRRect(fRRect, fOp, fDoAA);
 }
 
 Concat::Concat(const SkMatrix& matrix) {
     this->fMatrix = &matrix;
     this->fDrawType = CONCAT;
 
     this->fInfo.push(SkObjectParser::MatrixToString(matrix));
 }
 
 void Concat::execute(SkCanvas* canvas) {
@@ skipping 116 matching lines @@
     this->fLength = length;
     this->fDrawType = DRAW_DATA;
     // TODO(chudy): See if we can't display data and length.
 }
 
 void DrawData::execute(SkCanvas* canvas) {
     canvas->drawData(this->fData, this->fLength);
 }
 
 DrawOval::DrawOval(const SkRect& oval, const SkPaint& paint) {
-    this->fOval = &oval;
-    this->fPaint = &paint;
-    this->fDrawType = DRAW_OVAL;
+    fOval = oval;
+    fPaint = paint;
+    fDrawType = DRAW_OVAL;
 
-    this->fInfo.push(SkObjectParser::RectToString(oval));
-    this->fInfo.push(SkObjectParser::PaintToString(paint));
+    fInfo.push(SkObjectParser::RectToString(oval));
+    fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
 void DrawOval::execute(SkCanvas* canvas) {
-    canvas->drawOval(*this->fOval, *this->fPaint);
+    canvas->drawOval(fOval, fPaint);
 }
 
 DrawPaint::DrawPaint(const SkPaint& paint) {
-    this->fPaint = &paint;
-    this->fDrawType = DRAW_PAINT;
+    fPaint = paint;
+    fDrawType = DRAW_PAINT;
 
-    this->fInfo.push(SkObjectParser::PaintToString(paint));
+    fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
 void DrawPaint::execute(SkCanvas* canvas) {
-    canvas->drawPaint(*this->fPaint);
+    canvas->drawPaint(fPaint);
 }
 
 DrawPath::DrawPath(const SkPath& path, const SkPaint& paint, SkBitmap& bitmap) {
     fPath = path;
     fPaint = paint;
     fBitmap = bitmap;
     fDrawType = DRAW_PATH;
 
     fInfo.push(SkObjectParser::PathToString(path));
     fInfo.push(SkObjectParser::PaintToString(paint));
@@ skipping 11 matching lines @@
     this->fPicture = &picture;
     this->fDrawType = DRAW_PICTURE;
     this->fInfo.push(SkObjectParser::CustomTextToString("To be implemented."));
 }
 
 void DrawPicture::execute(SkCanvas* canvas) {
     canvas->drawPicture(*this->fPicture);
 }
 
 DrawPoints::DrawPoints(SkCanvas::PointMode mode, size_t count,
-        const SkPoint pts[], const SkPaint& paint) {
-    this->fMode = mode;
-    this->fCount = count;
-    this->fPts = pts;
-    this->fPaint = &paint;
-    this->fDrawType = DRAW_POINTS;
+                       const SkPoint pts[], const SkPaint& paint) {
+    fMode = mode;
+    fCount = count;
+    fPts = new SkPoint[count];
+    memcpy(fPts, pts, count * sizeof(SkPoint));
+    fPaint = paint;
+    fDrawType = DRAW_POINTS;
 
-    this->fInfo.push(SkObjectParser::PointsToString(pts, count));
-    this->fInfo.push(SkObjectParser::ScalarToString(SkIntToScalar((unsigned int)count),
-                                                    "Points: "));
-    this->fInfo.push(SkObjectParser::PointModeToString(mode));
-    this->fInfo.push(SkObjectParser::PaintToString(paint));
+    fInfo.push(SkObjectParser::PointsToString(pts, count));
+    fInfo.push(SkObjectParser::ScalarToString(SkIntToScalar((unsigned int)count),
+                                              "Points: "));
+    fInfo.push(SkObjectParser::PointModeToString(mode));
+    fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
 void DrawPoints::execute(SkCanvas* canvas) {
-    canvas->drawPoints(this->fMode, this->fCount, this->fPts, *this->fPaint);
+    canvas->drawPoints(fMode, fCount, fPts, fPaint);
 }
 
 DrawPosText::DrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-        const SkPaint& paint) {
-    this->fText = text;
-    this->fByteLength = byteLength;
-    this->fPos = pos;
-    this->fPaint = &paint;
-    this->fDrawType = DRAW_POS_TEXT;
+                         const SkPaint& paint) {
+    size_t numPts = paint.countText(text, byteLength);
 
-    this->fInfo.push(SkObjectParser::TextToString(text, byteLength, paint.getTextEncoding()));
+    fText = new char[byteLength];
+    memcpy(fText, text, byteLength);
+    fByteLength = byteLength;
+
+    fPos = new SkPoint[numPts];
+    memcpy(fPos, pos, numPts * sizeof(SkPoint));
+
+    fPaint = paint;
+    fDrawType = DRAW_POS_TEXT;
+
+    fInfo.push(SkObjectParser::TextToString(text, byteLength, paint.getTextEncoding()));
     // TODO(chudy): Test that this works.
-    this->fInfo.push(SkObjectParser::PointsToString(pos, 1));
-    this->fInfo.push(SkObjectParser::PaintToString(paint));
+    fInfo.push(SkObjectParser::PointsToString(pos, 1));
+    fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
 void DrawPosText::execute(SkCanvas* canvas) {
-    canvas->drawPosText(this->fText, this->fByteLength, this->fPos, *this->fPaint);
+    canvas->drawPosText(fText, fByteLength, fPos, fPaint);
 }
 
 
 DrawPosTextH::DrawPosTextH(const void* text, size_t byteLength,
                            const SkScalar xpos[], SkScalar constY,
                            const SkPaint& paint) {
-    fText = text;
+    size_t numPts = paint.countText(text, byteLength);
+
+    fText = new char[byteLength];
+    memcpy(fText, text, byteLength);
     fByteLength = byteLength;
-    fXpos = xpos;
+
+    fXpos = new SkScalar[numPts];
+    memcpy(fXpos, xpos, numPts * sizeof(SkScalar));
+
     fConstY = constY;
     fPaint = paint;
     fDrawType = DRAW_POS_TEXT_H;
 
     fInfo.push(SkObjectParser::TextToString(text, byteLength, paint.getTextEncoding()));
     fInfo.push(SkObjectParser::ScalarToString(xpos[0], "XPOS: "));
     fInfo.push(SkObjectParser::ScalarToString(constY, "SkScalar constY: "));
     fInfo.push(SkObjectParser::PaintToString(paint));
 }
 
@@ skipping 211 matching lines @@
     this->fDy = dy;
     this->fDrawType = TRANSLATE;
 
     this->fInfo.push(SkObjectParser::ScalarToString(dx, "SkScalar dx: "));
     this->fInfo.push(SkObjectParser::ScalarToString(dy, "SkScalar dy: "));
 }
 
 void Translate::execute(SkCanvas* canvas) {
     canvas->translate(this->fDx, this->fDy);
 }