Require budget decision when creating a RenderTarget SkSurface

tests/DeferredCanvasTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "../src/image/SkImagePriv.h"
 #include "../src/image/SkSurface_Base.h"
 #include "SkBitmap.h"
@@ skipping 680 matching lines @@
         if (useGpu) {
             GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType) i;
             if (!GrContextFactory::IsRenderingGLContext(glCtxType)) {
                 continue;
             }
             GrContext* context = factory->get(glCtxType);
             if (NULL == context) {
                 return;
             }
 
-            surface = SkSurface::NewRenderTarget(context, imageSpec, 0, NULL);
+            surface =
+                SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, imageSpec, 0, NULL);
         } else
 #endif
         {
            surface = SkSurface::NewRaster(imageSpec);
         }
         SkASSERT(surface);
         SkAutoTUnref<SkSurface> aur(surface);
         SkAutoTUnref<SkDeferredCanvas> canvas(SkDeferredCanvas::Create(surface));
 
         SkImage* image1 = canvas->newImageSnapshot();
@@ skipping 61 matching lines @@
 #if SK_SUPPORT_GPU
         if (useGpu) {
             GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType) i;
             if (!GrContextFactory::IsRenderingGLContext(glCtxType)) {
                 continue;
             }
             GrContext* context = factory->get(glCtxType);
             if (NULL == context) {
                 continue;
             }
-            surface = SkSurface::NewRenderTarget(context, imageSpec, 0, NULL);
-            alternateSurface = SkSurface::NewRenderTarget(context, imageSpec, 0, NULL);
+            surface =
+                SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, imageSpec, 0, NULL);
+            alternateSurface =
+                SkSurface::NewRenderTarget(context, SkSurface::kNo_Budgeted, imageSpec, 0, NULL);
         } else
 #endif
         {
             surface = SkSurface::NewRaster(imageSpec);
             alternateSurface = SkSurface::NewRaster(imageSpec);
         }
         SkASSERT(surface);
         SkASSERT(alternateSurface);

[robertphillips, 2015/01/15 21:30:36]

Can we just make surface & alternateSurface be SkAutoTUnrefs from the start?

Low priority - ignore at will.

[bsalomon, 2015/01/15 22:15:50]

Done (the ignoring, that is  :) ) Just don't want to get into adding more
unrelated changes into a fairly big cl.

         SkAutoTUnref<SkSurface> aur1(surface);
         SkAutoTUnref<SkSurface> aur2(alternateSurface);
         PixelPtr pixels1 = get_surface_ptr(surface, useGpu);
         PixelPtr pixels2 = get_surface_ptr(alternateSurface, useGpu);
         SkAutoTUnref<SkDeferredCanvas> canvas(SkDeferredCanvas::Create(surface));
         SkAutoTUnref<SkImage> image1(canvas->newImageSnapshot());
         canvas->setSurface(alternateSurface);
         SkAutoTUnref<SkImage> image2(canvas->newImageSnapshot());
         REPORTER_ASSERT(reporter, image1->uniqueID() != image2->uniqueID());
         // Verify that none of the above operations triggered a surface copy on write.
@@ skipping 96 matching lines @@
     TestDeferredCanvasSurface(reporter, NULL);
     TestDeferredCanvasSetSurface(reporter, NULL);
 }
 
 DEF_GPUTEST(DeferredCanvas_GPU, reporter, factory) {
     if (factory != NULL) {
         TestDeferredCanvasSurface(reporter, factory);
         TestDeferredCanvasSetSurface(reporter, factory);
     }
 }