DM::SKPSrc::size() reports correct size.

dm/DMSrcSink.cpp

 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkCommonFlags.h"
 #include "SkDocument.h"
 #include "SkMultiPictureDraw.h"
 #include "SkOSFile.h"
+#include "SkPictureData.h"
 #include "SkPictureRecorder.h"
 #include "SkRandom.h"
 #include "SkStream.h"
 
 namespace DM {
 
 GMSrc::GMSrc(skiagm::GMRegistry::Factory factory) : fFactory(factory) {}
 
 Error GMSrc::draw(SkCanvas* canvas) const {
     SkAutoTDelete<skiagm::GM> gm(fFactory(NULL));
@@ skipping 77 matching lines @@
 Name ImageSrc::name() const {
     Name name = SkOSPath::Basename(fPath.c_str());
     if (fSubsets > 0) {
         name.appendf("-%d-subsets", fSubsets);
     }
     return name;
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
-static const SkRect kSKPViewport = {0,0, 1000,1000};
-
 SKPSrc::SKPSrc(SkString path) : fPath(path) {}
 
 Error SKPSrc::draw(SkCanvas* canvas) const {
     SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(fPath.c_str()));
     if (!stream) {
         return SkStringPrintf("Couldn't read %s.", fPath.c_str());
     }
     SkAutoTUnref<SkPicture> pic(SkPicture::CreateFromStream(stream));
     if (!pic) {
         return SkStringPrintf("Couldn't decode %s as a picture.", fPath.c_str());
     }
     stream.reset((SkStream*)NULL);  // Might as well drop this when we're done with it.
-    canvas->clipRect(kSKPViewport);
     canvas->drawPicture(pic);
     return "";
 }
 
 SkISize SKPSrc::size() const {
-    // This may be unnecessarily large.
-    return kSKPViewport.roundOut().size();
+    SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(fPath.c_str()));
+    SkPictInfo info;
+    if (!stream || !SkPicture::InternalOnly_StreamIsSKP(stream, &info)) {
+        return SkISize::Make(0,0);
+    }
+    return info.fCullRect.roundOut().size();
 }
 
 Name SKPSrc::name() const { return SkOSPath::Basename(fPath.c_str()); }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
+static SkISize limit_raster_dimensions(const SkISize& size) {
+    // Clamp both dimensions to 2K to stay within typical GPU maximum texture limits.
+    int width  = SkTMin(2048, size.width()),
+        height = SkTMin(2048, size.height());
+    // Clamp our largest dimension until we're no more than 2.25 megapixels, to keep RAM usage sane.
+    int& largest = width > height ? width : height;
+    while (width * height > 2359296) {
+        largest /= 2;
+    }
+    return SkISize::Make(width, height);
+}
+
 GPUSink::GPUSink(GrContextFactory::GLContextType ct,
                  GrGLStandard api,
                  int samples,
                  bool dfText,
                  bool threaded)
     : fContextType(ct)
     , fGpuAPI(api)
     , fSampleCount(samples)
     , fUseDFText(dfText)
     , fThreaded(threaded) {}
 
 int GPUSink::enclave() const {
     return fThreaded ? kAnyThread_Enclave : kGPU_Enclave;
 }
 
 Error GPUSink::draw(const Src& src, SkBitmap* dst, SkWStream*) const {
     GrContextFactory factory;
-    const SkISize size = src.size();
+    const SkISize size = limit_raster_dimensions(src.size());
     const SkImageInfo info =
         SkImageInfo::Make(size.width(), size.height(), kN32_SkColorType, kPremul_SkAlphaType);
     SkAutoTUnref<SkSurface> surface(
             NewGpuSurface(&factory, fContextType, fGpuAPI, info, fSampleCount, fUseDFText));
     if (!surface) {
         return "Could not create a surface.";
     }
     SkCanvas* canvas = surface->getCanvas();
     Error err = src.draw(canvas);
     if (!err.isEmpty()) {
@@ skipping 62 matching lines @@
     SkAutoTUnref<SkPicture> pic(recorder.endRecording());
     pic->serialize(dst);
     return "";
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 RasterSink::RasterSink(SkColorType colorType) : fColorType(colorType) {}
 
 Error RasterSink::draw(const Src& src, SkBitmap* dst, SkWStream*) const {
-    const SkISize size = src.size();
+    const SkISize size = limit_raster_dimensions(src.size());
     // If there's an appropriate alpha type for this color type, use it, otherwise use premul.
     SkAlphaType alphaType = kPremul_SkAlphaType;
     (void)SkColorTypeValidateAlphaType(fColorType, alphaType, &alphaType);
 
     dst->allocPixels(SkImageInfo::Make(size.width(), size.height(), fColorType, alphaType));
     dst->eraseColor(SK_ColorTRANSPARENT);
     SkCanvas canvas(*dst);
     return src.draw(&canvas);
 }
 
@@ skipping 138 matching lines @@
             surfaces.unrefAll();
             return "";
         }
         SkISize size() const SK_OVERRIDE { return fSize; }
         Name name() const SK_OVERRIDE { sk_throw(); return ""; }  // No one should be calling this.
     } proxy(fW, fH, pic, src.size());
     return fSink->draw(proxy, bitmap, stream);
 }
 
 }  // namespace DM