am: f474056e99

* commit 'f474056e99de892b731155989ee0d9dae1d3eea7':
  Pulling in https://android-review.googlesource.com/#/c/186482/1
This commit is contained in:
Nancy Zheng
2016-01-14 00:12:14 +00: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() {