Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e0a2435c: Merge "Properly account for created paths in the cache" into klp-dev

Browse Source 
* commit 'e0a2435cb390c4333e3d40ede4d163566d779962':
  Properly account for created paths in the cache
This commit is contained in:
Romain Guy
2013-08-21 17:38:45 -07:00
committed by Android Git Automerger
parent 3558cce0d2 e0a2435cb3
commit b7db6d73a4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/hwui/PathCache.cpp
View File

@@ -283,6 +283,11 @@ void PathCache::generateTexture(const PathDescription& entry, SkBitmap* bitmap,
mCache.put(entry, texture); mCache.put(entry, texture);
} }
} else { } else {
// It's okay to add a texture that's bigger than the cache since
// we'll trim the cache later when addToCache is set to false
if (!addToCache) {
mSize += size;
}
texture->cleanup = true; texture->cleanup = true;
} }
} }

2
libs/hwui/thread/TaskManager.cpp
View File

@@ -29,7 +29,7 @@ namespace uirenderer {
TaskManager::TaskManager() { TaskManager::TaskManager() {
// Get the number of available CPUs. This value does not change over time. // Get the number of available CPUs. This value does not change over time.
int cpuCount = sysconf(_SC_NPROCESSORS_ONLN); int cpuCount = sysconf(_SC_NPROCESSORS_CONF);
for (int i = 0; i < cpuCount / 2; i++) { for (int i = 0; i < cpuCount / 2; i++) {
String8 name; String8 name;