commit cc813ae9a0afe4259f12b655d9336662a6e2c100
author Brian Osman <brianosman@google.com> Tue Oct 25 11:45:14 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 25 17:02:56 2016 +0000
tree 34684c02da0583e2e21de41a2c950f831ca3972e
parent b00c949c3630ff4412985b747b266a06d855ca78

Fix dimensions and color-spin in color4shader GM

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3907

Change-Id: I0f263d98f942eda07eec4dabfec484461f77f83d
Reviewed-on: https://skia-review.googlesource.com/3907
Reviewed-by: Matt Sarett <msarett@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

gm/color4f.cpp

diff --git a/gm/color4f.cpp b/gm/color4f.cpp
index 715229d..c1535cc 100644
--- a/gm/color4f.cpp
+++ b/gm/color4f.cpp
@@ -8,6 +8,7 @@
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
+#include "SkColorSpace_Base.h"
 #include "SkShader.h"
 #include "SkSurface.h"
 
@@ -91,12 +92,15 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "SkColorSpace.h"
 
-DEF_SIMPLE_GM(color4shader, canvas, 1024, 260) {
+DEF_SIMPLE_GM(color4shader, canvas, 360, 480) {
     canvas->translate(10, 10);
 
+    auto srgb = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+
     SkMatrix44 mat(SkMatrix44::kUninitialized_Constructor);
-    // red -> blue, green -> red, blue -> green
+    // red -> blue, green -> red, blue -> green (sRGB)
     mat.set3x3(0, 0, 1, 1, 0, 0, 0, 1, 0);
+    mat.postConcat(*as_CSB(srgb)->toXYZD50());
 
     const SkColor4f colors[] {
         { 1, 0, 0, 1 },
@@ -111,7 +115,7 @@
     for (const auto& c4 : colors) {
         sk_sp<SkShader> shaders[] {
             SkShader::MakeColorShader(c4, nullptr),
-            SkShader::MakeColorShader(c4, SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named)),
+            SkShader::MakeColorShader(c4, srgb),
             SkShader::MakeColorShader(c4,
                     SkColorSpace::MakeRGB(SkColorSpace::kLinear_RenderTargetGamma, mat)),
         };