From 113d05fa7b26797e3e468f78ea94a214476b63fb Mon Sep 17 00:00:00 2001 From: Ravi Mistry Date: Sat, 17 Dec 2016 01:31:03 +0000 Subject: Revert "Revert "WIP: Skia support library for ICC tasks"" This reverts commit eb733fbf56538838a36814c75cd03f917462cb22. Reason for revert: Revert patch was automatically merged incorrectly? Original change's description: > Revert "WIP: Skia support library for ICC tasks" > > This reverts commit fc8dc3194acb959ee5980b41766660ca0644bcab. > > Reason for revert: Breaks Build-Mac-Clang-Arm7-{Debug,Release}-iOS builds. > Example tasks: > * https://chromium-swarm.appspot.com/task?id=3322f668620b9e10&refresh=10 > * https://chromium-swarm.appspot.com/task?id=332296146331e810&refresh=10 > > Original change's description: > > WIP: Skia support library for ICC tasks > > > > As a starting point, this would be mostly trivial to implement using > > SkColorSpace. > > > > This also would give us the flexibility to begin to move all of > > the ICC related code from SkColorSpace to SkICC. > > > > What are the advantages of moving this away from SkColorSpace? > > (1) A long term goal (once Chrome uses SkCodec), might be to > > move SkColorSpace::MakeICC() out of the public API. That way, > > we can guarantee that we can draw to/from *any* SkColorSpace. > > (2) Keeps SkColorSpace separate from ICC-specific representations > > like SkColorSpaceTransferFn etc. > > > > BUG=skia: > > > > Change-Id: Iddeb9903221fb57fbfc01218d8641c928b4a5165 > > Reviewed-on: https://skia-review.googlesource.com/5676 > > Commit-Queue: Matt Sarett > > Reviewed-by: Brian Osman > > Reviewed-by: Mike Reed > > > > TBR=mtklein@google.com,msarett@google.com,brianosman@google.com,reed@google.com,reviews@skia.org > BUG=skia: > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: Ibdf272fce25892402bd3e85595fb8814cdf59856 > Reviewed-on: https://skia-review.googlesource.com/6232 > Commit-Queue: Ravi Mistry > Reviewed-by: Ravi Mistry > TBR=mtklein@google.com,rmistry@google.com,msarett@google.com,reviews@skia.org,brianosman@google.com,reed@google.com BUG=skia: NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I68b1624cfab8adfe31b17e1193a7766507dec8b0 Reviewed-on: https://skia-review.googlesource.com/6233 Commit-Queue: Ravi Mistry Reviewed-by: Ravi Mistry --- gn/core.gni | 1 + gn/tests.gni | 1 + 2 files changed, 2 insertions(+) (limited to 'gn') diff --git a/gn/core.gni b/gn/core.gni index d88ac5a299..2e457531c8 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -153,6 +153,7 @@ skia_core_sources = [ "$_src/core/SkGraphics.cpp", "$_src/core/SkHalf.cpp", "$_src/core/SkHalf.h", + "$_src/core/SkICC.cpp", "$_src/core/SkImageFilter.cpp", "$_src/core/SkImageFilterCache.cpp", "$_src/core/SkImageFilterCache.h", diff --git a/gn/tests.gni b/gn/tests.gni index 5f2d8b7931..79fd4be34c 100644 --- a/gn/tests.gni +++ b/gn/tests.gni @@ -99,6 +99,7 @@ tests_sources = [ "$_tests/GrTRecorderTest.cpp", "$_tests/HashTest.cpp", "$_tests/image-bitmap.cpp", + "$_tests/ICCTest.cpp", "$_tests/ImageCacheTest.cpp", "$_tests/ImageFilterCacheTest.cpp", "$_tests/ImageFilterTest.cpp", -- cgit v1.2.3