Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: dm/DMSerializeTask.cpp

Issue 345553003: Support serialization in SkRecord-backed SkPictures. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: tweak Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 #include "DMSerializeTask.h" 1 #include "DMSerializeTask.h"
2 #include "DMUtil.h" 2 #include "DMUtil.h"
3 #include "DMWriteTask.h" 3 #include "DMWriteTask.h"
4 4
5 #include "SkCommandLineFlags.h" 5 #include "SkCommandLineFlags.h"
6 #include "SkPicture.h" 6 #include "SkPicture.h"
7 #include "SkPixelRef.h" 7 #include "SkPixelRef.h"
8 8
9 DEFINE_bool(serialize, true, "If true, run picture serialization tests."); 9 DEFINE_bool(serialize, true, "If true, run picture serialization tests.");
10 DECLARE_bool(skr); // in DMReplayTask.cpp
11
12 static const char* kSuffixes[] = { "serialize", "serialize_skr" };
10 13
11 namespace DM { 14 namespace DM {
12 15
13 SerializeTask::SerializeTask(const Task& parent, 16 SerializeTask::SerializeTask(const Task& parent,
14 skiagm::GM* gm, 17 skiagm::GM* gm,
15 SkBitmap reference) 18 SkBitmap reference,
19 SerializeTask::Mode mode)
16 : CpuTask(parent) 20 : CpuTask(parent)
17 , fName(UnderJoin(parent.name().c_str(), "serialize")) 21 , fMode(mode)
22 , fName(UnderJoin(parent.name().c_str(), kSuffixes[mode]))
18 , fGM(gm) 23 , fGM(gm)
19 , fReference(reference) 24 , fReference(reference)
20 {} 25 {}
21 26
22 void SerializeTask::draw() { 27 void SerializeTask::draw() {
23 SkAutoTUnref<SkPicture> recorded(RecordPicture(fGM.get())); 28 SkAutoTUnref<SkPicture> recorded(
29 RecordPicture(fGM.get(), NULL/*no BBH*/, kSkRecord_Mode == fMode));
24 30
25 SkDynamicMemoryWStream wStream; 31 SkDynamicMemoryWStream wStream;
26 recorded->serialize(&wStream, NULL); 32 recorded->serialize(&wStream, NULL);
27 SkAutoTUnref<SkStream> rStream(wStream.detachAsStream()); 33 SkAutoTUnref<SkStream> rStream(wStream.detachAsStream());
28 SkAutoTUnref<SkPicture> reconstructed(SkPicture::CreateFromStream(rStream)); 34 SkAutoTUnref<SkPicture> reconstructed(SkPicture::CreateFromStream(rStream));
29 35
30 SkBitmap bitmap; 36 SkBitmap bitmap;
31 AllocatePixels(fReference, &bitmap); 37 AllocatePixels(fReference, &bitmap);
32 DrawPicture(reconstructed, &bitmap); 38 DrawPicture(*reconstructed, &bitmap);
33 if (!BitmapsEqual(bitmap, fReference)) { 39 if (!BitmapsEqual(bitmap, fReference)) {
34 this->fail(); 40 this->fail();
35 this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap))); 41 this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap)));
36 } 42 }
37 } 43 }
38 44
39 bool SerializeTask::shouldSkip() const { 45 bool SerializeTask::shouldSkip() const {
40 return !FLAGS_serialize || fGM->getFlags() & skiagm::GM::kSkipPicture_Flag; 46 if (fGM->getFlags() & skiagm::GM::kSkipPicture_Flag) {
47 return true;
48 }
49 switch (fMode) {
robertphillips 2014/06/24 18:34:46 formatting ?
mtklein 2014/06/24 19:17:03 Ditto.
50 case kNormal_Mode: if (!FLAGS_serialize) return true; break;
51 case kSkRecord_Mode: if (!FLAGS_skr) return true; break;
52 }
53 return false;
41 } 54 }
42 55
43 } // namespace DM 56 } // namespace DM
OLDNEW
« dm/DMSKPTask.cpp ('K') | « dm/DMSerializeTask.h ('k') | dm/DMUtil.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698