don't call the inherited saveLayer in record, but just call save.
During record, our clip is wide-open (in the bug's case, 40K pixels tall). If we call saveLayer
with no bounds (as webkit does), we try to allocate an offscreen the size of the document, which
can be arbitrarily big. This cause us to run out of memory. In reality, I think there is not
benefit to calling through to saveLayer during record. On playback, we will of course call saveLayer,
but then we are on a real device (screen) with finite bounds, and the offscreen allocation is
reasonable.
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index c7f2c6c..b565fc1 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -45,7 +45,13 @@
fRestoreOffsetStack.push(0);
validate();
- return this->INHERITED::saveLayer(bounds, paint, flags);
+ /* Don't actually call saveLayer, because that will try to allocate an
+ offscreen device (potentially very big) which we don't actually need
+ at this time (and may not be able to afford since during record our
+ clip starts out the size of the picture, which is often much larger
+ than the size of the actual device we'll use during playback).
+ */
+ return this->INHERITED::save(flags);
}
void SkPictureRecord::restore() {
