Index: dm/DMSKPTask.cpp |
diff --git a/dm/DMSKPTask.cpp b/dm/DMSKPTask.cpp |
index 3d0291598fe9dfa6f42c781c5d404b5136e7ec8e..765fe108ce09e136ec21a679b5926d4f7e32b0c8 100644 |
--- a/dm/DMSKPTask.cpp |
+++ b/dm/DMSKPTask.cpp |
@@ -5,47 +5,11 @@ |
#include "SkCommandLineFlags.h" |
#include "SkPictureRecorder.h" |
-DEFINE_bool(skr, true, "Test that SKPs draw the same when re-recorded with SkRecord backend."); |
DEFINE_int32(skpMaxWidth, 1000, "Max SKPTask viewport width."); |
DEFINE_int32(skpMaxHeight, 1000, "Max SKPTask viewport height."); |
namespace DM { |
-// Test that an SkPicture plays back the same when re-recorded into an |
-// SkPicture backed by SkRecord. |
-class SkrComparisonTask : public CpuTask { |
-public: |
- SkrComparisonTask(const Task& parent, const SkPicture* picture, SkBitmap reference) |
- : CpuTask(parent) |
- , fPicture(SkRef(picture)) |
- , fReference(reference) |
- , fName(UnderJoin(parent.name().c_str(), "skr")) {} |
- |
- virtual bool shouldSkip() const SK_OVERRIDE { return !FLAGS_skr; } |
- virtual SkString name() const SK_OVERRIDE { return fName; } |
- |
- virtual void draw() SK_OVERRIDE { |
- SkPictureRecorder recorder; |
- fPicture->draw(recorder.EXPERIMENTAL_beginRecording(fPicture->width(), fPicture->height())); |
- SkAutoTDelete<const SkPicture> skrPicture(recorder.endRecording()); |
- |
- SkBitmap bitmap; |
- AllocatePixels(kN32_SkColorType, fReference.width(), fReference.height(), &bitmap); |
- DrawPicture(*skrPicture, &bitmap); |
- |
- if (!BitmapsEqual(fReference, bitmap)) { |
- this->fail(); |
- this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap))); |
- } |
- } |
- |
-private: |
- SkAutoTUnref<const SkPicture> fPicture; |
- const SkBitmap fReference; |
- const SkString fName; |
-}; |
- |
- |
SKPTask::SKPTask(Reporter* r, TaskRunner* tr, const SkPicture* pic, SkString filename) |
: CpuTask(r, tr), fPicture(SkRef(pic)), fName(FileToTaskName(filename)) {} |
@@ -57,7 +21,6 @@ void SKPTask::draw() { |
DrawPicture(*fPicture, &bitmap); |
this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap))); |
- this->spawnChild(SkNEW_ARGS(SkrComparisonTask, (*this, fPicture.get(), bitmap))); |
} |
} // namespace DM |