Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: bench/BitmapBench.cpp

Issue 25275004: store SkAlphaType inside SkBitmap, on road to support unpremul (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: remove occurances of setIsOpaque Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | bench/BitmapRectBench.cpp » ('j') | src/images/SkImageDecoder_libjpeg.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "SkPaint.h" 10 #include "SkPaint.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 if (SkBitmap::kIndex8_Config == fConfig) { 122 if (SkBitmap::kIndex8_Config == fConfig) {
123 convertToIndex666(bm, &fBitmap); 123 convertToIndex666(bm, &fBitmap);
124 } else { 124 } else {
125 fBitmap = bm; 125 fBitmap = bm;
126 } 126 }
127 127
128 if (fBitmap.getColorTable()) { 128 if (fBitmap.getColorTable()) {
129 fBitmap.getColorTable()->setIsOpaque(fIsOpaque); 129 fBitmap.getColorTable()->setIsOpaque(fIsOpaque);
130 } 130 }
131 fBitmap.setIsOpaque(fIsOpaque); 131 fBitmap.setAlphaType(fIsOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaTy pe);
132 fBitmap.setIsVolatile(fIsVolatile); 132 fBitmap.setIsVolatile(fIsVolatile);
133 } 133 }
134 134
135 virtual void onDraw(SkCanvas* canvas) { 135 virtual void onDraw(SkCanvas* canvas) {
136 SkIPoint dim = this->getSize(); 136 SkIPoint dim = this->getSize();
137 SkRandom rand; 137 SkRandom rand;
138 138
139 SkPaint paint(fPaint); 139 SkPaint paint(fPaint);
140 this->setupPaint(&paint); 140 this->setupPaint(&paint);
141 141
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 DEF_BENCH( return new FilterBitmapBench(true, SkBitmap::kARGB_8888_Config, true, false, kScale_Flag | kRotate_Flag | kBilerp_Flag); ) 378 DEF_BENCH( return new FilterBitmapBench(true, SkBitmap::kARGB_8888_Config, true, false, kScale_Flag | kRotate_Flag | kBilerp_Flag); )
379 379
380 DEF_BENCH( return new FilterBitmapBench(false, SkBitmap::kARGB_8888_Config, fals e, false, kScale_Flag | kBilerp_Flag | kBicubic_Flag); ) 380 DEF_BENCH( return new FilterBitmapBench(false, SkBitmap::kARGB_8888_Config, fals e, false, kScale_Flag | kBilerp_Flag | kBicubic_Flag); )
381 DEF_BENCH( return new FilterBitmapBench(false, SkBitmap::kARGB_8888_Config, fals e, false, kScale_Flag | kRotate_Flag | kBilerp_Flag | kBicubic_Flag); ) 381 DEF_BENCH( return new FilterBitmapBench(false, SkBitmap::kARGB_8888_Config, fals e, false, kScale_Flag | kRotate_Flag | kBilerp_Flag | kBicubic_Flag); )
382 382
383 // source alpha tests -> S32A_Opaque_BlitRow32_{arm,neon} 383 // source alpha tests -> S32A_Opaque_BlitRow32_{arm,neon}
384 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kOpaque_Sou rceAlpha, SkBitmap::kARGB_8888_Config); ) 384 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kOpaque_Sou rceAlpha, SkBitmap::kARGB_8888_Config); )
385 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kTransparen t_SourceAlpha, SkBitmap::kARGB_8888_Config); ) 385 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kTransparen t_SourceAlpha, SkBitmap::kARGB_8888_Config); )
386 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kTwoStripes _SourceAlpha, SkBitmap::kARGB_8888_Config); ) 386 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kTwoStripes _SourceAlpha, SkBitmap::kARGB_8888_Config); )
387 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kThreeStrip es_SourceAlpha, SkBitmap::kARGB_8888_Config); ) 387 DEF_BENCH( return new SourceAlphaBitmapBench(SourceAlphaBitmapBench::kThreeStrip es_SourceAlpha, SkBitmap::kARGB_8888_Config); )
OLDNEW
« no previous file with comments | « no previous file | bench/BitmapRectBench.cpp » ('j') | src/images/SkImageDecoder_libjpeg.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698