Index: tools/debugger/SkDrawCommand.cpp |
diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp |
index 8f42cb70ecc3a2a09e33b82c3e7d85414cc23ed5..78c4921c3b5a8f5d4e97617b1439191f5e695b05 100644 |
--- a/tools/debugger/SkDrawCommand.cpp |
+++ b/tools/debugger/SkDrawCommand.cpp |
@@ -180,6 +180,7 @@ SkDrawCommand::~SkDrawCommand() { |
const char* SkDrawCommand::GetCommandString(OpType type) { |
switch (type) { |
case kBeginDrawPicture_OpType: return "BeginDrawPicture"; |
+ case kBeginDrawShadowedPicture_OpType: return "BeginDrawShadowedPicture"; |
case kClipPath_OpType: return "ClipPath"; |
case kClipRegion_OpType: return "ClipRegion"; |
case kClipRect_OpType: return "ClipRect"; |
@@ -208,6 +209,7 @@ const char* SkDrawCommand::GetCommandString(OpType type) { |
case kDrawTextRSXform_OpType: return "DrawTextRSXform"; |
case kDrawVertices_OpType: return "DrawVertices"; |
case kEndDrawPicture_OpType: return "EndDrawPicture"; |
+ case kEndDrawShadowedPicture_OpType: return "EndDrawShadowedPicture"; |
case kRestore_OpType: return "Restore"; |
case kSave_OpType: return "Save"; |
case kSaveLayer_OpType: return "SaveLayer"; |
@@ -2381,6 +2383,68 @@ void SkEndDrawPictureCommand::execute(SkCanvas* canvas) const { |
} |
} |
+SkBeginDrawShadowedPictureCommand::SkBeginDrawShadowedPictureCommand(const SkPicture* picture, |
+ const SkMatrix* matrix, |
+ const SkPaint* paint) |
+ : INHERITED(kBeginDrawShadowedPicture_OpType) |
+ , fPicture(SkRef(picture)) { |
+ |
+ SkString* str = new SkString; |
+ str->appendf("SkPicture: L: %f T: %f R: %f B: %f", |
+ picture->cullRect().fLeft, picture->cullRect().fTop, |
+ picture->cullRect().fRight, picture->cullRect().fBottom); |
+ fInfo.push(str); |
+ |
+ if (matrix) { |
+ fMatrix.set(*matrix); |
+ fInfo.push(SkObjectParser::MatrixToString(*matrix)); |
+ } |
+ |
+ if (paint) { |
+ fPaint.set(*paint); |
+ fInfo.push(SkObjectParser::PaintToString(*paint)); |
+ } |
+} |
+ |
+void SkBeginDrawShadowedPictureCommand::execute(SkCanvas* canvas) const { |
+ if (fPaint.isValid()) { |
+ SkRect bounds = fPicture->cullRect(); |
+ if (fMatrix.isValid()) { |
+ fMatrix.get()->mapRect(&bounds); |
+ } |
+ canvas->saveLayer(&bounds, fPaint.get()); |
+ } |
+ |
+ if (fMatrix.isValid()) { |
+ if (!fPaint.isValid()) { |
+ canvas->save(); |
+ } |
+ canvas->concat(*fMatrix.get()); |
+ } |
+} |
+ |
+bool SkBeginDrawShadowedPictureCommand::render(SkCanvas* canvas) const { |
+ canvas->clear(0xFFFFFFFF); |
+ canvas->save(); |
+ |
+ xlate_and_scale_to_bounds(canvas, fPicture->cullRect()); |
+ |
+ canvas->drawPicture(fPicture.get()); |
+ |
+ canvas->restore(); |
+ |
+ return true; |
+} |
+ |
+SkEndDrawShadowedPictureCommand::SkEndDrawShadowedPictureCommand(bool restore) |
+ : INHERITED(kEndDrawShadowedPicture_OpType) , fRestore(restore) { } |
+ |
+void SkEndDrawShadowedPictureCommand::execute(SkCanvas* canvas) const { |
+ if (fRestore) { |
+ canvas->restore(); |
+ } |
+} |
+ |
SkDrawPointsCommand::SkDrawPointsCommand(SkCanvas::PointMode mode, size_t count, |
const SkPoint pts[], const SkPaint& paint) |
: INHERITED(kDrawPoints_OpType) { |