commit 1f19ce22728c76d3e4e9951438969145cc5c5f02
author John Stiles <johnstiles@google.com> Thu Feb 11 17:40:03 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Feb 12 20:57:50 2021 +0000
tree 33047fdde5264888126b181e7fd119a1118491bf
parent 2494942f0d8d4ff4c4d4864cc79b326b6fe2dcc2

Reland "Remove deprecated form of SkRuntimeEffect::Make."

This reverts commit e89b50ae054c08fc03ad5e7349d28c6a565e054b.

Reason for revert: landed Android fix at http://ag/13544365 (master) and
http://ag/13554983 (sc-dev)

Original change's description:
> Android roll broke with a compilation error:
> frameworks/base/libs/hwui/jni/Shader.cpp:243:37: error: no matching function for call to 'get'
>     sk_sp<SkRuntimeEffect> effect = std::get<0>(result)
>
> Revert "Remove deprecated form of SkRuntimeEffect::Make."
>
> This reverts commit 1cda19436633c283561fe9a51f221ea9bf0ba2a3.
>
> Reason for revert: <INSERT REASONING HERE>
>
> Original change's description:
> > Remove deprecated form of SkRuntimeEffect::Make.
> >
> > Chromium has migrated to the new API at https://crrev.com/c/2675855.
> >
> > Change-Id: Id4af77db2c462348e8031d28f56e543ad619c19c
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/367060
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Commit-Queue: Brian Osman <brianosman@google.com>
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
>
> TBR=mtklein@google.com,brianosman@google.com,johnstiles@google.com
>
> Change-Id: Ie18f865f3b7f5b0263db1e52b19cf6faa0500fdd
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/368616
> Reviewed-by: Stan Iliev <stani@google.com>
> Commit-Queue: Stan Iliev <stani@google.com>

TBR=mtklein@google.com,brianosman@google.com,stani@google.com,johnstiles@google.com

Change-Id: I9d679013cb275dc80aaaa977b7f1f4da31f36d1e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/369037
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>

gm/fp_sample_chaining.cpp

diff --git a/gm/fp_sample_chaining.cpp b/gm/fp_sample_chaining.cpp
index 5af0606..689aec9 100644
--- a/gm/fp_sample_chaining.cpp
+++ b/gm/fp_sample_chaining.cpp
@@ -316,10 +316,10 @@
     SkBitmap bmp = make_test_bitmap();
 
     sk_sp<SkRuntimeEffect> effects[4] = {
-        std::get<0>(SkRuntimeEffect::Make(SkString(gConstantMatrixSkSL))),
-        std::get<0>(SkRuntimeEffect::Make(SkString(gUniformMatrixSkSL))),
-        std::get<0>(SkRuntimeEffect::Make(SkString(gVariableMatrixSkSL))),
-        std::get<0>(SkRuntimeEffect::Make(SkString(gExplicitCoordSkSL))),
+        SkRuntimeEffect::Make(SkString(gConstantMatrixSkSL)).effect,
+        SkRuntimeEffect::Make(SkString(gUniformMatrixSkSL)).effect,
+        SkRuntimeEffect::Make(SkString(gVariableMatrixSkSL)).effect,
+        SkRuntimeEffect::Make(SkString(gExplicitCoordSkSL)).effect,
     };
 
     canvas->translate(10, 10);

gm/mixercolorfilter.cpp

diff --git a/gm/mixercolorfilter.cpp b/gm/mixercolorfilter.cpp
index 5d73024..f76b164 100644
--- a/gm/mixercolorfilter.cpp
+++ b/gm/mixercolorfilter.cpp
@@ -117,7 +117,7 @@
                     return mix(sample(cf0), sample(cf1), t);
                 }
             )";
-            effect = std::get<0>(SkRuntimeEffect::Make(SkString(sksl)));
+            effect = SkRuntimeEffect::Make(SkString(sksl)).effect;
             SkASSERT(effect);
         }
 

gm/runtimefunctions.cpp

diff --git a/gm/runtimefunctions.cpp b/gm/runtimefunctions.cpp
index f8b7450..d4fbf16 100644
--- a/gm/runtimefunctions.cpp
+++ b/gm/runtimefunctions.cpp
@@ -39,7 +39,7 @@
 
     void onDraw(SkCanvas* canvas) override {
         sk_sp<SkRuntimeEffect> gEffect =
-                std::get<0>(SkRuntimeEffect::Make(SkString(RUNTIME_FUNCTIONS_SRC)));
+                SkRuntimeEffect::Make(SkString(RUNTIME_FUNCTIONS_SRC)).effect;
         SkASSERT(gEffect);
 
         SkMatrix localM;

gm/runtimeshader.cpp

diff --git a/gm/runtimeshader.cpp b/gm/runtimeshader.cpp
index 719fbac..ac09a0a 100644
--- a/gm/runtimeshader.cpp
+++ b/gm/runtimeshader.cpp
@@ -356,7 +356,7 @@
     surf->getCanvas()->drawLine(0, 0, 100, 100, p);
     auto shader = surf->makeImageSnapshot()->makeShader(SkSamplingOptions(SkFilterMode::kLinear));
 
-    SkRuntimeShaderBuilder builder(std::get<0>(SkRuntimeEffect::Make(SkString(scale))));
+    SkRuntimeShaderBuilder builder(SkRuntimeEffect::Make(SkString(scale)).effect);
     builder.child("child") = shader;
     p.setShader(builder.makeShader(nullptr, false));
 

gm/vertices.cpp

diff --git a/gm/vertices.cpp b/gm/vertices.cpp
index 9aaf51a..d8d3a80 100644
--- a/gm/vertices.cpp
+++ b/gm/vertices.cpp
@@ -305,7 +305,7 @@
                 return vtx_color;
             }
         )";
-        auto[effect, errorText] = SkRuntimeEffect::Make(SkString(gProg));
+        auto [effect, errorText] = SkRuntimeEffect::Make(SkString(gProg));
         if (!effect) {
             SK_ABORT("RuntimeEffect error: %s\n", errorText.c_str());
         }