cleaned up SkSL constant handling

Bug: skia:
Change-Id: I8131c4348f0f91bc2705e493918c4ca2d1f4867b
Reviewed-on: https://skia-review.googlesource.com/95920
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/sksl/ir/SkSLConstructor.h b/src/sksl/ir/SkSLConstructor.h
index cea5265cea..b8824ba3d2 100644
--- a/src/sksl/ir/SkSLConstructor.h
+++ b/src/sksl/ir/SkSLConstructor.h
@@ -146,15 +146,11 @@ struct Constructor : public Expression {
     }
 
     double getFVecComponent(int index) const {
-        const Expression& c = this->getVecComponent(index);
-        ASSERT(c.fKind == Expression::kFloatLiteral_Kind);
-        return ((FloatLiteral&) c).fValue;
+        return this->getVecComponent(index).getConstantFloat();
     }
 
     int64_t getIVecComponent(int index) const {
-        const Expression& c = this->getVecComponent(index);
-        ASSERT(c.fKind == Expression::kIntLiteral_Kind);
-        return ((IntLiteral&) c).fValue;
+        return this->getVecComponent(index).getConstantInt();
     }
 
     // null return should be interpreted as zero