547e66531d
A change in the VM triggers a native memory error more aggressively than before, showing that there's a bug in the logic of recycling bitmaps. Since the pixel memory is allocated on the Java heap, nulling out the reference to that memory in the Java level Bitmap object can cause that memory to get collected at any time. Meanwhile, we may have a reference to that memory at the native level for rendering purposes, causing an error if/when we access that memory after it has been collected by the VM. The fix is to avoid setting the reference to the pixels to null unless we are not referring to it in native code. This is determined at the time we call recycle() - we return a boolean to indicate whether the native code is still using the memory. if not, the Java code can null out the reference and allow the VM to collect it. Otherwise, it will get collected later when the encompassing Bitmap object is collected. Issue #7339156 HTML5 tests crash the app (Vellamo) Change-Id: I3a0d6b9a6c5dd3b86cc2b0ff7719007e774b5e3c
130 lines
3.8 KiB
C++
130 lines
3.8 KiB
C++
/*
|
|
* Copyright (C) 2010 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef ANDROID_HWUI_RESOURCE_CACHE_H
|
|
#define ANDROID_HWUI_RESOURCE_CACHE_H
|
|
|
|
#include <cutils/compiler.h>
|
|
|
|
#include <SkBitmap.h>
|
|
#include <SkiaColorFilter.h>
|
|
#include <SkiaShader.h>
|
|
#include <utils/KeyedVector.h>
|
|
#include "Layer.h"
|
|
|
|
namespace android {
|
|
namespace uirenderer {
|
|
|
|
/**
|
|
* Type of Resource being cached
|
|
*/
|
|
enum ResourceType {
|
|
kBitmap,
|
|
kShader,
|
|
kColorFilter,
|
|
kPath,
|
|
kLayer
|
|
};
|
|
|
|
class ResourceReference {
|
|
public:
|
|
|
|
ResourceReference() { refCount = 0; recycled = false; destroyed = false;}
|
|
ResourceReference(ResourceType type) {
|
|
refCount = 0; recycled = false; destroyed = false; resourceType = type;
|
|
}
|
|
|
|
int refCount;
|
|
bool recycled;
|
|
bool destroyed;
|
|
ResourceType resourceType;
|
|
};
|
|
|
|
class ANDROID_API ResourceCache {
|
|
public:
|
|
ResourceCache();
|
|
~ResourceCache();
|
|
|
|
/**
|
|
* When using these two methods, make sure to only invoke the *Locked()
|
|
* variants of increment/decrementRefcount(), recyle() and destructor()
|
|
*/
|
|
void lock();
|
|
void unlock();
|
|
|
|
void incrementRefcount(SkPath* resource);
|
|
void incrementRefcount(SkBitmap* resource);
|
|
void incrementRefcount(SkiaShader* resource);
|
|
void incrementRefcount(SkiaColorFilter* resource);
|
|
void incrementRefcount(Layer* resource);
|
|
|
|
void incrementRefcountLocked(SkPath* resource);
|
|
void incrementRefcountLocked(SkBitmap* resource);
|
|
void incrementRefcountLocked(SkiaShader* resource);
|
|
void incrementRefcountLocked(SkiaColorFilter* resource);
|
|
void incrementRefcountLocked(Layer* resource);
|
|
|
|
void decrementRefcount(SkBitmap* resource);
|
|
void decrementRefcount(SkPath* resource);
|
|
void decrementRefcount(SkiaShader* resource);
|
|
void decrementRefcount(SkiaColorFilter* resource);
|
|
void decrementRefcount(Layer* resource);
|
|
|
|
void decrementRefcountLocked(SkBitmap* resource);
|
|
void decrementRefcountLocked(SkPath* resource);
|
|
void decrementRefcountLocked(SkiaShader* resource);
|
|
void decrementRefcountLocked(SkiaColorFilter* resource);
|
|
void decrementRefcountLocked(Layer* resource);
|
|
|
|
void destructor(SkPath* resource);
|
|
void destructor(SkBitmap* resource);
|
|
void destructor(SkiaShader* resource);
|
|
void destructor(SkiaColorFilter* resource);
|
|
|
|
void destructorLocked(SkPath* resource);
|
|
void destructorLocked(SkBitmap* resource);
|
|
void destructorLocked(SkiaShader* resource);
|
|
void destructorLocked(SkiaColorFilter* resource);
|
|
|
|
bool recycle(SkBitmap* resource);
|
|
bool recycleLocked(SkBitmap* resource);
|
|
|
|
private:
|
|
void deleteResourceReferenceLocked(void* resource, ResourceReference* ref);
|
|
|
|
void incrementRefcount(void* resource, ResourceType resourceType);
|
|
void incrementRefcountLocked(void* resource, ResourceType resourceType);
|
|
|
|
void decrementRefcount(void* resource);
|
|
void decrementRefcountLocked(void* resource);
|
|
|
|
void logCache();
|
|
|
|
/**
|
|
* Used to increment, decrement, and destroy. Incrementing is generally accessed on the UI
|
|
* thread, but destroying resources may be called from the GC thread, the finalizer thread,
|
|
* or a reference queue finalization thread.
|
|
*/
|
|
mutable Mutex mLock;
|
|
|
|
KeyedVector<void*, ResourceReference*>* mCache;
|
|
};
|
|
|
|
}; // namespace uirenderer
|
|
}; // namespace android
|
|
|
|
#endif // ANDROID_HWUI_RESOURCE_CACHE_H
|