Share more code in ARC_TO/R_ARC_TO

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 129 matching lines @@
         break;
       }
 
       case R_MOVE_TO: {
         SkScalar x = path_elements[++i].arg;
         SkScalar y = path_elements[++i].arg;
         path.rMoveTo(x, y);
         break;
       }
 
-      case 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;
-        path.arcTo(
-            rx, ry, angle,
-            large_arc_flag ? SkPath::kLarge_ArcSize : SkPath::kSmall_ArcSize,
-            arc_sweep_flag ? SkPath::kCW_Direction : SkPath::kCCW_Direction,
-            x, y);
-        break;
-      }
-
+      case ARC_TO:
       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;
-        path.rArcTo(
+
+        auto path_fn =
+            path_elements[i].type == ARC_TO
+                ? static_cast<void (SkPath::*)(

[Evan Stade, 2016/06/15 18:51:36]

this came out a bit longer than expected because of the necessity to static_cast
(due to function overloading)

[tdanderson, 2016/06/15 19:23:29]

That's sort of a shame.

+                      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;
       }
 
       case LINE_TO: {
         SkScalar x = path_elements[++i].arg;
         SkScalar y = path_elements[++i].arg;
@@ skipping 269 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