diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-27 20:22:23 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-27 20:22:23 +0000 |
| commit | 23d2cf9b072e75ef37e8eec466b811a9e2da643d (patch) | |
| tree | a29d2cc917c833272056676fea7c08ee84658ba7 /src/core/SkScaledImageCache.h | |
| parent | a50418f65e857ff05b3a71d3e03db44c1f232977 (diff) | |
Trying to add the same scaled image twice shouldn't assert.
This unbreaks bench_pictures --multi foo for me.
BUG=skia:1868
R=reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/89293002
git-svn-id: http://skia.googlecode.com/svn/trunk@12422 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkScaledImageCache.h')
| -rw-r--r-- | src/core/SkScaledImageCache.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/SkScaledImageCache.h b/src/core/SkScaledImageCache.h index fee69d2d58..44ef1f8a2c 100644 --- a/src/core/SkScaledImageCache.h +++ b/src/core/SkScaledImageCache.h @@ -126,6 +126,7 @@ public: public: struct Rec; + struct Key; private: Rec* fHead; Rec* fTail; @@ -139,7 +140,8 @@ private: Rec* findAndLock(uint32_t generationID, SkScalar sx, SkScalar sy, const SkIRect& bounds); - void addAndLock(Rec* rec); + Rec* findAndLock(const Key& key); + ID* addAndLock(Rec* rec); void purgeAsNeeded(); |