From 569b02151f399628b0c0c0ca825dfe7b6e2795e1 Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 27 Apr 2016 09:29:34 -0700 Subject: Revert of Enable flattening of SkRecordedDrawable (patchset #8 id:140001 of https://codereview.chromium.org/1913843002/ ) Reason for revert: Release mode bots appear to be crashing while loading .skp files in nanobench. Original issue's description: > Enable flattening of SkRecordedDrawable > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1913843002 > > Committed: https://skia.googlesource.com/skia/+/d636950e8ecba89c0021ce4e76037c67aa6ee2cd TBR=djsollen@google.com,reed@google.com,msarett@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/1923393002 --- tests/FlattenDrawableTest.cpp | 39 --------------------------------------- 1 file changed, 39 deletions(-) (limited to 'tests/FlattenDrawableTest.cpp') diff --git a/tests/FlattenDrawableTest.cpp b/tests/FlattenDrawableTest.cpp index 2132729330..c7fff12326 100644 --- a/tests/FlattenDrawableTest.cpp +++ b/tests/FlattenDrawableTest.cpp @@ -246,42 +246,3 @@ DEF_TEST(FlattenDrawable, r) { REPORTER_ASSERT(r, 3 == integer->c()); REPORTER_ASSERT(r, 4 == integer->d()); } - -DEF_TEST(FlattenRecordedDrawable, r) { - // Record a set of canvas draw commands - SkPictureRecorder recorder; - SkCanvas* canvas = recorder.beginRecording(1000.0f, 1000.0f); - canvas->drawPoint(42.0f, 17.0f, SK_ColorGREEN); - SkPaint paint; - paint.setColor(SK_ColorRED); - canvas->drawPaint(paint); - SkPaint textPaint; - textPaint.setColor(SK_ColorBLUE); - canvas->drawText("TEXT", 4, 467.0f, 100.0f, textPaint); - - // Draw some drawables as well - SkAutoTUnref drawable(new IntDrawable(1, 2, 3, 4)); - SkAutoTUnref root(new RootDrawable(5, 6, 7, 8, paint, 9, 10, 11, 12, drawable)); - canvas->drawDrawable(root, 747.0f, 242.0f); - SkAutoTUnref paintDrawable(new PaintDrawable(paint)); - canvas->drawDrawable(paintDrawable, 500.0, 500.0f); - SkAutoTUnref comDrawable(new CompoundDrawable(13, 14, 15, 16, textPaint)); - canvas->drawDrawable(comDrawable, 10.0f, 10.0f); - - // Serialize the recorded drawable - sk_sp recordedDrawable = recorder.finishRecordingAsDrawable(); - SkWriteBuffer writeBuffer; - writeBuffer.writeFlattenable(recordedDrawable.get()); - - // Copy the contents of the write buffer into a read buffer - sk_sp data = SkData::MakeUninitialized(writeBuffer.bytesWritten()); - writeBuffer.writeToMemory(data->writable_data()); - SkReadBuffer readBuffer(data->data(), data->size()); - register_test_drawables(readBuffer); - - // Deserialize and verify the drawable - SkAutoTUnref out((SkDrawable*) - readBuffer.readFlattenable(SkFlattenable::kSkDrawable_Type)); - REPORTER_ASSERT(r, out); - REPORTER_ASSERT(r, !strcmp("SkRecordedDrawable", out->getTypeName())); -} -- cgit v1.2.3