tree d80e13508daa3a92bfa04c3dde68df1ed2eab297
parent 8ced56f05f2cb947551d9c70f6a43c1eff32686f
author Brian Osman <brianosman@google.com> 1618864422 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> 1618869325 +0000

Fix soft merge conflict in SkRuntimeEffect

This meant that the new Shader/ColorFilter factories were always
compiling against the more lenient (old) rules.

Bug: skia:11813
Change-Id: I65038595edf2c6087aad6efcd27508338b24cce8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/398229
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>