Revert of DM::SKPSrc::size() reports correct size. (patchset #3 id:40001 of https://codereview.chromium.org/863243005/)

Reason for revert:
Still no good on Chrome OS bot:

http://build.chromium.org/p/client.skia/builders/Test-ChromeOS-Alex-GMA3150-x86-Release/builds/628/steps/dm/logs/stdio

Original issue's description:
> DM::SKPSrc::size() reports correct size.
>
> Also, DM::GPUSink and DM::RasterSink crop DM::Src::size() to 2048x2048.
>
> Motivation:
>   Improve PDF testing by printing the entire SKP.
>
> Source: http://crrev.com/863243004
>
> BUG=skia:3365
>
> Committed: https://skia.googlesource.com/skia/+/441b10eac09a1f44983e35da827a6b438a409e63
>
> CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu12-ShuttleA-GTX660-x86-Release-Trybot,Test-ChromeOS-Alex-GMA3150-x86-Release-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/d4dd58e43ca4551531ad6a9f54bfc5632ea45a80

TBR=halcanary@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3365

Review URL: https://codereview.chromium.org/886543005

2 files changed, 8 insertions, 29 deletions

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index f467a61a1e..a57192e881 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -4,7 +4,6 @@
 #include "SkDocument.h"
 #include "SkMultiPictureDraw.h"
 #include "SkOSFile.h"
-#include "SkPictureData.h"
 #include "SkPictureRecorder.h"
 #include "SkRandom.h"
 #include "SkStream.h"
@@ -102,6 +101,8 @@ Name ImageSrc::name() const {
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
+static const SkRect kSKPViewport = {0,0, 1000,1000};
+
 SKPSrc::SKPSrc(SkString path) : fPath(path) {}
 
 Error SKPSrc::draw(SkCanvas* canvas) const {
@@ -114,35 +115,20 @@ Error SKPSrc::draw(SkCanvas* canvas) const {
         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 {
-    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();
+    // This may be unnecessarily large.
+    return kSKPViewport.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,
@@ -160,7 +146,7 @@ int GPUSink::enclave() const {
 
 Error GPUSink::draw(const Src& src, SkBitmap* dst, SkWStream*) const {
     GrContextFactory factory;
-    const SkISize size = limit_raster_dimensions(src.size());
+    const SkISize size = src.size();
     const SkImageInfo info =
         SkImageInfo::Make(size.width(), size.height(), kN32_SkColorType, kPremul_SkAlphaType);
     SkAutoTUnref<SkSurface> surface(
@@ -243,7 +229,7 @@ Error SKPSink::draw(const Src& src, SkBitmap*, SkWStream* dst) const {
 RasterSink::RasterSink(SkColorType colorType) : fColorType(colorType) {}
 
 Error RasterSink::draw(const Src& src, SkBitmap* dst, SkWStream*) const {
-    const SkISize size = limit_raster_dimensions(src.size());
+    const SkISize size = 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);
diff --git a/gm/gm.h b/gm/gm.h
index 0de9875896..b474729366 100644
--- a/gm/gm.h
+++ b/gm/gm.h
@@ -53,14 +53,7 @@ namespace skiagm {
         void drawBackground(SkCanvas*);
         void drawContent(SkCanvas*);
 
-        SkISize getISize() {
-            SkISize size = this->onISize();
-            // Sanity cap on GM dimensions.
-            SkASSERT(size.width() * size.height() <= 2359296 &&  // 2.25 megapixels
-                     size.width()                 <= 2048    &&  // Typical GPU max dimension.
-                     size.height()                <= 2048);
-            return size;
-        }
+        SkISize getISize() { return this->onISize(); }
         const char* getName();
 
         virtual bool runAsBench() const { return false; }