Remove GraphicsContext::focusRingOffset()

third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 315 matching lines @@
                                  SkMatrix::kFill_ScaleToFit);
   m_canvas->concat(pictureTransform);
   picturePaint.setImageFilter(SkPictureImageFilter::MakeForLocalSpace(
       ToSkPicture(picture), sourceBounds,
       static_cast<SkFilterQuality>(imageInterpolationQuality())));
   m_canvas->saveLayer(&sourceBounds, &picturePaint);
   m_canvas->restore();
   m_canvas->restore();
 }
 
+namespace {
+
+int adjustedFocusRingOffset(int offset) {
+#if OS(MACOSX)
+  return offset + 2;
+#else
+  return 0;
+#endif
+}
+
+}  // anonymous ns
+
+int GraphicsContext::focusRingOutsetExtent(int offset, int width) {
+  // Unlike normal outlines (whole width is outside of the offset), focus
+  // rings are drawn with the center of the path aligned with the offset, so
+  // only half of the width is outside of the offset.
+  return adjustedFocusRingOffset(offset) + (width + 1) / 2;
+}
+
 void GraphicsContext::drawFocusRingPath(const SkPath& path,
                                         const Color& color,
                                         float width) {
   drawPlatformFocusRing(path, m_canvas, color.rgb(), width);
 }
 
 void GraphicsContext::drawFocusRingRect(const SkRect& rect,
                                         const Color& color,
                                         float width) {
   drawPlatformFocusRing(rect, m_canvas, color.rgb(), width);
@@ skipping 15 matching lines @@
                                     int offset,
                                     const Color& color) {
   if (contextDisabled())
     return;
 
   unsigned rectCount = rects.size();
   if (!rectCount)
     return;
 
   SkRegion focusRingRegion;
-  offset = focusRingOffset(offset);
+  offset = adjustedFocusRingOffset(offset);
   for (unsigned i = 0; i < rectCount; i++) {
     SkIRect r = rects[i];
     if (r.isEmpty())
       continue;
-    r.inset(-offset, -offset);
+    r.outset(offset, offset);
     focusRingRegion.op(r, SkRegion::kUnion_Op);
   }
 
   if (focusRingRegion.isEmpty())
     return;
 
   if (focusRingRegion.isRect()) {
     drawFocusRingRect(SkRect::Make(focusRingRegion.getBounds()), color, width);
   } else {
     SkPath path;
@@ skipping 937 matching lines @@
       break;
     default:
       ASSERT_NOT_REACHED();
       break;
   }
 
   return nullptr;
 }
 
 }  // namespace blink