Merge "Fix memory leak in HWUI"

am: 85b010b826

* commit '85b010b826129cd1a2090daa533e843b5573aea4':
  Fix memory leak in HWUI
This commit is contained in:
John Reck
2015-12-11 12:48:28 -08:00
committed by android-build-merger
3 changed files with 4 additions and 4 deletions

View File

@@ -117,7 +117,7 @@ void Caches::initStaticProperties() {
void Caches::terminate() {
if (!mInitialized) return;
mRegionMesh.release();
mRegionMesh.reset(nullptr);
fboCache.clear();

View File

@@ -194,7 +194,7 @@ void Lookup3GammaFontRenderer::endPrecaching() {
void Lookup3GammaFontRenderer::clear() {
for (int i = 0; i < kGammaCount; i++) {
mRenderers[i].release();
mRenderers[i].reset(nullptr);
}
}
@@ -215,7 +215,7 @@ void Lookup3GammaFontRenderer::flush() {
if (count <= 1 || min < 0) return;
mRenderers[min].release();
mRenderers[min].reset(nullptr);
// Also eliminate the caches for large glyphs, as they consume significant memory
for (int i = 0; i < kGammaCount; ++i) {

View File

@@ -251,7 +251,7 @@ void Layer::defer(const OpenGLRenderer& rootRenderer) {
void Layer::cancelDefer() {
renderNode = nullptr;
deferredUpdateScheduled = false;
deferredList.release();
deferredList.reset(nullptr);
}
void Layer::flush() {