From bd3e8cb42c50e7250e75452cd7f5cddc0b574de3 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Mon, 13 Jul 2015 08:47:21 -0400 Subject: [PATCH] Cleanup skia test harness due to changes to DisplayListCanvas Review URL: https://codereview.chromium.org/1235823003 . --- src/utils/android/SkHwuiRenderer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/utils/android/SkHwuiRenderer.cpp b/src/utils/android/SkHwuiRenderer.cpp index 70b7e5b..4493be6 100644 --- a/src/utils/android/SkHwuiRenderer.cpp +++ b/src/utils/android/SkHwuiRenderer.cpp @@ -57,19 +57,17 @@ void SkHwuiRenderer::initialize(SkISize size) { 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 -- 2.7.4