Preparation for combining paths of focus rings and outlines

Source/platform/graphics/GraphicsContext.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008-2009 Torch Mobile, Inc.
  * 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.
@@ skipping 253 matching lines @@
     SkFilterQuality computeFilterQuality(Image*, const FloatRect& dest, const FloatRect& src) const;
 
     // URL drawing
     void setURLForRect(const KURL&, const IntRect&);
     void setURLFragmentForRect(const String& name, const IntRect&);
 
     static void adjustLineToPixelBoundaries(FloatPoint& p1, FloatPoint& p2, float strokeWidth, StrokeStyle);
 
     static int focusRingOutsetExtent(int offset, int width)
     {
-        return focusRingOutset(offset) + (focusRingWidth(width) + 1) / 2;
+        // 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 focusRingOffset(offset) + (focusRingWidth(width) + 1) / 2;
     }
 
+#if OS(MACOSX)
+    static int focusRingWidth(int width) { return width; }
+#else
+    static int focusRingWidth(int width) { return 1; }
+#endif
+
     // public decl needed for OwnPtr wrapper.
     class RecordingState;
 
 #if ENABLE(ASSERT)
     void setInDrawingRecorder(bool);
 #endif
 
     static PassRefPtr<SkColorFilter> WebCoreColorFilterToSkiaColorFilter(ColorFilter);
 
 private:
     explicit GraphicsContext(SkCanvas*, DisplayItemList*, DisabledMode = NothingDisabled, SkMetaData* = 0);
 
     const GraphicsContextState* immutableState() const { return m_paintState; }
 
     GraphicsContextState* mutableState()
     {
         realizePaintSave();
         return m_paintState;
     }
 
     template<typename DrawTextFunc>
     void drawTextPasses(const DrawTextFunc&);
 
     static void setPathFromPoints(SkPath*, size_t, const FloatPoint*);
 
 #if OS(MACOSX)
-    static inline int focusRingOutset(int offset) { return offset + 2; }
-    static inline int focusRingWidth(int width) { return width; }
+    static inline int focusRingOffset(int offset) { return offset + 2; }
 #else
-    static inline int focusRingOutset(int offset) { return 0; }
-    static inline int focusRingWidth(int width) { return 1; }
+    static inline int focusRingOffset(int offset) { return 0; }
     static SkPMColor lineColors(int);
     static SkPMColor antiColors1(int);
     static SkPMColor antiColors2(int);
     static void draw1xMarker(SkBitmap*, int);
     static void draw2xMarker(SkBitmap*, int);
 #endif
 
     void saveLayer(const SkRect* bounds, const SkPaint*);
     void restoreLayer();
 
@@ skipping 67 matching lines @@
 
     float m_deviceScaleFactor;
 
     unsigned m_printing : 1;
     unsigned m_hasMetaData : 1;
 };
 
 } // namespace blink
 
 #endif // GraphicsContext_h