| 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 "SkBitmap.h" | 8 #include "SkBitmap.h" |
| 9 #include "SkCanvas.h" | 9 #include "SkCanvas.h" |
| 10 #include "SkData.h" | 10 #include "SkData.h" |
| 11 #include "SkDiscardableMemoryPool.h" | 11 #include "SkDiscardableMemoryPool.h" |
| 12 #include "SkImageDecoder.h" | 12 #include "SkImage.h" |
| 13 #include "SkImageEncoder.h" |
| 13 #include "SkImageGeneratorPriv.h" | 14 #include "SkImageGeneratorPriv.h" |
| 14 #include "SkResourceCache.h" | 15 #include "SkResourceCache.h" |
| 15 #include "SkStream.h" | 16 #include "SkStream.h" |
| 16 #include "SkUtils.h" | 17 #include "SkUtils.h" |
| 17 | 18 |
| 18 #include "Test.h" | 19 #include "Test.h" |
| 19 | 20 |
| 20 /** | 21 /** |
| 21 * Fill this bitmap with some color. | 22 * Fill this bitmap with some color. |
| 22 */ | 23 */ |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 if (TestImageGenerator::kSucceedGetPixels_TestType == test) { | 339 if (TestImageGenerator::kSucceedGetPixels_TestType == test) { |
| 339 REPORTER_ASSERT( | 340 REPORTER_ASSERT( |
| 340 r, TestImageGenerator::Color() == bitmap.getColor(0, 0)); | 341 r, TestImageGenerator::Color() == bitmap.getColor(0, 0)); |
| 341 } | 342 } |
| 342 else { | 343 else { |
| 343 REPORTER_ASSERT(r, kDefaultColor == bitmap.getColor(0, 0)); | 344 REPORTER_ASSERT(r, kDefaultColor == bitmap.getColor(0, 0)); |
| 344 } | 345 } |
| 345 } | 346 } |
| 346 } | 347 } |
| 347 } | 348 } |
| OLD | NEW |