| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2013 Google Inc. | 2  * Copyright 2013 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #include "Test.h" | 8 #include "Test.h" | 
| 9 #include "TestClassDef.h" |  | 
| 10 #include "SkMipMap.h" | 9 #include "SkMipMap.h" | 
| 11 #include "SkBitmap.h" | 10 #include "SkBitmap.h" | 
| 12 #include "SkRandom.h" | 11 #include "SkRandom.h" | 
| 13 | 12 | 
| 14 static void make_bitmap(SkBitmap* bm, SkRandom& rand) { | 13 static void make_bitmap(SkBitmap* bm, SkRandom& rand) { | 
| 15     // for now, Build needs a min size of 2, otherwise it will return NULL. | 14     // for now, Build needs a min size of 2, otherwise it will return NULL. | 
| 16     // should fix that to support 1 X N, where N > 1 to return non-null. | 15     // should fix that to support 1 X N, where N > 1 to return non-null. | 
| 17     int w = 2 + rand.nextU() % 1000; | 16     int w = 2 + rand.nextU() % 1000; | 
| 18     int h = 2 + rand.nextU() % 1000; | 17     int h = 2 + rand.nextU() % 1000; | 
| 19     bm->setConfig(SkBitmap::kARGB_8888_Config, w, h); | 18     bm->setConfig(SkBitmap::kARGB_8888_Config, w, h); | 
| (...skipping 28 matching lines...) Expand all  Loading... | 
| 48 | 47 | 
| 49                 if (prevLevel.fPixels) { | 48                 if (prevLevel.fPixels) { | 
| 50                     REPORTER_ASSERT(reporter, level.fWidth <= prevLevel.fWidth); | 49                     REPORTER_ASSERT(reporter, level.fWidth <= prevLevel.fWidth); | 
| 51                     REPORTER_ASSERT(reporter, level.fHeight <= prevLevel.fHeight
    ); | 50                     REPORTER_ASSERT(reporter, level.fHeight <= prevLevel.fHeight
    ); | 
| 52                 } | 51                 } | 
| 53                 prevLevel = level; | 52                 prevLevel = level; | 
| 54             } | 53             } | 
| 55         } | 54         } | 
| 56     } | 55     } | 
| 57 } | 56 } | 
| OLD | NEW | 
|---|