| Index: src/gpu/GrLayerCache.cpp
|
| diff --git a/src/gpu/GrLayerCache.cpp b/src/gpu/GrLayerCache.cpp
|
| index 4d5f2b46f8b967e0105735fcdc589110cba14dd1..4a2060779a22fc341a8183dba5f6d22b771076e7 100644
|
| --- a/src/gpu/GrLayerCache.cpp
|
| +++ b/src/gpu/GrLayerCache.cpp
|
| @@ -128,7 +128,7 @@ GrCachedLayer* GrLayerCache::createLayer(uint32_t pictureID,
|
| const SkIRect& srcIR,
|
| const SkIRect& dstIR,
|
| const SkMatrix& initialMat,
|
| - const unsigned* key,
|
| + const int* key,
|
| int keySize,
|
| const SkPaint* paint) {
|
| SkASSERT(pictureID != SK_InvalidGenID && start >= 0 && stop > 0);
|
| @@ -141,7 +141,7 @@ GrCachedLayer* GrLayerCache::createLayer(uint32_t pictureID,
|
| }
|
|
|
| GrCachedLayer* GrLayerCache::findLayer(uint32_t pictureID, const SkMatrix& initialMat,
|
| - const unsigned* key, int keySize) {
|
| + const int* key, int keySize) {
|
| SkASSERT(pictureID != SK_InvalidGenID);
|
| return fLayerHash.find(GrCachedLayer::Key(pictureID, initialMat, key, keySize));
|
| }
|
| @@ -151,7 +151,7 @@ GrCachedLayer* GrLayerCache::findLayerOrCreate(uint32_t pictureID,
|
| const SkIRect& srcIR,
|
| const SkIRect& dstIR,
|
| const SkMatrix& initialMat,
|
| - const unsigned* key,
|
| + const int* key,
|
| int keySize,
|
| const SkPaint* paint) {
|
| SkASSERT(pictureID != SK_InvalidGenID && start >= 0 && stop > 0);
|
| @@ -216,7 +216,7 @@ bool GrLayerCache::tryToAtlas(GrCachedLayer* layer,
|
| pictInfo->incPlotUsage(plot->id());
|
| #endif
|
| // The layer was successfully added to the atlas
|
| - const SkIRect bounds = SkIRect::MakeXYWH(loc.fX, loc.fY,
|
| + const SkIRect bounds = SkIRect::MakeXYWH(loc.fX, loc.fY,
|
| desc.fWidth, desc.fHeight);
|
| layer->setTexture(fAtlas->getTexture(), bounds);
|
| layer->setPlot(plot);
|
|
|