1cbc68f965
Reason for revert:
linux_blink_rel
[ RUN ] DeferredImageDecoderTest.drawIntoSkPicture
../../third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp:172: Failure
Value of: canvasBitmap.getColor(0, 0)
Actual: 0
Expected: static_cast<SkColor>( (static_cast<U8CPU>(255) << 24) | (static_cast<U8CPU>(255) << 16) | (static_cast<U8CPU>(255) << 8) | (static_cast<U8CPU>(255) << 0))
Which is: 4294967295
[ FAILED ] DeferredImageDecoderTest.drawIntoSkPicture (0 ms)
[1457/1458] DeferredImageDecoderTest.drawIntoSkPicture (0 ms)
[ RUN ] DeferredImageDecoderTest.decodeOnOtherThread
../../third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp:233: Failure
Value of: canvasBitmap.getColor(0, 0)
Actual: 0
Expected: static_cast<SkColor>( (static_cast<U8CPU>(255) << 24) | (static_cast<U8CPU>(255) << 16) | (static_cast<U8CPU>(255) << 8) | (static_cast<U8CPU>(255) << 0))
Which is: 4294967295
[ FAILED ] DeferredImageDecoderTest.decodeOnOtherThread (1 ms)
[1458/1458] DeferredImageDecoderTest.decodeOnOtherThread (1 ms)
Retrying 2 tests (retry #2)
Original issue's description:
> Revert of Revert of Add gamma/sRGB tag to SkImageInfo (patchset #1 id:1 of https://codereview.chromium.org/525113005/)
>
> Reason for revert:
> Experiment to see resulting failures
>
> Original issue's description:
> > Revert of Add gamma/sRGB tag to SkImageInfo (patchset #1 id:1 of https://codereview.chromium.org/522813002/)
> >
> > Reason for revert:
> > seems to be breaking layout tests in roll
> >
> > Original issue's description:
> > > Add gamma/sRGB tag to SkImageInfo
> > >
> > > This reverts commit 64ba5fa1ff
.
> > >
> > > BUG=skia:
> > >
> > > Committed: https://skia.googlesource.com/skia/+/c89aa509d6a094bc1b18d73135343819903a9cfb
> >
> > TBR=reed@google.com
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=skia:
> >
> > Committed: https://skia.googlesource.com/skia/+/b44c1895afae516cb851cd1a0cea83343c354ee4
>
> TBR=reed@google.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4581828014eb3d015e6ed55c9a5b6932b8751818
R=reed@google.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/524593005
262 lines
7.4 KiB
C++
262 lines
7.4 KiB
C++
/*
|
|
* Copyright 2013 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SkImageInfo_DEFINED
|
|
#define SkImageInfo_DEFINED
|
|
|
|
#include "SkMath.h"
|
|
#include "SkSize.h"
|
|
|
|
class SkWriteBuffer;
|
|
class SkReadBuffer;
|
|
|
|
/**
|
|
* Describes how to interpret the alpha compoent of a pixel.
|
|
*/
|
|
enum SkAlphaType {
|
|
/**
|
|
* All pixels should be treated as opaque, regardless of the value stored
|
|
* in their alpha field. Used for legacy images that wrote 0 or garbarge
|
|
* in their alpha field, but intended the RGB to be treated as opaque.
|
|
*/
|
|
kIgnore_SkAlphaType,
|
|
|
|
/**
|
|
* All pixels are stored as opaque. This differs slightly from kIgnore in
|
|
* that kOpaque has correct "opaque" values stored in the pixels, while
|
|
* kIgnore may not, but in both cases the caller should treat the pixels
|
|
* as opaque.
|
|
*/
|
|
kOpaque_SkAlphaType,
|
|
|
|
/**
|
|
* All pixels have their alpha premultiplied in their color components.
|
|
* This is the natural format for the rendering target pixels.
|
|
*/
|
|
kPremul_SkAlphaType,
|
|
|
|
/**
|
|
* All pixels have their color components stored without any regard to the
|
|
* alpha. e.g. this is the default configuration for PNG images.
|
|
*
|
|
* This alpha-type is ONLY supported for input images. Rendering cannot
|
|
* generate this on output.
|
|
*/
|
|
kUnpremul_SkAlphaType,
|
|
|
|
kLastEnum_SkAlphaType = kUnpremul_SkAlphaType
|
|
};
|
|
|
|
static inline bool SkAlphaTypeIsOpaque(SkAlphaType at) {
|
|
SK_COMPILE_ASSERT(kIgnore_SkAlphaType < kOpaque_SkAlphaType, bad_alphatype_order);
|
|
SK_COMPILE_ASSERT(kPremul_SkAlphaType > kOpaque_SkAlphaType, bad_alphatype_order);
|
|
SK_COMPILE_ASSERT(kUnpremul_SkAlphaType > kOpaque_SkAlphaType, bad_alphatype_order);
|
|
|
|
return (unsigned)at <= kOpaque_SkAlphaType;
|
|
}
|
|
|
|
static inline bool SkAlphaTypeIsValid(unsigned value) {
|
|
return value <= kLastEnum_SkAlphaType;
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
/**
|
|
* Describes how to interpret the components of a pixel.
|
|
*
|
|
* kN32_SkColorType is an alias for whichever 32bit ARGB format is the "native"
|
|
* form for skia's blitters. Use this if you don't have a swizzle preference
|
|
* for 32bit pixels.
|
|
*/
|
|
enum SkColorType {
|
|
kUnknown_SkColorType,
|
|
kAlpha_8_SkColorType,
|
|
kRGB_565_SkColorType,
|
|
kARGB_4444_SkColorType,
|
|
kRGBA_8888_SkColorType,
|
|
kBGRA_8888_SkColorType,
|
|
kIndex_8_SkColorType,
|
|
|
|
kLastEnum_SkColorType = kIndex_8_SkColorType,
|
|
|
|
#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
|
|
kN32_SkColorType = kBGRA_8888_SkColorType,
|
|
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
|
|
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 const uint8_t gSize[] = {
|
|
0, // Unknown
|
|
1, // Alpha_8
|
|
2, // RGB_565
|
|
2, // ARGB_4444
|
|
4, // RGBA_8888
|
|
4, // BGRA_8888
|
|
1, // kIndex_8
|
|
};
|
|
SK_COMPILE_ASSERT(SK_ARRAY_COUNT(gSize) == (size_t)(kLastEnum_SkColorType + 1),
|
|
size_mismatch_with_SkColorType_enum);
|
|
|
|
SkASSERT((size_t)ct < SK_ARRAY_COUNT(gSize));
|
|
return gSize[ct];
|
|
}
|
|
|
|
static inline size_t SkColorTypeMinRowBytes(SkColorType ct, int width) {
|
|
return width * SkColorTypeBytesPerPixel(ct);
|
|
}
|
|
|
|
static inline bool SkColorTypeIsValid(unsigned value) {
|
|
return value <= kLastEnum_SkColorType;
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
/**
|
|
* Return true if alphaType is supported by colorType. If there is a canonical
|
|
* alphaType for this colorType, return it in canonical.
|
|
*/
|
|
bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
|
|
SkAlphaType* canonical = NULL);
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
/**
|
|
* Describe an image's dimensions and pixel type.
|
|
*/
|
|
struct SkImageInfo {
|
|
int fWidth;
|
|
int fHeight;
|
|
SkColorType fColorType;
|
|
SkAlphaType fAlphaType;
|
|
|
|
static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at) {
|
|
SkImageInfo info = {
|
|
width, height, ct, at
|
|
};
|
|
return info;
|
|
}
|
|
|
|
/**
|
|
* Sets colortype to the native ARGB32 type.
|
|
*/
|
|
static SkImageInfo MakeN32(int width, int height, SkAlphaType at) {
|
|
SkImageInfo info = {
|
|
width, height, kN32_SkColorType, at
|
|
};
|
|
return info;
|
|
}
|
|
|
|
/**
|
|
* Sets colortype to the native ARGB32 type, and the alphatype to premul.
|
|
*/
|
|
static SkImageInfo MakeN32Premul(int width, int height) {
|
|
SkImageInfo info = {
|
|
width, height, kN32_SkColorType, kPremul_SkAlphaType
|
|
};
|
|
return info;
|
|
}
|
|
|
|
/**
|
|
* Sets colortype to the native ARGB32 type, and the alphatype to premul.
|
|
*/
|
|
static SkImageInfo MakeN32Premul(const SkISize& size) {
|
|
return MakeN32Premul(size.width(), size.height());
|
|
}
|
|
|
|
static SkImageInfo MakeA8(int width, int height) {
|
|
SkImageInfo info = {
|
|
width, height, kAlpha_8_SkColorType, kPremul_SkAlphaType
|
|
};
|
|
return info;
|
|
}
|
|
|
|
static SkImageInfo MakeUnknown(int width, int height) {
|
|
SkImageInfo info = {
|
|
width, height, kUnknown_SkColorType, kIgnore_SkAlphaType
|
|
};
|
|
return info;
|
|
}
|
|
|
|
static SkImageInfo MakeUnknown() {
|
|
SkImageInfo info = {
|
|
0, 0, kUnknown_SkColorType, kIgnore_SkAlphaType
|
|
};
|
|
return info;
|
|
}
|
|
|
|
int width() const { return fWidth; }
|
|
int height() const { return fHeight; }
|
|
SkColorType colorType() const { return fColorType; }
|
|
SkAlphaType alphaType() const { return fAlphaType; }
|
|
|
|
bool isEmpty() const { return fWidth <= 0 || fHeight <= 0; }
|
|
|
|
bool isOpaque() const {
|
|
return SkAlphaTypeIsOpaque(fAlphaType);
|
|
}
|
|
|
|
SkISize dimensions() const { return SkISize::Make(fWidth, fHeight); }
|
|
|
|
/**
|
|
* Return a new ImageInfo with the same colortype and alphatype as this info,
|
|
* but with the specified width and height.
|
|
*/
|
|
SkImageInfo makeWH(int newWidth, int newHeight) const {
|
|
return SkImageInfo::Make(newWidth, newHeight, fColorType, fAlphaType);
|
|
}
|
|
|
|
int bytesPerPixel() const {
|
|
return SkColorTypeBytesPerPixel(fColorType);
|
|
}
|
|
|
|
uint64_t minRowBytes64() const {
|
|
return sk_64_mul(fWidth, this->bytesPerPixel());
|
|
}
|
|
|
|
size_t minRowBytes() const {
|
|
return (size_t)this->minRowBytes64();
|
|
}
|
|
|
|
bool operator==(const SkImageInfo& other) const {
|
|
return 0 == memcmp(this, &other, sizeof(other));
|
|
}
|
|
bool operator!=(const SkImageInfo& other) const {
|
|
return 0 != memcmp(this, &other, sizeof(other));
|
|
}
|
|
|
|
void unflatten(SkReadBuffer&);
|
|
void flatten(SkWriteBuffer&) const;
|
|
|
|
int64_t getSafeSize64(size_t rowBytes) const {
|
|
if (0 == fHeight) {
|
|
return 0;
|
|
}
|
|
return sk_64_mul(fHeight - 1, rowBytes) + fWidth * this->bytesPerPixel();
|
|
}
|
|
|
|
size_t getSafeSize(size_t rowBytes) const {
|
|
return (size_t)this->getSafeSize64(rowBytes);
|
|
}
|
|
|
|
bool validRowBytes(size_t rowBytes) const {
|
|
uint64_t rb = sk_64_mul(fWidth, this->bytesPerPixel());
|
|
return rowBytes >= rb;
|
|
}
|
|
|
|
SkDEBUGCODE(void validate() const;)
|
|
};
|
|
|
|
#endif
|