| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 #include "SkBenchmark.h" | 8 #include "SkBenchmark.h" |
| 9 #include "SkBitmap.h" | 9 #include "SkBitmap.h" |
| 10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 } | 106 } |
| 107 | 107 |
| 108 protected: | 108 protected: |
| 109 virtual const char* onGetName() SK_OVERRIDE { | 109 virtual const char* onGetName() SK_OVERRIDE { |
| 110 return fName.c_str(); | 110 return fName.c_str(); |
| 111 } | 111 } |
| 112 | 112 |
| 113 virtual void onPreDraw() SK_OVERRIDE { | 113 virtual void onPreDraw() SK_OVERRIDE { |
| 114 fBitmap.allocPixels(); | 114 fBitmap.allocPixels(); |
| 115 fBitmap.eraseColor(fIsOpaque ? SK_ColorWHITE : 0); | 115 fBitmap.eraseColor(fIsOpaque ? SK_ColorWHITE : 0); |
| 116 fBitmap.setIsOpaque(fIsOpaque); | 116 fBitmap.setAlphaType(fIsOpaque ? |
| 117 kOpaque_SkAlphaType : kPremul_SkAlphaType); |
| 117 | 118 |
| 118 draw_into_bitmap(fBitmap); | 119 draw_into_bitmap(fBitmap); |
| 119 | 120 |
| 120 if (SkBitmap::kIndex8_Config == fConfig) { | 121 if (SkBitmap::kIndex8_Config == fConfig) { |
| 121 SkBitmap tmp; | 122 SkBitmap tmp; |
| 122 convert_to_index666(fBitmap, &tmp); | 123 convert_to_index666(fBitmap, &tmp); |
| 123 fBitmap = tmp; | 124 fBitmap = tmp; |
| 124 } | 125 } |
| 125 | 126 |
| 126 SkShader* s = SkShader::CreateBitmapShader(fBitmap, | 127 SkShader* s = SkShader::CreateBitmapShader(fBitmap, |
| (...skipping 13 matching lines...) Expand all Loading... |
| 140 } | 141 } |
| 141 | 142 |
| 142 private: | 143 private: |
| 143 typedef SkBenchmark INHERITED; | 144 typedef SkBenchmark INHERITED; |
| 144 }; | 145 }; |
| 145 | 146 |
| 146 DEF_BENCH(return new RepeatTileBench(SkBitmap::kARGB_8888_Config, true)) | 147 DEF_BENCH(return new RepeatTileBench(SkBitmap::kARGB_8888_Config, true)) |
| 147 DEF_BENCH(return new RepeatTileBench(SkBitmap::kARGB_8888_Config, false)) | 148 DEF_BENCH(return new RepeatTileBench(SkBitmap::kARGB_8888_Config, false)) |
| 148 DEF_BENCH(return new RepeatTileBench(SkBitmap::kRGB_565_Config)) | 149 DEF_BENCH(return new RepeatTileBench(SkBitmap::kRGB_565_Config)) |
| 149 DEF_BENCH(return new RepeatTileBench(SkBitmap::kIndex8_Config)) | 150 DEF_BENCH(return new RepeatTileBench(SkBitmap::kIndex8_Config)) |
| OLD | NEW |