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

am 59131481: Merge "Remove unnecessary & uninitialized variable Bug #7728929"

Browse Source 
* commit '5913148104f0b233d861fab2873befc865bf57c0':
  Remove unnecessary & uninitialized variable Bug #7728929
This commit is contained in:
Romain Guy
2013-01-03 14:48:35 -08:00
committed by Android Git Automerger
parent 65dcf5322f 5913148104
commit e0ece54bd9
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libs/hwui/GradientCache.cpp
View File

@@ -49,7 +49,6 @@ static inline T min(T a, T b) {
hash_t GradientCacheEntry::hash() const {
uint32_t hash = JenkinsHashMix(0, count);
hash = JenkinsHashMix(hash, tileMode);
for (uint32_t i = 0; i < count; i++) {
hash = JenkinsHashMix(hash, android::hash_type(colors[i]));
hash = JenkinsHashMix(hash, android::hash_type(positions[i]));
@@ -61,9 +60,6 @@ int GradientCacheEntry::compare(const GradientCacheEntry& lhs, const GradientCac
int deltaInt = int(lhs.count) - int(rhs.count);
if (deltaInt != 0) return deltaInt;
deltaInt = lhs.tileMode - rhs.tileMode;
if (deltaInt != 0) return deltaInt;
deltaInt = memcmp(lhs.colors, rhs.colors, lhs.count * sizeof(uint32_t));
if (deltaInt != 0) return deltaInt;
@@ -127,9 +123,7 @@ void GradientCache::operator()(GradientCacheEntry& shader, Texture*& texture) {
if (texture) {
const uint32_t size = texture->width * texture->height * GRADIENT_BYTES_PER_PIXEL;
mSize -= size;
}
if (texture) {
glDeleteTextures(1, &texture->id);
delete texture;
}
@@ -140,7 +134,6 @@ void GradientCache::operator()(GradientCacheEntry& shader, Texture*& texture) {
///////////////////////////////////////////////////////////////////////////////
Texture* GradientCache::get(uint32_t* colors, float* positions, int count) {
GradientCacheEntry gradient(colors, positions, count);
Texture* texture = mCache.get(gradient);
@@ -189,7 +182,7 @@ Texture* GradientCache::addLinearGradient(GradientCacheEntry& gradient,
// Asume the cache is always big enough
const uint32_t size = texture->width * texture->height * GRADIENT_BYTES_PER_PIXEL;
while (mSize + size > mMaxSize) {
while (getSize() + size > mMaxSize) {
mCache.removeOldest();
}

2
libs/hwui/GradientCache.h
View File

@@ -76,10 +76,8 @@ struct GradientCacheEntry {
uint32_t* colors;
float* positions;
uint32_t count;
SkShader::TileMode tileMode;
private:
void copy(uint32_t* colors, float* positions, uint32_t count) {
this->count = count;
this->colors = new uint32_t[count];