Revert of allow pictures to have a full bounds

samplecode/SampleArc.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
@@ skipping 19 matching lines @@
     r.set(0, 0, 10, 10.5f);
     SkPath p, p2;
     SkString str, str2;
 
     p.addRect(r);
     SkParsePath::ToSVGString(p, &str);
     SkParsePath::FromSVGString(str.c_str(), &p2);
     SkParsePath::ToSVGString(p2, &str2);
 }
 
-#include "SkPictureRecorder.h"
-static void test_pictbounds(SkCanvas* canvas) {
-    SkRect r = SkRect::MakeXYWH(100, 50, 100, 100);
-    SkPictureRecorder recorder;
-    {
-        SkCanvas* c = recorder.beginRecording(r, NULL, 0);
-        c->drawOval(r, SkPaint());
-
-        SkIRect ir;
-        c->getClipDeviceBounds(&ir);
-        SkDebugf("devbounds [%d %d %d %d]\n", ir.left(), ir.top(), ir.right(), ir.bottom());
-
-        SkASSERT(!c->quickReject(r));
-    }
-    SkPicture* pic = recorder.endRecording();
-
-    canvas->drawPicture(pic);
-    SkASSERT(pic->cullRect() == r);
-    pic->unref();
-}
-
 class ArcsView : public SampleView {
     class MyDrawable : public SkCanvasDrawable {
         SkRect   fR;
         SkScalar fSweep;
     public:
         MyDrawable(const SkRect& r) : fR(r), fSweep(0) {
         }
 
         void setSweep(SkScalar sweep) {
             if (fSweep != sweep) {
@@ skipping 119 matching lines @@
 
             draw_label(canvas, r, gAngles[i], gAngles[i+1]);
 
             canvas->translate(w * 8 / 7, 0);
         }
 
         canvas->restore();
     }
 
     virtual void onDrawContent(SkCanvas* canvas) {
-        if (true) { test_pictbounds(canvas); return; }
-
         fDrawable->setSweep(SampleCode::GetAnimScalar(SkIntToScalar(360)/24,
                                                       SkIntToScalar(360)));
 
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setStrokeWidth(SkIntToScalar(2));
         paint.setStyle(SkPaint::kStroke_Style);
 
         drawRectWithLines(canvas, fRect, paint);
 
@@ skipping 17 matching lines @@
 private:
     SkScalar fSweep;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new ArcsView; }
 static SkViewRegister reg(MyFactory);