Fix check for ARC_TO vs R_ARC_TO for vector assets

ui/gfx/paint_vector_icon.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/paint_vector_icon.h"
 
 #include <map>
 #include <tuple>
 
 #include "base/i18n/rtl.h"
@@ skipping 84 matching lines @@
       paths.back().setFillType(SkPath::kEvenOdd_FillType);
 
       paints.push_back(SkPaint());
       paints.back().setColor(color);
       paints.back().setAntiAlias(true);
       paints.back().setStrokeCap(SkPaint::kRound_Cap);
     }
 
     SkPath& path = paths.back();
     SkPaint& paint = paints.back();
-    switch (path_elements[i].type) {
+    CommandType command_type = path_elements[i].type;
+    switch (command_type) {
       // Handled above.
       case NEW_PATH:
         continue;
 
       case PATH_COLOR_ARGB: {
         int a = SkScalarFloorToInt(path_elements[++i].arg);
         int r = SkScalarFloorToInt(path_elements[++i].arg);
         int g = SkScalarFloorToInt(path_elements[++i].arg);
         int b = SkScalarFloorToInt(path_elements[++i].arg);
         paint.setColor(SkColorSetARGB(a, r, g, b));
@@ skipping 35 matching lines @@
       case R_ARC_TO: {
         SkScalar rx = path_elements[++i].arg;
         SkScalar ry = path_elements[++i].arg;
         SkScalar angle = path_elements[++i].arg;
         SkScalar large_arc_flag = path_elements[++i].arg;
         SkScalar arc_sweep_flag = path_elements[++i].arg;
         SkScalar x = path_elements[++i].arg;
         SkScalar y = path_elements[++i].arg;
 
         auto path_fn =
-            path_elements[i].type == ARC_TO
+            command_type == ARC_TO
                 ? static_cast<void (SkPath::*)(
                       SkScalar, SkScalar, SkScalar, SkPath::ArcSize,
                       SkPath::Direction, SkScalar, SkScalar)>(&SkPath::arcTo)
                 : &SkPath::rArcTo;
         (path.*path_fn)(
             rx, ry, angle,
             large_arc_flag ? SkPath::kLarge_ArcSize : SkPath::kSmall_ArcSize,
             arc_sweep_flag ? SkPath::kCW_Direction : SkPath::kCCW_Direction,
             x, y);
         break;
@@ skipping 274 matching lines @@
 
 ImageSkia CreateVectorIconFromSource(const std::string& source,
                                      size_t dip_size,
                                      SkColor color) {
   return ImageSkia(
       new VectorIconSource(source, dip_size, color),
       gfx::Size(static_cast<int>(dip_size), static_cast<int>(dip_size)));
 }
 
 }  // namespace gfx