Preparation for combining paths of focus rings and outlines

Source/platform/graphics/skia/SkiaUtils.cpp

 /*
  * Copyright (c) 2006,2007,2008, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 357 matching lines @@
     canvas->drawPath(path, pathPaint);
 }
 
 template<typename PrimitiveType>
 void drawPlatformFocusRing(const PrimitiveType& primitive, SkCanvas* canvas, SkColor color, int width)
 {
     SkPaint paint;
     paint.setAntiAlias(true);
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setColor(color);
+    paint.setStrokeWidth(GraphicsContext::focusRingWidth(width));
 
 #if OS(MACOSX)
-    paint.setStrokeWidth(width);
     paint.setAlpha(64);
-    float cornerRadius = (width - 1) * 0.5f;
+    const float cornerRadius = (width - 1) * 0.5f;
 #else
-    paint.setStrokeWidth(1);
     const float cornerRadius = 1;
 #endif
 
     drawFocusRingPrimitive(primitive, canvas, paint, cornerRadius);
 
 #if OS(MACOSX)
     // Inner part
     paint.setAlpha(128);
     paint.setStrokeWidth(paint.getStrokeWidth() * 0.5f);
     drawFocusRingPrimitive(primitive, canvas, paint, cornerRadius);
 #endif
 }
 
 template void PLATFORM_EXPORT drawPlatformFocusRing<SkRect>(const SkRect&, SkCanvas*, SkColor, int width);
 template void PLATFORM_EXPORT drawPlatformFocusRing<SkPath>(const SkPath&, SkCanvas*, SkColor, int width);
 
 }  // namespace blink