From 98e38e2ac5e91eb288eaeceb5b0f36f9b2dd412a Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Fri, 12 Jan 2018 15:59:53 +0000 Subject: Revert "Revert "fix legacy makeRasterImage()"" This reverts commit ef29e42ef3d81a0e704cf0efcfc9937b531f0327. Reason for revert: probably not either roll. Original change's description: > Revert "fix legacy makeRasterImage()" > > This reverts commit 7c4ca043361f6adb3d17a9d3db2397d86bac5a2d. > > Reason for revert: layout, cereal tests? > > Original change's description: > > fix legacy makeRasterImage() > > > > Passing the color space down into SkImage_Lazy ends up triggering a > > SkTransferFunctionBehavior::kRespect decode (tf(r*a)), where we want > > ignore (tf(r)*a) to have any hope of working with the legacy backend. > > > > This fix in turn needs another little extension of another old hack in > > SkImage_Gpu for makeNonTextureImage() to keep working there. > > > > Bug: skia:7479 > > > > Change-Id: If48ca68e95d9eee597f6b10434498049981314ba > > Reviewed-on: https://skia-review.googlesource.com/93380 > > Commit-Queue: Mike Klein > > Reviewed-by: Brian Osman > > TBR=mtklein@chromium.org,brianosman@google.com > > Change-Id: I65092e01d767ef1fd35563f0b79ceded3c12b267 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:7479 > Reviewed-on: https://skia-review.googlesource.com/93820 > Reviewed-by: Mike Klein > Commit-Queue: Mike Klein TBR=mtklein@chromium.org,mtklein@google.com,brianosman@google.com Change-Id: Ic9b48d311cca152ab2e620363dd4528ed382eb88 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:7479 Reviewed-on: https://skia-review.googlesource.com/93960 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- gn/gm.gni | 1 + 1 file changed, 1 insertion(+) (limited to 'gn/gm.gni') diff --git a/gn/gm.gni b/gn/gm.gni index 25c80bf886..418957f34d 100644 --- a/gn/gm.gni +++ b/gn/gm.gni @@ -204,6 +204,7 @@ gm_sources = [ "$_gm/localmatriximageshader.cpp", "$_gm/lumafilter.cpp", "$_gm/makecolorspace.cpp", + "$_gm/makeRasterImage.cpp", "$_gm/manypaths.cpp", "$_gm/matrixconvolution.cpp", "$_gm/matriximagefilter.cpp", -- cgit v1.2.3