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/SkSLDehydrator.cpp

diff --git a/src/sksl/SkSLDehydrator.cpp b/src/sksl/SkSLDehydrator.cpp
index 99f5c53..3b06328 100644
--- a/src/sksl/SkSLDehydrator.cpp
+++ b/src/sksl/SkSLDehydrator.cpp
@@ -17,8 +17,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"
@@ -294,16 +294,16 @@
                 this->writeExpressionSpan(e->as<ConstructorArray>().argumentSpan());
                 break;
 
-            case Expression::Kind::kConstructorComposite:
-                this->writeCommand(Rehydrator::kConstructorComposite_Command);
+            case Expression::Kind::kConstructorCompound:
+                this->writeCommand(Rehydrator::kConstructorCompound_Command);
                 this->write(e->type());
-                this->writeExpressionSpan(e->as<ConstructorComposite>().argumentSpan());
+                this->writeExpressionSpan(e->as<ConstructorCompound>().argumentSpan());
                 break;
 
-            case Expression::Kind::kConstructorCompositeCast:
-                this->writeCommand(Rehydrator::kConstructorCompositeCast_Command);
+            case Expression::Kind::kConstructorCompoundCast:
+                this->writeCommand(Rehydrator::kConstructorCompoundCast_Command);
                 this->write(e->type());
-                this->writeExpressionSpan(e->as<ConstructorCompositeCast>().argumentSpan());
+                this->writeExpressionSpan(e->as<ConstructorCompoundCast>().argumentSpan());
                 break;
 
             case Expression::Kind::kConstructorDiagonalMatrix: