Make rasterallocator test a bit better.
This cleans up some of the names to make it easier to understand.
Unfortunately, this also disables the 'common' code since it has issues
with pic-8888 and serialize-8888 configs.
Change-Id: I059d7594c357ba588daeb29643d242f7f510ecc1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/218968
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Ben Wagner <bungeman@google.com>
diff --git a/gm/rasterhandleallocator.cpp b/gm/rasterhandleallocator.cpp
index 08c95da..1f3f3ea 100644
--- a/gm/rasterhandleallocator.cpp
+++ b/gm/rasterhandleallocator.cpp
@@ -226,7 +226,6 @@
#endif
-#ifdef MyAllocator
DEF_SIMPLE_GM(rasterallocator, canvas, 600, 300) {
auto doDraw = [](GraphicsPort* port) {
SkAutoCanvasRestore acr(port->peekCanvas(), true);
@@ -246,20 +245,22 @@
port->drawRect({0, 0, 256, 256}, 0xFFCCCCCC);
};
- GraphicsPort skp(canvas);
- doDraw(&skp);
+ // TODO: this common code fails pic-8888 and serialize-8888
+ sk_ignore_unused_variable(doDraw);
+ //GraphicsPort skiaPort(canvas);
+ //doDraw(&skiaPort);
+#ifdef MyAllocator
const SkImageInfo info = SkImageInfo::MakeN32Premul(256, 256);
- std::unique_ptr<SkCanvas> c2 =
+ std::unique_ptr<SkCanvas> nativeCanvas =
SkRasterHandleAllocator::MakeCanvas(skstd::make_unique<MyAllocator>(), info);
- MyPort cgp(c2.get());
- doDraw(&cgp);
+ MyPort nativePort(nativeCanvas.get());
+ doDraw(&nativePort);
SkPixmap pm;
- c2->peekPixels(&pm);
+ nativeCanvas->peekPixels(&pm);
SkBitmap bm;
bm.installPixels(pm);
canvas->drawBitmap(bm, 280, 0, nullptr);
-
-}
#endif
+}