commit 8cad6374f05e281e1fde0e104afb7b7042fbe181
author John Stiles <johnstiles@google.com> Wed Apr 07 12:31:13 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Apr 07 19:13:20 2021 +0000
tree 0c224b0a79d7846e18a31dd42023ae365071d89e
parent 8317d0b775ae469f76ff2866b7ffa345ad371a81

Rename composite constructors to compound constructors.

Change-Id: Ic1f5d28651e8de9d9ecea2a0bcfa73063dd90a9d
Bug: skia:11032
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/393337
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>

src/sksl/SkSLInliner.cpp

diff --git a/src/sksl/SkSLInliner.cpp b/src/sksl/SkSLInliner.cpp
index 62ae894..d90ecde 100644
--- a/src/sksl/SkSLInliner.cpp
+++ b/src/sksl/SkSLInliner.cpp
@@ -18,8 +18,8 @@
 #include "src/sksl/ir/SkSLBreakStatement.h"
 #include "src/sksl/ir/SkSLConstructor.h"
 #include "src/sksl/ir/SkSLConstructorArray.h"
-#include "src/sksl/ir/SkSLConstructorComposite.h"
-#include "src/sksl/ir/SkSLConstructorCompositeCast.h"
+#include "src/sksl/ir/SkSLConstructorCompound.h"
+#include "src/sksl/ir/SkSLConstructorCompoundCast.h"
 #include "src/sksl/ir/SkSLConstructorDiagonalMatrix.h"
 #include "src/sksl/ir/SkSLConstructorMatrixResize.h"
 #include "src/sksl/ir/SkSLConstructorScalarCast.h"
@@ -317,15 +317,15 @@
                                           *ctor.type().clone(symbolTableForExpression),
                                           argList(ctor.arguments()));
         }
-        case Expression::Kind::kConstructorComposite: {
-            const ConstructorComposite& ctor = expression.as<ConstructorComposite>();
-            return ConstructorComposite::Make(*fContext, offset,
+        case Expression::Kind::kConstructorCompound: {
+            const ConstructorCompound& ctor = expression.as<ConstructorCompound>();
+            return ConstructorCompound::Make(*fContext, offset,
                                               *ctor.type().clone(symbolTableForExpression),
                                               argList(ctor.arguments()));
         }
-        case Expression::Kind::kConstructorCompositeCast: {
-            const ConstructorCompositeCast& ctor = expression.as<ConstructorCompositeCast>();
-            return ConstructorCompositeCast::Make(*fContext, offset,
+        case Expression::Kind::kConstructorCompoundCast: {
+            const ConstructorCompoundCast& ctor = expression.as<ConstructorCompoundCast>();
+            return ConstructorCompoundCast::Make(*fContext, offset,
                                                   *ctor.type().clone(symbolTableForExpression),
                                                   expr(ctor.argument()));
         }
@@ -948,8 +948,8 @@
                 break;
             }
             case Expression::Kind::kConstructorArray:
-            case Expression::Kind::kConstructorComposite:
-            case Expression::Kind::kConstructorCompositeCast:
+            case Expression::Kind::kConstructorCompound:
+            case Expression::Kind::kConstructorCompoundCast:
             case Expression::Kind::kConstructorDiagonalMatrix:
             case Expression::Kind::kConstructorMatrixResize:
             case Expression::Kind::kConstructorScalarCast: