| Index: cc/resources/resource_format.cc
|
| diff --git a/cc/resources/resource_format.cc b/cc/resources/resource_format.cc
|
| index e76246432ef0e7a4ad77e91404e696ad8062e49a..e11c097b04fb53cf58fc4706ddaa7ecb60beb0a4 100644
|
| --- a/cc/resources/resource_format.cc
|
| +++ b/cc/resources/resource_format.cc
|
| @@ -97,36 +97,14 @@
|
| return gfx::BufferFormat::RGBA_4444;
|
| case RGBA_8888:
|
| return gfx::BufferFormat::RGBA_8888;
|
| - case ETC1:
|
| - return gfx::BufferFormat::ETC1;
|
| case ALPHA_8:
|
| case LUMINANCE_8:
|
| case RGB_565:
|
| + case ETC1:
|
| break;
|
| }
|
| NOTREACHED();
|
| return gfx::BufferFormat::RGBA_8888;
|
| }
|
|
|
| -bool IsResourceFormatCompressed(ResourceFormat format) {
|
| - return format == ETC1;
|
| -}
|
| -
|
| -bool DoesResourceFormatSupportAlpha(ResourceFormat format) {
|
| - switch (format) {
|
| - case RGBA_4444:
|
| - case RGBA_8888:
|
| - case BGRA_8888:
|
| - case ALPHA_8:
|
| - return true;
|
| - case LUMINANCE_8:
|
| - case RGB_565:
|
| - case ETC1:
|
| - case RED_8:
|
| - return false;
|
| - }
|
| - NOTREACHED();
|
| - return false;
|
| -}
|
| -
|
| } // namespace cc
|
|
|