From c7206ccb30a93ff376482124fb79884be7ddcd7e Mon Sep 17 00:00:00 2001 From: Brian Osman Date: Tue, 2 Mar 2021 14:31:34 +0000 Subject: [PATCH] Revert "Reland "Reland "export SkRuntimeShaderBuilder""" This reverts commit 2960b6a62ca1e5094eb5645dc1e3dc53a8003086. Reason for revert: Android is invoking copy constructor. Original change's description: > Reland "Reland "export SkRuntimeShaderBuilder"" > > This is a reland of a950fef9db4e7d1167286a29b7280dc936436909 > ... with copy/move ctors/operators deleted for Clang warning. > > Original change's description: > > Reland "export SkRuntimeShaderBuilder" > > > > This is a reland of f1a937f141cbc233f65bfcd150ae48849ec3ef69 > > > > Original change's description: > > > export SkRuntimeShaderBuilder > > > > > > ... like we do SkRuntimeEffect. > > > > > > Change-Id: I024f1716b2f818d24b002213c02fa83d2b271123 > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/377757 > > > Commit-Queue: Mike Klein > > > Commit-Queue: Brian Osman > > > Auto-Submit: Mike Klein > > > Reviewed-by: Brian Osman > > > > Cq-Include-Trybots: luci.skia.skia.primary:Build-Win-MSVC-x86_64-Release-Shared > > Change-Id: I82c440be4ea53e21c6c3d2b6999d832f71563d83 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/377859 > > Reviewed-by: Brian Osman > > Commit-Queue: Mike Klein > > Change-Id: I29aaa84b6ff995b4226f2b9b34a94f4d2e9964dd > Cq-Include-Trybots: luci.skia.skia.primary:Build-Win-MSVC-x86_64-Release-Shared,Build-Win-Clang-x86_64-Release-Shared > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/377867 > Reviewed-by: Mike Klein > Commit-Queue: Mike Klein TBR=mtklein@google.com,brianosman@google.com Change-Id: Iba51d1823bbee084c6a9055d7f41b09786b5418e No-Presubmit: true No-Tree-Checks: true No-Try: true Cq-Include-Trybots: luci.skia.skia.primary:Build-Win-MSVC-x86_64-Release-Shared Cq-Include-Trybots: luci.skia.skia.primary:Build-Win-Clang-x86_64-Release-Shared Reviewed-on: https://skia-review.googlesource.com/c/skia/+/378316 Reviewed-by: Brian Osman Commit-Queue: Brian Osman --- include/effects/SkRuntimeEffect.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/include/effects/SkRuntimeEffect.h b/include/effects/SkRuntimeEffect.h index 7391ddc4da..c8c60eba75 100644 --- a/include/effects/SkRuntimeEffect.h +++ b/include/effects/SkRuntimeEffect.h @@ -11,7 +11,6 @@ #include "include/core/SkData.h" #include "include/core/SkImageInfo.h" #include "include/core/SkMatrix.h" -#include "include/core/SkShader.h" #include "include/core/SkString.h" #include "include/private/SkSLSampleUsage.h" @@ -20,6 +19,7 @@ class GrRecordingContext; class SkColorFilter; class SkImage; +class SkShader; namespace SkSL { class FunctionDefinition; @@ -196,17 +196,11 @@ private: * Note that SkRuntimeShaderBuilder is built entirely on the public API of SkRuntimeEffect, * so can be used as-is or serve as inspiration for other interfaces or binding techniques. */ -class SK_API SkRuntimeShaderBuilder { +class SkRuntimeShaderBuilder { public: SkRuntimeShaderBuilder(sk_sp); ~SkRuntimeShaderBuilder(); - SkRuntimeShaderBuilder(const SkRuntimeShaderBuilder&) = delete; - SkRuntimeShaderBuilder(SkRuntimeShaderBuilder&&) = delete; - - SkRuntimeShaderBuilder& operator=(const SkRuntimeShaderBuilder&) = delete; - SkRuntimeShaderBuilder& operator=(SkRuntimeShaderBuilder&&) = delete; - struct BuilderUniform { // Copy 'val' to this variable. No type conversion is performed - 'val' must be same // size as expected by the effect. Information about the variable can be queried by