commit ac6b1fa2c8507bfd5f790bccaebab8e4018cb2cd
author Robert Phillips <robertphillips@google.com> Mon Mar 20 08:38:50 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 20 13:50:35 2017 +0000
tree 3e6e2707f3526193e81169ab084592bbf812404c
parent 6405e71279e99731f89db69325c6763ec62a98e1

Remove budgeted parameter from SkSurface::makeImageSnapshot (take 2)

This unused feature complicates MDB.

Chrome compiles locally for me with this CL.
frameworks/base/libs/hwui compiles locally for me with this CL.

Change-Id: Id3ad64dac72eace52855896df0d7ce3679f15884
Reviewed-on: https://skia-review.googlesource.com/9882
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tests/GrTextureMipMapInvalidationTest.cpp

diff --git a/tests/GrTextureMipMapInvalidationTest.cpp b/tests/GrTextureMipMapInvalidationTest.cpp
index 166c57c..e7573dc 100644
--- a/tests/GrTextureMipMapInvalidationTest.cpp
+++ b/tests/GrTextureMipMapInvalidationTest.cpp
@@ -20,13 +20,11 @@
 // Tests that MIP maps are created and invalidated as expected when drawing to and from GrTextures.
 DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrTextureMipMapInvalidationTest, reporter, ctxInfo) {
     auto isMipped = [] (SkSurface* surf) {
-        return as_IB(surf->makeImageSnapshot(SkBudgeted::kYes))->
-                peekTexture()->texturePriv().hasMipMaps();
+        return as_IB(surf->makeImageSnapshot())->peekTexture()->texturePriv().hasMipMaps();
     };
 
     auto mipsAreDirty = [] (SkSurface* surf) {
-        return as_IB(surf->makeImageSnapshot(SkBudgeted::kYes))->
-                peekTexture()->texturePriv().mipMapsAreDirty();
+        return as_IB(surf->makeImageSnapshot())->peekTexture()->texturePriv().mipMapsAreDirty();
     };
 
     GrContext* context = ctxInfo.grContext();
@@ -44,7 +42,7 @@
     SkPaint paint;
     paint.setFilterQuality(kMedium_SkFilterQuality);
     surf2->getCanvas()->scale(0.2f, 0.2f);
-    surf2->getCanvas()->drawImage(surf1->makeImageSnapshot(SkBudgeted::kYes), 0, 0, &paint);
+    surf2->getCanvas()->drawImage(surf1->makeImageSnapshot(), 0, 0, &paint);
     surf2->getCanvas()->flush();
     REPORTER_ASSERT(reporter, isMipped(surf1.get()));
     REPORTER_ASSERT(reporter, !mipsAreDirty(surf1.get()));

tests/SurfaceTest.cpp

diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index b85ac81..6264196 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -460,27 +460,24 @@
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceBudget, reporter, ctxInfo) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(8,8);
-    for (auto sbudgeted : { SkBudgeted::kNo, SkBudgeted::kYes }) {
-        for (auto ibudgeted : { SkBudgeted::kNo, SkBudgeted::kYes }) {
-            auto surface(SkSurface::MakeRenderTarget(ctxInfo.grContext(), sbudgeted, info));
-            SkASSERT(surface);
-            REPORTER_ASSERT(reporter, sbudgeted == is_budgeted(surface));
+    for (auto budgeted : { SkBudgeted::kNo, SkBudgeted::kYes }) {
+        auto surface(SkSurface::MakeRenderTarget(ctxInfo.grContext(), budgeted, info));
+        SkASSERT(surface);
+        REPORTER_ASSERT(reporter, budgeted == is_budgeted(surface));
 
-            sk_sp<SkImage> image(surface->makeImageSnapshot(ibudgeted));
+        sk_sp<SkImage> image(surface->makeImageSnapshot());
 
-            // Initially the image shares a texture with the surface, and the surface decides
-            // whether it is budgeted or not.
-            REPORTER_ASSERT(reporter, sbudgeted == is_budgeted(surface));
-            REPORTER_ASSERT(reporter, sbudgeted == is_budgeted(image));
+        // Initially the image shares a texture with the surface, and the
+        // the budgets should always match.
+        REPORTER_ASSERT(reporter, budgeted == is_budgeted(surface));
+        REPORTER_ASSERT(reporter, budgeted == is_budgeted(image));
 
-            // Now trigger copy-on-write
-            surface->getCanvas()->clear(SK_ColorBLUE);
+        // Now trigger copy-on-write
+        surface->getCanvas()->clear(SK_ColorBLUE);
 
-            // They don't share a texture anymore. They should each have made their own budget
-            // decision.
-            REPORTER_ASSERT(reporter, sbudgeted == is_budgeted(surface));
-            REPORTER_ASSERT(reporter, ibudgeted == is_budgeted(image));
-        }
+        // They don't share a texture anymore but the budgets should still match.
+        REPORTER_ASSERT(reporter, budgeted == is_budgeted(surface));
+        REPORTER_ASSERT(reporter, budgeted == is_budgeted(image));
     }
 }
 #endif