3030445799
Reason for revert: Failing serialization tasks in DM: http://build.chromium.org/p/client.skia/builders/Test-Win8-ShuttleA-GTX660-x86-Debug/builds/352/steps/dm/logs/stdio Original issue's description: > Replace EncodeBitmap with an interface. > > Gives more flexibility to the caller to decide whether to use the > encoded data returned by refEncodedData(). > > Provides an implementation that supports the old version of > SkPicture::serialize(). > > TODO: Update Chrome, so we can remove SK_LEGACY_ENCODE_BITMAP entirely > > BUG=skia:3190 > > Committed: https://skia.googlesource.com/skia/+/0c4aba6edb9900c597359dfa49d3ce4a41bc5dd1 > > Committed: https://skia.googlesource.com/skia/+/02b217f80b01a7dda8493422e5257c36a9ce8464 TBR=reed@google.com,rmistry@google.com NOTREECHECKS=true NOTRY=true BUG=skia:3190 Review URL: https://codereview.chromium.org/783393004
45 lines
1.2 KiB
C++
45 lines
1.2 KiB
C++
#include "DMSerializeTask.h"
|
|
#include "DMUtil.h"
|
|
#include "DMWriteTask.h"
|
|
|
|
#include "SkCommandLineFlags.h"
|
|
#include "SkPicture.h"
|
|
#include "SkPixelRef.h"
|
|
|
|
DEFINE_bool(serialize, true, "If true, run picture serialization tests via SkPictureData.");
|
|
|
|
namespace DM {
|
|
|
|
SerializeTask::SerializeTask(const Task& parent, skiagm::GM* gm, SkBitmap reference)
|
|
: CpuTask(parent)
|
|
, fName(UnderJoin(parent.name().c_str(), "serialize"))
|
|
, fGM(gm)
|
|
, fReference(reference)
|
|
{}
|
|
|
|
void SerializeTask::draw() {
|
|
SkAutoTUnref<SkPicture> recorded(RecordPicture(fGM.get(), NULL/*no BBH*/));
|
|
|
|
SkDynamicMemoryWStream wStream;
|
|
recorded->serialize(&wStream, NULL);
|
|
SkAutoTUnref<SkStream> rStream(wStream.detachAsStream());
|
|
SkAutoTUnref<SkPicture> reconstructed(SkPicture::CreateFromStream(rStream));
|
|
|
|
SkBitmap bitmap;
|
|
AllocatePixels(fReference, &bitmap);
|
|
DrawPicture(*reconstructed, &bitmap);
|
|
if (!BitmapsEqual(bitmap, fReference)) {
|
|
this->fail();
|
|
this->spawnChild(SkNEW_ARGS(WriteTask, (*this, "GM", bitmap)));
|
|
}
|
|
}
|
|
|
|
bool SerializeTask::shouldSkip() const {
|
|
if (fGM->getFlags() & skiagm::GM::kSkipPicture_Flag) {
|
|
return true;
|
|
}
|
|
return !FLAGS_serialize;
|
|
}
|
|
|
|
} // namespace DM
|