SkImageInfo info;
info.fWidth = kSurfaceWidth;
info.fHeight = kSurfaceHeight;
- info.fColorType = kPMColor_SkColorType;
+ info.fColorType = kN32_SkColorType;
info.fAlphaType = kPremul_SkAlphaType;
const SkRect fullCanvasRect = SkRect::MakeWH(
SkIntToScalar(kSurfaceWidth), SkIntToScalar(kSurfaceHeight));
GLContextType contextType;
bool runByDefault;
} gConfigs[] = {
- { kPMColor_SkColorType, "NONRENDERING", 0, SkBenchmark::kNonRendering_Backend, kNative, true},
- { kPMColor_SkColorType, "8888", 0, SkBenchmark::kRaster_Backend, kNative, true},
+ { kN32_SkColorType, "NONRENDERING", 0, SkBenchmark::kNonRendering_Backend, kNative, true},
+ { kN32_SkColorType, "8888", 0, SkBenchmark::kRaster_Backend, kNative, true},
{ kRGB_565_SkColorType, "565", 0, SkBenchmark::kRaster_Backend, kNative, true},
#if SK_SUPPORT_GPU
- { kPMColor_SkColorType, "GPU", 0, SkBenchmark::kGPU_Backend, kNative, true},
- { kPMColor_SkColorType, "MSAA4", 4, SkBenchmark::kGPU_Backend, kNative, false},
- { kPMColor_SkColorType, "MSAA16", 16, SkBenchmark::kGPU_Backend, kNative, false},
- { kPMColor_SkColorType, "NVPRMSAA4", 4, SkBenchmark::kGPU_Backend, kNVPR, true},
- { kPMColor_SkColorType, "NVPRMSAA16", 16, SkBenchmark::kGPU_Backend, kNVPR, false},
+ { kN32_SkColorType, "GPU", 0, SkBenchmark::kGPU_Backend, kNative, true},
+ { kN32_SkColorType, "MSAA4", 4, SkBenchmark::kGPU_Backend, kNative, false},
+ { kN32_SkColorType, "MSAA16", 16, SkBenchmark::kGPU_Backend, kNative, false},
+ { kN32_SkColorType, "NVPRMSAA4", 4, SkBenchmark::kGPU_Backend, kNVPR, true},
+ { kN32_SkColorType, "NVPRMSAA16", 16, SkBenchmark::kGPU_Backend, kNVPR, false},
#if SK_ANGLE
- { kPMColor_SkColorType, "ANGLE", 0, SkBenchmark::kGPU_Backend, kANGLE, true},
+ { kN32_SkColorType, "ANGLE", 0, SkBenchmark::kGPU_Backend, kANGLE, true},
#endif // SK_ANGLE
- { kPMColor_SkColorType, "Debug", 0, SkBenchmark::kGPU_Backend, kDebug, kIsDebug},
- { kPMColor_SkColorType, "NULLGPU", 0, SkBenchmark::kGPU_Backend, kNull, true},
+ { kN32_SkColorType, "Debug", 0, SkBenchmark::kGPU_Backend, kDebug, kIsDebug},
+ { kN32_SkColorType, "NULLGPU", 0, SkBenchmark::kGPU_Backend, kNull, true},
#endif // SK_SUPPORT_GPU
};
SkImageInfo info;
info.fWidth = kImageWidgetWidth;
info.fHeight = kImageWidgetHeight;
- info.fColorType = kPMColor_SkColorType;
+ info.fColorType = kN32_SkColorType;
info.fAlphaType = kPremul_SkAlphaType;
fSurface = SkSurface::NewRasterDirect(info, fPixels, 4 * kImageWidgetWidth);
for (int i = 0; i < gms.count(); i++) {
for (int j = 0; j < configs.count(); j++) {
START("565", CpuGMTask, kRGB_565_SkColorType);
- START("8888", CpuGMTask, kPMColor_SkColorType);
+ START("8888", CpuGMTask, kN32_SkColorType);
START("gpu", GpuGMTask, native, 0);
START("msaa4", GpuGMTask, native, 4);
START("msaa16", GpuGMTask, native, 16);
for (int j = 0; j < configs.count(); j++) {
START("nonrendering", NonRenderingBenchTask);
START("565", CpuBenchTask, kRGB_565_SkColorType);
- START("8888", CpuBenchTask, kPMColor_SkColorType);
+ START("8888", CpuBenchTask, kN32_SkColorType);
START("gpu", GpuBenchTask, native, 0);
START("msaa4", GpuBenchTask, native, 4);
START("msaa16", GpuBenchTask, native, 16);
}
void NonRenderingBenchTask::draw() {
- draw_raster(fBench.get(), kPMColor_SkColorType);
+ draw_raster(fBench.get(), kN32_SkColorType);
}
void CpuBenchTask::draw() {
void GpuBenchTask::draw(GrContextFactory* grFactory) {
SkImageInfo info = SkImageInfo::Make(fBench->getSize().x(),
fBench->getSize().y(),
- kPMColor_SkColorType,
+ kN32_SkColorType,
kPremul_SkAlphaType);
SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, info, fSampleCount));
void GpuGMTask::draw(GrContextFactory* grFactory) {
SkImageInfo info = SkImageInfo::Make(SkScalarCeilToInt(fGM->width()),
SkScalarCeilToInt(fGM->height()),
- kPMColor_SkColorType,
+ kN32_SkColorType,
kPremul_SkAlphaType);
SkAutoTUnref<SkSurface> surface(NewGpuSurface(grFactory, fContextType, info, fSampleCount));
SkCanvas* canvas = surface->getCanvas();
if (NULL != fWind) {
fWind->setVisibleP(true);
fWind->resize(self.frame.size.width, self.frame.size.height,
- kPMColor_SkColorType);
+ kN32_SkColorType);
}
}
fWind = new SampleWindow(self, 1, &kDummyArgv, fDevManager);
fWind->resize(self.frame.size.width, self.frame.size.height,
- kPMColor_SkColorType);
+ kN32_SkColorType);
}
return self;
}
static const SkColorType gColorTypes[] = {
kRGB_565_SkColorType,
kARGB_4444_SkColorType,
- kPMColor_SkColorType,
+ kN32_SkColorType,
};
#define NUM_CONFIGS SK_ARRAY_COUNT(gColorTypes)
make_bm(&fBM8);
fBM8.copyTo(&fBM4444, kARGB_4444_SkColorType);
fBM8.copyTo(&fBM16, kRGB_565_SkColorType);
- fBM8.copyTo(&fBM32, kPMColor_SkColorType);
+ fBM8.copyTo(&fBM32, kN32_SkColorType);
}
public:
SkBitmap fBM8, fBM4444, fBM16, fBM32;
static SkBitmap make_argb8888_gradient() {
SkBitmap bitmap;
- init_bitmap(kPMColor_SkColorType, &bitmap);
+ init_bitmap(kN32_SkColorType, &bitmap);
uint8_t rowColor = 0;
for (int y = 0; y < SLIDE_SIZE; y++) {
uint32_t* dst = bitmap.getAddr32(0, y);
static SkBitmap make_argb8888_stripes() {
SkBitmap bitmap;
- init_bitmap(kPMColor_SkColorType, &bitmap);
+ init_bitmap(kN32_SkColorType, &bitmap);
uint8_t rowColor = 0;
for (int y = 0; y < SLIDE_SIZE; y++) {
uint32_t* dst = bitmap.getAddr32(0, y);
static CGContextRef makeCG(const SkImageInfo& info, const void* addr,
size_t rowBytes) {
- if (kPMColor_SkColorType != info.colorType() || NULL == addr) {
+ if (kN32_SkColorType != info.colorType() || NULL == addr) {
return NULL;
}
CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
static void force_all_opaque(const SkBitmap& bitmap) {
SkColorType colorType = bitmap.colorType();
switch (colorType) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
force_all_opaque_8888(bitmap);
break;
case kRGB_565_SkColorType:
// from this method, we should be able to get rid of the
// transformation to 8888 format also.
SkBitmap copy;
- bitmap.copyTo(©, kPMColor_SkColorType);
+ bitmap.copyTo(©, kN32_SkColorType);
if (!SkImageEncoder::EncodeFile(path.c_str(), copy,
SkImageEncoder::kPNG_Type,
100)) {
return;
}
- if ((kPMColor_SkColorType != expectedBitmap.colorType()) ||
- (kPMColor_SkColorType != actualBitmap.colorType())) {
+ if ((kN32_SkColorType != expectedBitmap.colorType()) ||
+ (kN32_SkColorType != actualBitmap.colorType())) {
SkDebugf("---- %s: not computing max per-channel pixel mismatch because non-8888\n",
testName);
return;
}
static const SkColorType gColorTypes[] = {
- kPMColor_SkColorType,
+ kN32_SkColorType,
kRGB_565_SkColorType,
};
static SkShader* make_bm(SkShader::TileMode tx, SkShader::TileMode ty) {
SkBitmap bm;
- makebm(&bm, kPMColor_SkColorType, gWidth, gHeight);
+ makebm(&bm, kN32_SkColorType, gWidth, gHeight);
return SkShader::CreateBitmapShader(bm, tx, ty);
}
}
static const SkColorType gColorTypes[] = {
- kPMColor_SkColorType,
+ kN32_SkColorType,
kRGB_565_SkColorType,
};
static SkShader* make_bm(SkShader::TileMode tx, SkShader::TileMode ty) {
SkBitmap bm;
- makebm(&bm, kPMColor_SkColorType, gWidth, gHeight);
+ makebm(&bm, kN32_SkColorType, gWidth, gHeight);
return SkShader::CreateBitmapShader(bm, tx, ty);
}
# Temporary until https:#googleplex-android-review.git.corp.google.com/#/c/442220/
# lands.
'SK_SUPPORT_LEGACY_GETTOTALCLIP',
- # Use a better name for kPMColor_SkColorType until
- # https://code.google.com/p/skia/issues/detail?id=2384 is fixed.
- 'kNative_8888_SkColorType kPMColor_SkColorType',
+ # Still need to switch Android to the new name for N32.
+ 'kNative_8888_SkColorType kN32_SkColorType',
],
}],
'skia_for_chromium_defines': [
'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1',
'SK_SUPPORT_LEGACY_GETTOPDEVICE',
+ 'SK_SUPPORT_LEGACY_N32_NAME',
],
},
}
kLastEnum_SkColorType = kIndex_8_SkColorType,
#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
- kPMColor_SkColorType = kBGRA_8888_SkColorType
+ kN32_SkColorType = kBGRA_8888_SkColorType,
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
- kPMColor_SkColorType = kRGBA_8888_SkColorType
+ kN32_SkColorType = kRGBA_8888_SkColorType,
#else
#error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
#endif
+
+#ifdef SK_SUPPORT_LEGACY_N32_NAME
+ kPMColor_SkColorType = kN32_SkColorType
+#endif
};
static int SkColorTypeBytesPerPixel(SkColorType ct) {
*/
static SkImageInfo MakeN32(int width, int height, SkAlphaType at) {
SkImageInfo info = {
- width, height, kPMColor_SkColorType, at
+ width, height, kN32_SkColorType, at
};
return info;
}
*/
static SkImageInfo MakeN32Premul(int width, int height) {
SkImageInfo info = {
- width, height, kPMColor_SkColorType, kPremul_SkAlphaType
+ width, height, kN32_SkColorType, kPremul_SkAlphaType
};
return info;
}
fSlideMenu = new SkOSMenu;
this->addMenu(fSlideMenu);
- this->setColorType(kPMColor_SkColorType);
+ this->setColorType(kN32_SkColorType);
this->setVisibleP(true);
this->setClipToBounds(false);
SkBaseDevice* device = orig->getDevice();
SkBitmap bmp;
- if (device->accessBitmap(false).copyTo(&bmp, kPMColor_SkColorType)) {
+ if (device->accessBitmap(false).copyTo(&bmp, kN32_SkColorType)) {
static int gSampleGrabCounter;
SkString name;
name.printf("sample_grab_%d.png", gSampleGrabCounter++);
kUnknown_SkColorType, // none -> none
kUnknown_SkColorType, // a8 -> none
kARGB_4444_SkColorType, // 565 -> 4444
- kPMColor_SkColorType, // 4444 -> 8888
+ kN32_SkColorType, // 4444 -> 8888
kRGB_565_SkColorType, // 8888 -> 565
kRGB_565_SkColorType, // 8888 -> 565
kUnknown_SkColorType, // index8 -> none
DitherBitmapView() {
fResult = test_pathregion();
fBM8 = make_bitmap();
- fBM8.copyTo(&fBM32, kPMColor_SkColorType);
+ fBM8.copyTo(&fBM32, kN32_SkColorType);
this->setBGColor(0xFFDDDDDD);
}
SkIntToScalar(width)/2, paint);
switch (ct) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
bm->swap(device);
break;
case kRGB_565_SkColorType: {
// configs to build the original bitmap in. Can be at most these 3
static const SkColorType gColorTypes[] = {
- kPMColor_SkColorType,
+ kN32_SkColorType,
kRGB_565_SkColorType,
kIndex_8_SkColorType, // opaque
kIndex_8_SkColorType // alpha
make_bm(&fBM8);
fBM8.copyTo(&fBM4444, kARGB_4444_SkColorType);
fBM8.copyTo(&fBM16, kRGB_565_SkColorType);
- fBM8.copyTo(&fBM32, kPMColor_SkColorType);
+ fBM8.copyTo(&fBM32, kN32_SkColorType);
this->setBGColor(0xFFDDDDDD);
}
case kAlpha_8_SkColorType:
case kRGB_565_SkColorType:
return true;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
return kPremul_SkAlphaType == info.alphaType() ||
kOpaque_SkAlphaType == info.alphaType();
default:
}
static const SkColorType gColorTypes[] = {
- kPMColor_SkColorType,
+ kN32_SkColorType,
kRGB_565_SkColorType,
};
static const int gWidth = 32;
ct = kARGB_4444_SkColorType;
break;
case SkBitmap::kARGB_8888_Config:
- ct = kPMColor_SkColorType;
+ ct = kN32_SkColorType;
break;
case SkBitmap::kNo_Config:
default:
switch (dstColorType) {
case kAlpha_8_SkColorType:
case kRGB_565_SkColorType:
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
break;
case kIndex_8_SkColorType:
if (!sameConfigs) {
}
break;
case kARGB_4444_SkColorType:
- return sameConfigs || kPMColor_SkColorType == this->colorType();
+ return sameConfigs || kN32_SkColorType == this->colorType();
default:
return false;
}
}
}
} else if (kARGB_4444_SkColorType == dstColorType
- && kPMColor_SkColorType == src->colorType()) {
+ && kN32_SkColorType == src->colorType()) {
SkASSERT(src->height() == tmpDst.height());
SkASSERT(src->width() == tmpDst.width());
for (int y = 0; y < src->height(); ++y) {
case kRGB_565_SkColorType:
canonicalAlphaType = kOpaque_SkAlphaType;
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
break;
default:
return false;
}
// TODO: consider supporting other colortypes (e.g. 565, A8)
- if (fBitmap->colorType() != kPMColor_SkColorType) {
+ if (fBitmap->colorType() != kN32_SkColorType) {
return false;
}
case kAlpha_8_SkColorType:
case kRGB_565_SkColorType:
case kIndex_8_SkColorType:
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
// if (tx == ty && (kClamp_TileMode == tx || kRepeat_TileMode == tx))
return true;
default:
flags |= (kHasSpan16_Flag | kIntrinsicly16_Flag);
break;
case kIndex_8_SkColorType:
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (bitmapIsOpaque) {
flags |= kHasSpan16_Flag;
}
}
switch (bm.colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
*color = SkUnPreMultiply::PMColorToColor(*bm.getAddr32(0, 0));
return true;
case kRGB_565_SkColorType:
SkAutoLockPixels locker(source);
if (!source.readyToDraw() ||
- source.colorType() != kPMColor_SkColorType) {
+ source.colorType() != kN32_SkColorType) {
return false;
}
blitter = SkBlitter_ChooseD565(device, *paint, allocator);
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (shader) {
blitter = allocator->createT<SkARGB32_Shader_Blitter>(device, *paint);
} else if (paint->getColor() == SK_ColorBLACK) {
case kRGB_565_SkColorType:
blitter = SkSpriteBlitter::ChooseD16(source, paint, allocator);
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
blitter = SkSpriteBlitter::ChooseD32(source, paint, allocator);
break;
default:
switch (info.colorType()) {
case kAlpha_8_SkColorType:
case kRGB_565_SkColorType:
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
break;
default:
return false;
*/
SkPMColor pmc = SkPreMultiplyColor(color);
switch (bitmap.colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (data) {
*data = pmc;
}
BitmapXferProc proc, uint32_t procData) {
int shiftPerPixel;
switch (bitmap.colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
shiftPerPixel = 2;
break;
case kRGB_565_SkColorType:
const SkBitmap* bm = blitter->justAnOpaqueColor(&value);
if (bm && kRGB_565_SkColorType == bm->colorType()) {
proc = bw_pt_rect_16_hair_proc;
- } else if (bm && kPMColor_SkColorType == bm->colorType()) {
+ } else if (bm && kN32_SkColorType == bm->colorType()) {
proc = bw_pt_rect_32_hair_proc;
} else {
proc = bw_pt_rect_hair_proc;
}
// can we relax this?
- if (kPMColor_SkColorType != bitmap->colorType()) {
+ if (kN32_SkColorType != bitmap->colorType()) {
return false;
}
class Sprite_D32_S32 : public SkSpriteBlitter {
public:
Sprite_D32_S32(const SkBitmap& src, U8CPU alpha) : INHERITED(src) {
- SkASSERT(src.colorType() == kPMColor_SkColorType);
+ SkASSERT(src.colorType() == kN32_SkColorType);
unsigned flags32 = 0;
if (255 != alpha) {
blitter = allocator->createT<Sprite_D32_S4444>(source);
}
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (xfermode || filter) {
if (255 == alpha) {
// this can handle xfermode or filter, but not alpha
unsigned alpha = paint.getAlpha();
switch (source.colorType()) {
- case kPMColor_SkColorType: {
+ case kN32_SkColorType: {
blitter = allocator->createT<Sprite_D16_S32_BlitRowProc>(source);
break;
}
bool SkAlphaThresholdFilterImpl::onFilterImage(Proxy*, const SkBitmap& src,
const Context& ctx, SkBitmap* dst,
SkIPoint* offset) const {
- SkASSERT(src.colorType() == kPMColor_SkColorType);
+ SkASSERT(src.colorType() == kN32_SkColorType);
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
(displInput && !displInput->filterImage(proxy, src, ctx, &displ, &displOffset))) {
return false;
}
- if ((displ.colorType() != kPMColor_SkColorType) ||
- (color.colorType() != kPMColor_SkColorType)) {
+ if ((displ.colorType() != kN32_SkColorType) ||
+ (color.colorType() != kN32_SkColorType)) {
return false;
}
SkIRect bounds;
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
SkIRect bounds;
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
bool SkMagnifierImageFilter::onFilterImage(Proxy*, const SkBitmap& src,
const Context&, SkBitmap* dst,
SkIPoint* offset) const {
- SkASSERT(src.colorType() == kPMColor_SkColorType);
+ SkASSERT(src.colorType() == kN32_SkColorType);
SkASSERT(fSrcRect.width() < src.width());
SkASSERT(fSrcRect.height() < src.height());
- if ((src.colorType() != kPMColor_SkColorType) ||
+ if ((src.colorType() != kN32_SkColorType) ||
(fSrcRect.width() >= src.width()) ||
(fSrcRect.height() >= src.height())) {
return false;
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
return false;
}
- if (src.colorType() != kPMColor_SkColorType) {
+ if (src.colorType() != kN32_SkColorType) {
return false;
}
if (fAlpha == 255)
flags |= kOpaqueAlpha_Flag;
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (fAlpha == 255 && fDevice->isOpaque())
flags |= kOpaqueAlpha_Flag;
break;
unsigned scale = SkAlpha255To256(fAlpha);
switch (fDevice->colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (scale == 256) {
SkPMColor* src = fDevice->getAddr32(x, y);
if (src != span) {
info.fWidth = kCache32Count;
info.fHeight = 4; // for our 4 dither rows
info.fAlphaType = kPremul_SkAlphaType;
- info.fColorType = kPMColor_SkColorType;
+ info.fColorType = kN32_SkColorType;
if (NULL == fCache32PixelRef) {
fCache32PixelRef = SkMallocPixelRef::NewAllocate(info, 0, NULL);
if (kRGB_565_SkColorType == info.colorType()) {
info.fAlphaType = kOpaque_SkAlphaType; // force this setting
} else {
- info.fColorType = kPMColor_SkColorType;
+ info.fColorType = kN32_SkColorType;
if (kOpaque_SkAlphaType != info.alphaType()) {
info.fAlphaType = kPremul_SkAlphaType; // force this setting
}
dstPI.fRowBytes = count * sizeof(SkPMColor);
SkSrcPixelInfo srcPI;
- srcPI.fColorType = kPMColor_SkColorType;
+ srcPI.fColorType = kN32_SkColorType;
srcPI.fAlphaType = kPremul_SkAlphaType;
srcPI.fPixels = ctable->lockColors();
srcPI.fRowBytes = count * sizeof(SkPMColor);
return result;
}
} else {
- origBitmap.copyTo(&tmpBitmap, kPMColor_SkColorType);
+ origBitmap.copyTo(&tmpBitmap, kN32_SkColorType);
// now bitmap points to our temp, which has been promoted to 32bits
bitmap = &tmpBitmap;
desc.fConfig = SkBitmapConfig2GrPixelConfig(bitmap->config());
static bool raster_canvas_supports(const SkImageInfo& info) {
switch (info.fColorType) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
return kUnpremul_SkAlphaType != info.fAlphaType;
case kRGB_565_SkColorType:
return true;
case kRGB_565_SkColorType:
return SkBitmap::kRGB_565_Config;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
return SkBitmap::kARGB_8888_Config;
case kIndex_8_SkColorType:
kIndex_8_SkColorType, // kIndex8_Config
kRGB_565_SkColorType, // kRGB_565_Config
kARGB_4444_SkColorType, // kARGB_4444_Config
- kPMColor_SkColorType, // kARGB_8888_Config
+ kN32_SkColorType, // kARGB_8888_Config
};
SkASSERT((unsigned)config < SK_ARRAY_COUNT(gCT));
return gCT[config];
}
bool SkImage_Gpu::getROPixels(SkBitmap* dst) const {
- return fBitmap.copyTo(dst, kPMColor_SkColorType);
+ return fBitmap.copyTo(dst, kN32_SkColorType);
}
///////////////////////////////////////////////////////////////////////////////
} else {
SkImageInfo info;
info.fWidth = info.fHeight = 0;
- info.fColorType = kPMColor_SkColorType;
+ info.fColorType = kN32_SkColorType;
info.fAlphaType = kOpaque_SkAlphaType;
return SkImage::NewRasterCopy(info, NULL, 0);
}
case kRGB_565_SkColorType:
shift = 1;
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
shift = 2;
break;
default:
if (kIndex_8_SkColorType == bitmap.colorType()) {
// We don't support kIndex8 because we don't support
// colortables in this workflow.
- info.fColorType = kPMColor_SkColorType;
+ info.fColorType = kN32_SkColorType;
}
} else {
if (!bitmap.canCopyTo(opts.fRequestedColorType)) {
// <Error>: CGImageDestinationFinalize image destination does not have enough images
// So instead we copy to 8888.
if (bm.colorType() == kARGB_4444_SkColorType) {
- bm.copyTo(&bitmap8888, kPMColor_SkColorType);
+ bm.copyTo(&bitmap8888, kN32_SkColorType);
bmPtr = &bitmap8888;
}
type = kUTTypePNG;
//Convert to 8888 if needed.
const SkBitmap* bitmap;
SkBitmap bitmapCopy;
- if (kPMColor_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) {
+ if (kN32_SkColorType == bitmapOrig.colorType() && bitmapOrig.isOpaque()) {
bitmap = &bitmapOrig;
} else {
- if (!bitmapOrig.copyTo(&bitmapCopy, kPMColor_SkColorType)) {
+ if (!bitmapOrig.copyTo(&bitmapCopy, kN32_SkColorType)) {
return false;
}
bitmap = &bitmapCopy;
// Hmm, that didn't work. Maybe if we create a new
// kARGB_8888_Config version of the bitmap it will work better?
SkBitmap copyBitmap;
- if (!bitmap.copyTo(©Bitmap, kPMColor_SkColorType)) {
+ if (!bitmap.copyTo(©Bitmap, kN32_SkColorType)) {
return false;
}
return ComputeDigestInternal(copyBitmap, result);
layerState->height = bitmap.height();
switch (bitmap.colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
layerState->raster.config = kARGB_8888_RasterConfig;
break;
case kRGB_565_SkColorType:
SkBitmap bitmap;
SkColorType colorType =
- layerState.raster.config == kARGB_8888_RasterConfig ? kPMColor_SkColorType :
+ layerState.raster.config == kARGB_8888_RasterConfig ? kN32_SkColorType :
layerState.raster.config == kRGB_565_RasterConfig ? kRGB_565_SkColorType :
kUnknown_SkColorType;
*upscaleTo32 = true;
}
// fall through
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
*bitsPerComponent = 8;
#if SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
*info = kCGBitmapByteOrder32Big;
copy = new SkBitmap;
// here we make a ceep copy of the pixels, since CG won't take our
// 565 directly
- bm.copyTo(copy, kPMColor_SkColorType);
+ bm.copyTo(copy, kN32_SkColorType);
} else {
copy = new SkBitmap(bm);
}
#ifdef SK_BUILD_FOR_WINCE
fColorType = kRGB_565_SkColorType;
#else
- fColorType = kPMColor_SkColorType;
+ fColorType = kN32_SkColorType;
#endif
fMatrix.reset();
size = [self convertSizeToBacking:self.frame.size];
#endif
fWind->resize((int) size.width, (int) size.height,
- kPMColor_SkColorType);
+ kN32_SkColorType);
}
}
{ kIndex_8_SkColorType, "011101" },
{ kRGB_565_SkColorType, "010101" },
{ kARGB_4444_SkColorType, "010111" },
- { kPMColor_SkColorType, "010111" },
+ { kN32_SkColorType, "010111" },
};
static const int W = 20;
}
break;
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
if (safeSize != 0x8E1BC9BF040000LL) {
sizeFail = true;
}
{ kAlpha_8_SkColorType, 0, 0 },
{ kRGB_565_SkColorType, 0xFF00FF00, 0xFF00FF00 },
{ kRGB_565_SkColorType, 0xFFFF00FF, 0xFFFF00FF },
- { kPMColor_SkColorType, 0xFFFFFFFF, 0xFFFFFFFF },
- { kPMColor_SkColorType, 0, 0 },
- { kPMColor_SkColorType, 0xFF224466, 0xFF224466 },
+ { kN32_SkColorType, 0xFFFFFFFF, 0xFFFFFFFF },
+ { kN32_SkColorType, 0, 0 },
+ { kN32_SkColorType, 0xFF224466, 0xFF224466 },
};
// specify an area that doesn't touch (0,0) and may extend beyond the
// TODO: perhaps skia can relax this, and only require that rowBytes fit
// in a uint32_t (or larger), but for now this is the constraint.
- info.fColorType = kPMColor_SkColorType;
+ info.fColorType = kN32_SkColorType;
REPORTER_ASSERT(reporter, !bm.setConfig(info));
}
static Proc find_proc(const SkBitmap& bm, SkPMColor expect32, uint16_t expect16,
uint8_t expect8, uint32_t* expect) {
switch (bm.colorType()) {
- case kPMColor_SkColorType:
+ case kN32_SkColorType:
*expect = expect32;
return proc_32;
case kARGB_4444_SkColorType:
static const int W = 256;
static const SkColorType gDstColorType[] = {
- kPMColor_SkColorType,
+ kN32_SkColorType,
kRGB_565_SkColorType,
};
static const int H = W;
static const SkColorType gDstColorType[] = {
- kPMColor_SkColorType,
+ kN32_SkColorType,
kRGB_565_SkColorType,
};
}
info->fWidth = TestImageGenerator::Width();
info->fHeight = TestImageGenerator::Height();
- info->fColorType = kPMColor_SkColorType;
+ info->fColorType = kN32_SkColorType;
info->fAlphaType = kOpaque_SkAlphaType;
return true;
}
REPORTER_ASSERT(fReporter, rowBytes >= minRowBytes);
if ((NULL == pixels)
|| (fType != kSucceedGetPixels_TestType)
- || (info.fColorType != kPMColor_SkColorType)) {
+ || (info.fColorType != kN32_SkColorType)) {
return false;
}
char* bytePtr = static_cast<char*>(pixels);
SkIntToScalar((HEIGHT-(2*SPACER)) / 7));
const SkColorType colorTypes[] = {
- kRGB_565_SkColorType, kPMColor_SkColorType
+ kRGB_565_SkColorType, kN32_SkColorType
};
const int configCount = sizeof(colorTypes) / sizeof(SkBitmap::Config);
virtual bool getInfo(SkImageInfo* info) SK_OVERRIDE {
info->fWidth = 100;
info->fHeight = 100;
- info->fColorType = kPMColor_SkColorType;
+ info->fColorType = kN32_SkColorType;
info->fAlphaType = kPremul_SkAlphaType;
return true;
}
case kAlpha_8_SkColorType: return "Alpha_8";
case kRGB_565_SkColorType: return "RGB_565";
case kARGB_4444_SkColorType: return "ARGB_4444";
- case kPMColor_SkColorType: return "PMColor";
+ case kN32_SkColorType: return "N32";
case kBackwards_SkColorType: return "Backwards";
case kIndex_8_SkColorType: return "Index_8";
default: return "ERROR";
kAlpha_8_SkColorType,
kRGB_565_SkColorType,
kARGB_4444_SkColorType, // Most decoders will fail on 4444.
- kPMColor_SkColorType
+ kN32_SkColorType
// Note that indexed color is left out of the list. Lazy
// decoding doesn't do indexed color.
};
SkIRect clippedRect = DEV_RECT;
if (clippedRect.intersect(srcRect)) {
REPORTER_ASSERT(reporter, success);
- REPORTER_ASSERT(reporter, kPMColor_SkColorType == wkbmp.colorType());
+ REPORTER_ASSERT(reporter, kN32_SkColorType == wkbmp.colorType());
REPORTER_ASSERT(reporter, kPremul_SkAlphaType == wkbmp.alphaType());
checkRead(reporter, wkbmp, clippedRect.fLeft,
clippedRect.fTop, true, false);
static bool setup_bitmap_for_canvas(SkBitmap* bitmap) {
SkImageInfo info = SkImageInfo::Make(
- kBitmapSize, kBitmapSize, kPMColor_SkColorType, kPremul_SkAlphaType);
+ kBitmapSize, kBitmapSize, kN32_SkColorType, kPremul_SkAlphaType);
return bitmap->allocPixels(info);
}
if (success) {
REPORTER_ASSERT(reporter, 10 == info.fWidth);
REPORTER_ASSERT(reporter, 10 == info.fHeight);
- REPORTER_ASSERT(reporter, kPMColor_SkColorType == info.fColorType);
+ REPORTER_ASSERT(reporter, kN32_SkColorType == info.fColorType);
REPORTER_ASSERT(reporter, kPremul_SkAlphaType == info.fAlphaType ||
kOpaque_SkAlphaType == info.fAlphaType);
REPORTER_ASSERT(reporter, info.minRowBytes() <= rowBytes);
if (canvasInfo.width() != DEV_W ||
canvasInfo.height() != DEV_H ||
- canvasInfo.colorType() != kPMColor_SkColorType) {
+ canvasInfo.colorType() != kN32_SkColorType) {
return false;
}
bool write_bitmap(const SkString& path, const SkBitmap& bitmap) {
SkBitmap copy;
- bitmap.copyTo(©, kPMColor_SkColorType);
+ bitmap.copyTo(©, kN32_SkColorType);
force_all_opaque(copy);
return SkImageEncoder::EncodeFile(path.c_str(), copy,
SkImageEncoder::kPNG_Type, 100);
return true;
}
- if (bm.colorType() == kPMColor_SkColorType) {
+ if (bm.colorType() == kN32_SkColorType) {
// First attempt at encoding failed, and the bitmap was already 8888. Making
// a copy is not going to help.
return false;
// Encoding failed. Copy to 8888 and try again.
SkBitmap bm8888;
- if (!bm.copyTo(&bm8888, kPMColor_SkColorType)) {
+ if (!bm.copyTo(&bm8888, kN32_SkColorType)) {
return false;
}
return SkImageEncoder::EncodeFile(filename.c_str(), bm8888, SkImageEncoder::kPNG_Type, 100);
// compute the image diff and output it
SkBitmap copy;
- diffData.fResult.poiAlphaMask.copyTo(©, kPMColor_SkColorType);
+ diffData.fResult.poiAlphaMask.copyTo(©, kN32_SkColorType);
SkImageEncoder::EncodeFile(newRecord->fDifferencePath.c_str(), copy,
SkImageEncoder::kPNG_Type, 100);
/// Converts a 8888 bitmap to LAB color space and puts it into the output
static bool bitmap_to_cielab(const SkBitmap* bitmap, ImageLAB* outImageLAB) {
SkBitmap bm8888;
- if (bitmap->colorType() != kPMColor_SkColorType) {
- if (!bitmap->copyTo(&bm8888, kPMColor_SkColorType)) {
+ if (bitmap->colorType() != kN32_SkColorType) {
+ if (!bitmap->copyTo(&bm8888, kN32_SkColorType)) {
return false;
}
bitmap = &bm8888;