Revert "Fix recent apps in system UI for Skia pipeline"

This reverts commit b33013fb3c.

Reason for revert: Caused a memory leak, b/38330767
Bug: 38136140
Bug: 38330767
Test: manual, verified memory isn't leaking doing the steps in b/38330767

Change-Id: I98b2dfd750be57a15785808e2d5723616e2ce20a
This commit is contained in:
John Reck
2017-05-17 00:23:44 +00:00
parent b33013fb3c
commit 59069e00a8
12 changed files with 30 additions and 192 deletions

View File

@@ -17,7 +17,6 @@
#include "RenderThread.h"
#include "../renderstate/RenderState.h"
#include "../pipeline/skia/SkiaOpenGLPipeline.h"
#include "../pipeline/skia/SkiaOpenGLReadback.h"
#include "CanvasContext.h"
#include "EglManager.h"
@@ -434,24 +433,6 @@ RenderTask* RenderThread::nextTask(nsecs_t* nextWakeup) {
return next;
}
sk_sp<SkImage> RenderThread::makeTextureImage(Bitmap* bitmap) {
auto renderType = Properties::getRenderPipelineType();
sk_sp<SkImage> hardwareImage;
switch (renderType) {
case RenderPipelineType::SkiaGL:
hardwareImage = skiapipeline::SkiaOpenGLPipeline::makeTextureImage(*this, bitmap);
break;
case RenderPipelineType::SkiaVulkan:
//TODO: add Vulkan support
break;
default:
LOG_ALWAYS_FATAL("makeTextureImage: canvas context type %d not supported",
(int32_t) renderType);
break;
}
return hardwareImage;
}
} /* namespace renderthread */
} /* namespace uirenderer */
} /* namespace android */