diff options
| author | 2013-01-08 17:38:15 -0800 | |
|---|---|---|
| committer | 2013-01-08 17:38:15 -0800 | |
| commit | 19d4f1806a953b87435a2bb6fd8e738424e94003 (patch) | |
| tree | ab561da75ff49699432723e2904a89d5cda534e2 /libs/hwui/PathCache.cpp | |
| parent | 1a9853fef502ef4dac48476b8b588650ae5db4ce (diff) | |
| parent | c88c60bed1fdf5b84cc16905c8743453203c19a5 (diff) | |
resolved conflicts for merge of c88c60be to master-chromium
Change-Id: I3b4b42443312068e942aa779dfdc928afa7569fd
Diffstat (limited to 'libs/hwui/PathCache.cpp')
| -rw-r--r-- | libs/hwui/PathCache.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libs/hwui/PathCache.cpp b/libs/hwui/PathCache.cpp index 03ddf597b33a..4f682ed09328 100644 --- a/libs/hwui/PathCache.cpp +++ b/libs/hwui/PathCache.cpp @@ -93,9 +93,6 @@ PathTexture* PathCache::get(SkPath* path, SkPaint* paint) { PathCacheEntry entry(path, paint); PathTexture* texture = mCache.get(entry); - float left, top, offset; - uint32_t width, height; - if (!texture) { texture = addTexture(entry, path, paint); } else if (path->getGenerationID() != texture->generation) { |