SkMipMap::Build supports 1xN and Nx1 inputs, so remove the special case from the test harness. Updat

tests/MipMapTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkMipMap.h"
 #include "SkRandom.h"
 #include "Test.h"
 
 static void make_bitmap(SkBitmap* bm, int width, int height) {
     bm->allocN32Pixels(width, height);
     bm->eraseColor(SK_ColorWHITE);
 }
 
 DEF_TEST(MipMap, reporter) {
     SkBitmap bm;
     SkRandom rand;
 
     for (int i = 0; i < 500; ++i) {
-        // for now, Build needs a min size of 2, otherwise it will return nullptr.
-        // should fix that to support 1 X N, where N > 1 to return non-null.
-        int width = 2 + rand.nextU() % 1000;
-        int height = 2 + rand.nextU() % 1000;
+        int width = 1 + rand.nextU() % 1000;
+        int height = 1 + rand.nextU() % 1000;
         make_bitmap(&bm, width, height);
         SkAutoTUnref<SkMipMap> mm(SkMipMap::Build(bm, nullptr));
 
         REPORTER_ASSERT(reporter, mm->countLevels() == SkMipMap::ComputeLevelCount(width, height));
         REPORTER_ASSERT(reporter, !mm->extractLevel(SkSize::Make(SK_Scalar1, SK_Scalar1),
                                                     nullptr));
         REPORTER_ASSERT(reporter, !mm->extractLevel(SkSize::Make(SK_Scalar1 * 2, SK_Scalar1 * 2),
                                                     nullptr));
 
         SkMipMap::Level prevLevel;
@@ skipping 74 matching lines @@
 };
 
 DEF_TEST(MipMap_ComputeLevelCount, reporter) {
     const LevelCountScenario tests[] = {
         // Test mipmaps with negative sizes
         {-100, 100, 0},
         {100, -100, 0},
         {-100, -100, 0},
 
         // Test mipmaps with 0, 1, 2 as dimensions
-        // (SkMipMap::Build requires a min size of 2)
+        // (SkMipMap::Build requires a min size of 1)
         //
         // 0
         {0, 100, 0},
         {100, 0, 0},
         {0, 0, 0},
         // 1
         {1, 100, 6},
         {100, 1, 6},
         {1, 1, 0},
         // 2
@@ skipping 13 matching lines @@
         {64, 129, 7},
         {255, 32, 7},
         {500, 1000, 9}
     };
 
     for (auto& currentTest : tests) {
         int levelCount = SkMipMap::ComputeLevelCount(currentTest.fWidth, currentTest.fHeight);
         REPORTER_ASSERT(reporter, currentTest.fExpectedLevelCount == levelCount);
     }
 }