commit 99f228e285a8776026cc58f02be6a391d29db2d2
author Herb Derby <herb@google.com> Fri Dec 06 16:48:55 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 06 22:17:15 2019 +0000
tree cdb3e06c365b17097eea2c6b79c2bcc40e26d82b
parent cd498e151ff51c6a9836132a549f88e8a5294714

Change from std to skstd for aligned_union_t

Change-Id: I67bd77cf072e203f23ffc49d591cb826fed598dd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/258640
Commit-Queue: Herb Derby <herb@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Herb Derby <herb@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

src/gpu/text/GrTextBlob.cpp

diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/text/GrTextBlob.cpp
index 1ea9839..6db65fc 100644
--- a/src/gpu/text/GrTextBlob.cpp
+++ b/src/gpu/text/GrTextBlob.cpp
@@ -223,9 +223,9 @@
                                    GrColor color,
                                    bool forceWForDistanceFields) {
 
-    size_t vertexSize = sizeof(std::aligned_union_t<0, Mask2DVertex, ARGB2DVertex>);
+    size_t vertexSize = sizeof(skstd::aligned_union_t<0, Mask2DVertex, ARGB2DVertex>);
     if (viewMatrix.hasPerspective() || forceWForDistanceFields) {
-        vertexSize = sizeof(std::aligned_union_t<0, SDFT3DVertex, ARGB3DVertex>);
+        vertexSize = sizeof(skstd::aligned_union_t<0, SDFT3DVertex, ARGB3DVertex>);
     }
 
     size_t quadSize = kVerticesPerGlyph * vertexSize;