| Index: src/gpu/SkGpuDevice.cpp
|
| diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
|
| index 13b00defe45e2f038b9b8165db4f13fe97b0cf6f..67634c51935a53e9168a58f2e3ba274f22e9156b 100644
|
| --- a/src/gpu/SkGpuDevice.cpp
|
| +++ b/src/gpu/SkGpuDevice.cpp
|
| @@ -351,12 +351,10 @@ SK_COMPILE_ASSERT(SkShader::kNone_BitmapType == 0, shader_type_mismatch);
|
| SK_COMPILE_ASSERT(SkShader::kDefault_BitmapType == 1, shader_type_mismatch);
|
| SK_COMPILE_ASSERT(SkShader::kRadial_BitmapType == 2, shader_type_mismatch);
|
| SK_COMPILE_ASSERT(SkShader::kSweep_BitmapType == 3, shader_type_mismatch);
|
| -SK_COMPILE_ASSERT(SkShader::kTwoPointRadial_BitmapType == 4,
|
| +SK_COMPILE_ASSERT(SkShader::kTwoPointConical_BitmapType == 4,
|
| shader_type_mismatch);
|
| -SK_COMPILE_ASSERT(SkShader::kTwoPointConical_BitmapType == 5,
|
| - shader_type_mismatch);
|
| -SK_COMPILE_ASSERT(SkShader::kLinear_BitmapType == 6, shader_type_mismatch);
|
| -SK_COMPILE_ASSERT(SkShader::kLast_BitmapType == 6, shader_type_mismatch);
|
| +SK_COMPILE_ASSERT(SkShader::kLinear_BitmapType == 5, shader_type_mismatch);
|
| +SK_COMPILE_ASSERT(SkShader::kLast_BitmapType == 5, shader_type_mismatch);
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|