Cleanup skia test harness due to changes to DisplayListCanvas

src/utils/android/SkHwuiRenderer.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkHwuiRenderer.h"
 
 #include "AnimationContext.h"
@@ skipping 39 matching lines @@
     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(), 800.0f,
                          255 * 0.075f, 255 * 0.15f);
     this->proxy->setLightCenter(lightVector);
-    this->canvas.reset(new android::uirenderer::DisplayListCanvas());
-    this->canvas->setViewport(size.width(), size.height());
+    this->canvas.reset(new android::uirenderer::DisplayListCanvas(size.width(), size.height()));
 }
 
 SkCanvas* SkHwuiRenderer::prepareToDraw() {
-    this->canvas->prepare();
+    this->canvas->reset(size.width(), size.height());
     this->canvas->clipRect(0, 0, this->size.width(), this->size.height(),
                            SkRegion::Op::kReplace_Op);
     return this->canvas->asSkCanvas();
 }
 
 void SkHwuiRenderer::finishDrawing() {
-    this->canvas->finish();
     this->rootNode->setStagingDisplayList(this->canvas->finishRecording());
     this->proxy->syncAndDrawFrame();
     // Surprisingly, calling this->proxy->fence() here appears to make no difference to
     // the timings we record.
 }
 
 bool SkHwuiRenderer::capturePixels(SkBitmap* bmp) {
     SkImageInfo destinationConfig =
         SkImageInfo::Make(this->size.width(), this->size.height(),
                           kRGBA_8888_SkColorType, kPremul_SkAlphaType);
@@ skipping 39 matching lines @@
     if (!success) {
         SkDebugf("Failed to extract pixels from HWUI buffer");
         return false;
     }
 
     this->cpuConsumer->unlockBuffer(nativeBuffer);
 
     return true;
 }