diff options
| author |  Matt Sarett <msarett@google.com> | 2017-04-20 10:09:23 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-21 19:55:23 +0000 |
| commit | 72266eeca036b5216a9bfa0bb68cb0fbb9bbb57b (patch) | |
| tree | 5a956833c922f9157822feb3714dc794f954df6f /include | |
| parent | 28a7ad2ba78551c1d666dcea0bfe2fb595d8a1b0 (diff) | |
makeColorSpace() for SkColorFilterShader and SkLightingShader
Fixes 4 gms in gbr-8888 config.
Bug: skia:6516
Change-Id: I9da839eb0211910989be35db0e13c0e1bbfa185d
Reviewed-on: https://skia-review.googlesource.com/13964
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkLights.h | 6 | ||||
| -rw-r--r-- | include/core/SkShader.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/core/SkLights.h b/include/core/SkLights.h index d91d91935d..5c6648751d 100644 --- a/include/core/SkLights.h +++ b/include/core/SkLights.h @@ -113,6 +113,8 @@ public: bool operator!= (const Light& b) { return !(this->operator==(b)); } private: + friend class SkLights; + LightType fType; SkColor3f fColor; // linear (unpremul) color. Range is 0..1 in each channel. @@ -191,6 +193,10 @@ private: SkLights() { fAmbientLightColor.set(0.0f, 0.0f, 0.0f); } + + friend class SkLightingShaderImpl; + sk_sp<SkLights> makeColorSpace(SkColorSpaceXformer* xformer) const; + SkTArray<Light> fLights; SkColor3f fAmbientLightColor; typedef SkRefCnt INHERITED; diff --git a/include/core/SkShader.h b/include/core/SkShader.h index b3b5faaa1f..ba61314f77 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -517,7 +517,9 @@ private: friend class SkLocalMatrixShader; friend class SkBitmapProcLegacyShader; // for computeTotalInverse() friend class SkComposeShader; + friend class SkColorFilterShader; friend class SkColorSpaceXformer; + friend class SkLightingShaderImpl; typedef SkFlattenable INHERITED; }; |