Move HWUI boilerplate into utils/android

Duplicate code from the HWUI backends for DM and nanobench
moves into a single place, saving a hundred lines or more of
cut-and-paste.

There's some indication that this increases the incidence of
SkCanvas "Unable to find device for layer." warnings, but no
clear degradation in test results.

R=djsollen@google.com,mtklein@google.com
BUG=skia:3589

Review URL: https://codereview.chromium.org/1036303002

2 files changed, 11 insertions, 130 deletions

diff --git a/bench/nanobenchAndroid.cpp b/bench/nanobenchAndroid.cpp
index 8bda1c8625..3d5cda4929 100644
--- a/bench/nanobenchAndroid.cpp
+++ b/bench/nanobenchAndroid.cpp
@@ -14,51 +14,32 @@
 #include "android/native_window.h"
 #include "renderthread/TimeLord.h"
 
-namespace {
-
-/**
- * Helper class for setting up android::uirenderer::renderthread::RenderProxy.
- */
-class ContextFactory : public android::uirenderer::IContextFactory {
-public:
-    android::uirenderer::AnimationContext* createAnimationContext
-        (android::uirenderer::renderthread::TimeLord& clock) override {
-        return new android::uirenderer::AnimationContext(clock);
-    }
-};
-
-}
+/* These functions are only compiled in the Android Framework. */
 
 HWUITarget::HWUITarget(const Config& c, Benchmark* bench) : Target(c) { }
 
 void HWUITarget::setup() {
-    this->proxy->fence();
+    this->renderer.proxy->fence();
 }
 
 SkCanvas* HWUITarget::beginTiming(SkCanvas* canvas) {
-    this->renderer->prepare();
-    this->renderer->clipRect(0, 0, this->size.width(), this->size.height(),
-                               SkRegion::Op::kReplace_Op);
-    SkCanvas* targetCanvas = this->renderer->asSkCanvas();
+    SkCanvas* targetCanvas = this->renderer.prepareToDraw();
     if (targetCanvas) {
         this->fc.reset(targetCanvas);
         canvas = &this->fc;
         // This might minimally distort timing, but canvas isn't valid outside the timer.
         canvas->clear(SK_ColorWHITE);
-        }
+    }
+
     return canvas;
 }
 
 void HWUITarget::endTiming() {
-    this->renderer->finish();
-    this->rootNode->setStagingDisplayList(this->renderer->finishRecording());
-    this->proxy->syncAndDrawFrame();
-    // Surprisingly, calling this->proxy->fence() here appears to make no difference to
-    // the timings we record.
+    this->renderer.finishDrawing();
 }
 
 void HWUITarget::fence() {
-    this->proxy->fence();
+    this->renderer.proxy->fence();
 }
 
 bool HWUITarget::needsFrameTiming() const {
@@ -66,95 +47,12 @@ bool HWUITarget::needsFrameTiming() const {
 }
 
 bool HWUITarget::init(SkImageInfo info, Benchmark* bench) {
-    // extracted from DMSrcSinkAndroid.cpp's HWUISink::draw()
-    size.set(bench->getSize().x(), bench->getSize().y());
-    android::BufferQueue::createBufferQueue(&this->producer, &this->consumer);
-    this->cpuConsumer = new android::CpuConsumer(this->consumer, 1);
-    this->cpuConsumer->setName(android::String8("SkiaBenchmarkClient"));
-    this->cpuConsumer->setDefaultBufferSize(size.width(), size.height());
-    this->androidSurface = new android::Surface(this->producer);
-    native_window_set_buffers_dimensions(this->androidSurface.get(),
-                                         size.width(), size.height());
-    native_window_set_buffers_format(this->androidSurface.get(),
-                                     android::PIXEL_FORMAT_RGBA_8888);
-    native_window_set_usage(this->androidSurface.get(), GRALLOC_USAGE_SW_READ_OFTEN |
-                                           GRALLOC_USAGE_SW_WRITE_NEVER |
-                                           GRALLOC_USAGE_HW_RENDER);
-    this->rootNode.reset(new android::uirenderer::RenderNode());
-    this->rootNode->incStrong(nullptr);
-    this->rootNode->mutateStagingProperties().setLeftTopRightBottom
-        (0, 0, size.width(), size.height());
-    this->rootNode->mutateStagingProperties().setClipToBounds(false);
-    this->rootNode->setPropertyFieldsDirty(android::uirenderer::RenderNode::GENERIC);
-    ContextFactory factory;
-    this->proxy.reset
-        (new android::uirenderer::renderthread::RenderProxy(false, this->rootNode, &factory));
-    this->proxy->loadSystemProperties();
-    this->proxy->initialize(this->androidSurface.get());
-    float lightX = size.width() / 2.0f;
-    android::uirenderer::Vector3 lightVector { lightX, -200.0f, 800.0f };
-    this->proxy->setup(size.width(), size.height(), lightVector, 800.0f,
-                         255 * 0.075f, 255 * 0.15f);
-    this->renderer.reset(new android::uirenderer::DisplayListRenderer());
-    this->renderer->setViewport(size.width(), size.height());
-
-    // Since we have no SkSurface for HWUI, other parts of the code base have to
-    // explicitly work around the fact that it may be invalid / have no SkCanvas.
-
+    this->renderer.initialize({bench->getSize().x(), bench->getSize().y()});
     return true;
 }
 
 bool HWUITarget::capturePixels(SkBitmap* bmp) {
-    SkImageInfo destinationConfig =
-        SkImageInfo::Make(this->size.width(), this->size.height(),
-                          kRGBA_8888_SkColorType, kPremul_SkAlphaType);
-    bmp->allocPixels(destinationConfig);
-    sk_memset32((uint32_t*) bmp->getPixels(), SK_ColorRED,
-                this->size.width() * this->size.height());
-
-    android::CpuConsumer::LockedBuffer nativeBuffer;
-    android::status_t retval = this->cpuConsumer->lockNextBuffer(&nativeBuffer);
-    if (retval == android::BAD_VALUE) {
-        SkDebugf("write_canvas_png() got no buffer; returning transparent");
-        // No buffer ready to read - commonly triggered by dm sending us
-        // a no-op source, or calling code that doesn't do anything on this
-        // backend.
-        bmp->eraseColor(SK_ColorTRANSPARENT);
-        return false;
-    } else if (retval) {
-        SkDebugf("Failed to lock buffer to read pixels: %d.", retval);
-        return false;
-    }
-
-    // Move the pixels into the destination SkBitmap
-
-    SK_ALWAYSBREAK(nativeBuffer.format == android::PIXEL_FORMAT_RGBA_8888 &&
-                   "Native buffer not RGBA!");
-    SkImageInfo nativeConfig =
-        SkImageInfo::Make(nativeBuffer.width, nativeBuffer.height,
-                          kRGBA_8888_SkColorType, kPremul_SkAlphaType);
-
-    // Android stride is in pixels, Skia stride is in bytes
-    SkBitmap nativeWrapper;
-    bool success =
-        nativeWrapper.installPixels(nativeConfig, nativeBuffer.data, nativeBuffer.stride * 4);
-    if (!success) {
-        SkDebugf("Failed to wrap HWUI buffer in a SkBitmap");
-        return false;
-    }
-
-    SK_ALWAYSBREAK(bmp->colorType() == kRGBA_8888_SkColorType &&
-                   "Destination buffer not RGBA!");
-    success =
-        nativeWrapper.readPixels(destinationConfig, bmp->getPixels(), bmp->rowBytes(), 0, 0);
-    if (!success) {
-        SkDebugf("Failed to extract pixels from HWUI buffer");
-        return false;
-    }
-
-    this->cpuConsumer->unlockBuffer(nativeBuffer);
-
-    return true;
+    return this->renderer.capturePixels(bmp);
 }
 
 
diff --git a/bench/nanobenchAndroid.h b/bench/nanobenchAndroid.h
index 3baeb1270f..7f6ff441d6 100644
--- a/bench/nanobenchAndroid.h
+++ b/bench/nanobenchAndroid.h
@@ -8,29 +8,15 @@
 #ifndef nanobenchAndroid_DEFINED
 #define nanobenchAndroid_DEFINED
 
-#include "DisplayListRenderer.h"
-#include "RenderNode.h"
 #include "SkAndroidSDKCanvas.h"
-#include "gui/BufferQueue.h"
-#include "gui/CpuConsumer.h"
-#include "gui/IGraphicBufferConsumer.h"
-#include "gui/IGraphicBufferProducer.h"
-#include "gui/Surface.h"
-#include "renderthread/RenderProxy.h"
+#include "SkHwuiRenderer.h"
 
 #include "nanobench.h"
 
 struct HWUITarget : public Target {
     explicit HWUITarget(const Config& c, Benchmark* bench);
 
-    SkAutoTDelete<android::uirenderer::RenderNode> rootNode;
-    SkAutoTDelete<android::uirenderer::renderthread::RenderProxy> proxy;
-    SkAutoTDelete<android::uirenderer::DisplayListRenderer> renderer;
-    android::sp<android::IGraphicBufferProducer> producer;
-    android::sp<android::IGraphicBufferConsumer> consumer;
-    android::sp<android::CpuConsumer> cpuConsumer;
-    android::sp<android::Surface> androidSurface;
-    SkISize size;
+    SkHwuiRenderer renderer;
     SkAndroidSDKCanvas fc;
 
     void setup() override;
@@ -39,11 +25,8 @@ struct HWUITarget : public Target {
     void fence() override;
     bool needsFrameTiming() const override;
 
-    /// Returns false if initialization fails
     bool init(SkImageInfo info, Benchmark* bench) override;
     bool capturePixels(SkBitmap* bmp) override;
 };
 
-
-
 #endif  // nanobenchAndroid_DEFINED