Index: src/core/SkPicturePlayback.cpp |
=================================================================== |
--- src/core/SkPicturePlayback.cpp (revision 13719) |
+++ src/core/SkPicturePlayback.cpp (working copy) |
@@ -725,7 +725,7 @@ |
// The activeOps parameter is actually "const SkTDArray<SkPictureStateTree::Draw*>&". |
// It represents the operations about to be drawn, as generated by some spatial |
// subdivision helper class. It should already be in 'fOffset' sorted order. |
-void SkPicturePlayback::preLoadBitmaps(const SkTDArray<void*>& activeOps) { |
+void SkPicturePlayback::preLoadBitmaps(SkCanvas& canvas, const SkTDArray<void*>& activeOps) { |
if (0 == activeOps.count() || NULL == fBitmapUseOffsets) { |
return; |
} |
@@ -762,7 +762,8 @@ |
} |
for (int i = 0; i < active.count(); ++i) { |
- SkDebugf("preload texture %d\n", active[i]); |
+ SkASSERT(SkBitmapHeap::INVALID_SLOT != active[i]); |
+ canvas.internalPrivate_PreLoad((*fBitmaps)[active[i]], SkIRect::MakeWH(0, 0)); |
} |
} |
@@ -815,7 +816,7 @@ |
reader.setOffset(skipTo); |
} |
- this->preLoadBitmaps(activeOps); |
+ this->preLoadBitmaps(canvas, activeOps); |
// Record this, so we can concat w/ it if we encounter a setMatrix() |
SkMatrix initialMatrix = canvas.getTotalMatrix(); |