Index: gm/all_bitmap_configs.cpp |
diff --git a/gm/all_bitmap_configs.cpp b/gm/all_bitmap_configs.cpp |
index 7ea17466d928ec42bf64a520c250bcc0d18c3fc1..6ea08038f34c9471a70d8ca59086e9980615bc8f 100644 |
--- a/gm/all_bitmap_configs.cpp |
+++ b/gm/all_bitmap_configs.cpp |
@@ -157,18 +157,20 @@ DEF_SIMPLE_GM(all_bitmap_configs, canvas, SCALE, 6 * SCALE) { |
p.setAntiAlias(true); |
sk_tool_utils::set_portable_typeface(&p, nullptr); |
- sk_tool_utils::draw_checkerboard(canvas, SK_ColorLTGRAY, SK_ColorWHITE, 8); |
+// sk_tool_utils::draw_checkerboard(canvas, SK_ColorLTGRAY, SK_ColorWHITE, 8); |
Brian Osman
2016/06/10 13:37:14
Are the changes in this file meant to be submitted
reed1
2016/06/10 14:26:04
reverted
|
SkBitmap bitmap; |
if (GetResourceAsBitmap("color_wheel.png", &bitmap)) { |
bitmap.setImmutable(); |
- draw(canvas, p, bitmap, kN32_SkColorType, "Native 32"); |
+ // draw(canvas, p, bitmap, kN32_SkColorType, "Native 32"); |
+ if (false) { |
canvas->translate(0.0f, SkIntToScalar(SCALE)); |
SkBitmap copy565 = copy_bitmap(bitmap, kRGB_565_SkColorType); |
p.setColor(SK_ColorRED); |
draw(canvas, p, copy565, kRGB_565_SkColorType, "RGB 565"); |
p.setColor(SK_ColorBLACK); |
+ } |
canvas->translate(0.0f, SkIntToScalar(SCALE)); |
SkBitmap copy4444 = copy_bitmap(bitmap, kARGB_4444_SkColorType); |
@@ -178,6 +180,7 @@ DEF_SIMPLE_GM(all_bitmap_configs, canvas, SCALE, 6 * SCALE) { |
} |
canvas->translate(0.0f, SkIntToScalar(SCALE)); |
+ if (false) { |
SkBitmap bitmapIndexed = indexed_bitmap(); |
draw(canvas, p, bitmapIndexed, kIndex_8_SkColorType, "Index 8"); |
@@ -189,6 +192,7 @@ DEF_SIMPLE_GM(all_bitmap_configs, canvas, SCALE, 6 * SCALE) { |
canvas->translate(0.0f, SkIntToScalar(SCALE)); |
SkBitmap bitmapG8 = make_bitmap(kGray_8_SkColorType); |
draw(canvas, p, bitmapG8, kGray_8_SkColorType, "Gray 8"); |
+ } |
} |
sk_sp<SkImage> make_not_native32_color_wheel() { |