diff options
| author | John Reck <jreck@google.com> | 2015-02-04 14:47:23 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2015-02-04 14:47:23 -0800 |
| commit | 3f5175fccd39c341064e8bd86cb03dba4bc6881c (patch) | |
| tree | 0fb273df4aed6739bbeba197a9f31635bdbbc7a3 /libs/hwui/PathCache.cpp | |
| parent | 37a6ad9755cbf49929f089523c99ad187f22b63b (diff) | |
| parent | c7e6b93aba9dce93aacb05b5d9f59d09eddb0329 (diff) | |
| download | frameworks_base-3f5175fccd39c341064e8bd86cb03dba4bc6881c.zip frameworks_base-3f5175fccd39c341064e8bd86cb03dba4bc6881c.tar.gz frameworks_base-3f5175fccd39c341064e8bd86cb03dba4bc6881c.tar.bz2 | |
resolved conflicts for merge of c7e6b93a to master
Change-Id: I4b791f37193727a0306214645f2f98cdf218cad0
Diffstat (limited to 'libs/hwui/PathCache.cpp')
| -rw-r--r-- | libs/hwui/PathCache.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/PathCache.cpp b/libs/hwui/PathCache.cpp index d6eff85..e2caf8b 100644 --- a/libs/hwui/PathCache.cpp +++ b/libs/hwui/PathCache.cpp @@ -492,7 +492,9 @@ void PathCache::precache(const SkPath* path, const SkPaint* paint) { if (mProcessor == nullptr) { mProcessor = new PathProcessor(Caches::getInstance()); } - mProcessor->add(task); + if (!mProcessor->add(task)) { + mProcessor->process(task); + } } } |