Check if drawFocusRingMaskWithFrame:inView: exists when drawing focus ring

Source/platform/mac/ThemeMac.mm

 /*
  * Copyright (C) 2008, 2010, 2011, 2012 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 123 matching lines @@
     bool pressed = states & PressedControlState;
     if (pressed != oldPressed)
         [cell setHighlighted:pressed];
 
     // Enabled state
     bool oldEnabled = [cell isEnabled];
     bool enabled = states & EnabledControlState;
     if (enabled != oldEnabled)
         [cell setEnabled:enabled];
 
-#if BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
-    // Focused state
-    bool oldFocused = [cell showsFirstResponder];
-    bool focused = states & FocusControlState;
-    if (focused != oldFocused)
-        [cell setShowsFirstResponder:focused];
-#endif
+    if (ThemeMac::drawWithFrameDrawsFocusRing()) {
+        // Focused state
+        bool oldFocused = [cell showsFirstResponder];
+        bool focused = states & FocusControlState;
+        if (focused != oldFocused)
+            [cell setShowsFirstResponder:focused];
+    }
 
     // Checked and Indeterminate
     bool oldIndeterminate = [cell state] == NSMixedState;
     bool indeterminate = (states & IndeterminateControlState);
     bool checked = states & CheckedControlState;
     bool oldChecked = [cell state] == NSOnState;
     if (oldIndeterminate != indeterminate || checked != oldChecked)
         [cell setState:indeterminate ? NSMixedState : (checked ? NSOnState : NSOffState)];
 
     // Window inactive state does not need to be checked explicitly, since we paint parented to
@@ skipping 46 matching lines @@
 }
 
 // static
 IntRect ThemeMac::inflateRectForAA(const IntRect& rect) {
   const int margin = 2;
   return IntRect(rect.x() - margin, rect.y() - margin, rect.width() + 2 * margin, rect.height() + 2 * margin);
 }
 
 // static
 IntRect ThemeMac::inflateRectForFocusRing(const IntRect& rect) {
-#if BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
-    // Just put a margin of 16 units around the rect. The UI elements that use this don't appropriately
-    // scale their focus rings appropriately (e.g, paint pickers), or switch to non-native widgets when
-    // scaled (e.g, check boxes and radio buttons).
-    const int margin = 16;
-    IntRect result;
-    result.setX(rect.x() - margin);
-    result.setY(rect.y() - margin);
-    result.setWidth(rect.width() + 2 * margin);
-    result.setHeight(rect.height() + 2 * margin);
-    return result;
-#else
-    return rect;
-#endif
+    if (ThemeMac::drawWithFrameDrawsFocusRing()) {
+        // Just put a margin of 16 units around the rect. The UI elements that use this don't appropriately
+        // scale their focus rings appropriately (e.g, paint pickers), or switch to non-native widgets when
+        // scaled (e.g, check boxes and radio buttons).
+        const int margin = 16;
+        IntRect result;
+        result.setX(rect.x() - margin);
+        result.setY(rect.y() - margin);
+        result.setWidth(rect.width() + 2 * margin);
+        result.setHeight(rect.height() + 2 * margin);
+        return result;
+    } else {
+        return rect;
+    }
 }
 
 // Checkboxes
 
 static const IntSize* checkboxSizes()
 {
     static const IntSize sizes[3] = { IntSize(14, 14), IntSize(12, 12), IntSize(10, 10) };
     return sizes;
 }
 
@@ skipping 57 matching lines @@
         inflatedRect.setWidth(inflatedRect.width() / zoomFactor);
         inflatedRect.setHeight(inflatedRect.height() / zoomFactor);
         context->translate(inflatedRect.x(), inflatedRect.y());
         context->scale(zoomFactor, zoomFactor);
         context->translate(-inflatedRect.x(), -inflatedRect.y());
     }
 
     LocalCurrentGraphicsContext localContext(context, ThemeMac::inflateRectForFocusRing(inflatedRect));
     NSView* view = ensuredView(scrollableArea);
     [checkboxCell drawWithFrame:NSRect(inflatedRect) inView:view];
-#if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
-    if (states & FocusControlState)
-        [checkboxCell _web_drawFocusRingWithFrame:NSRect(inflatedRect) inView:view];
-#endif
+    if (!ThemeMac::drawWithFrameDrawsFocusRing() && states & FocusControlState)
+        [checkboxCell cr_drawFocusRingWithFrame:NSRect(inflatedRect) inView:view];
     [checkboxCell setControlView:nil];
 
     END_BLOCK_OBJC_EXCEPTIONS
 }
 
 // Radio Buttons
 
 static const IntSize* radioSizes()
 {
     static const IntSize sizes[3] = { IntSize(14, 15), IntSize(12, 13), IntSize(10, 10) };
@@ skipping 59 matching lines @@
         inflatedRect.setHeight(inflatedRect.height() / zoomFactor);
         context->translate(inflatedRect.x(), inflatedRect.y());
         context->scale(zoomFactor, zoomFactor);
         context->translate(-inflatedRect.x(), -inflatedRect.y());
     }
 
     LocalCurrentGraphicsContext localContext(context, ThemeMac::inflateRectForFocusRing(inflatedRect));
     BEGIN_BLOCK_OBJC_EXCEPTIONS
     NSView* view = ensuredView(scrollableArea);
     [radioCell drawWithFrame:NSRect(inflatedRect) inView:view];
-#if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
-    if (states & FocusControlState)
-        [radioCell _web_drawFocusRingWithFrame:NSRect(inflatedRect) inView:view];
-#endif
+    if (!ThemeMac::drawWithFrameDrawsFocusRing() && states & FocusControlState)
+        [radioCell cr_drawFocusRingWithFrame:NSRect(inflatedRect) inView:view];
     [radioCell setControlView:nil];
     END_BLOCK_OBJC_EXCEPTIONS
 }
 
 // Buttons
 
 // Buttons really only constrain height. They respect width.
 static const IntSize* buttonSizes()
 {
     static const IntSize sizes[3] = { IntSize(0, 21), IntSize(0, 18), IntSize(0, 15) };
@@ skipping 69 matching lines @@
             context->translate(inflatedRect.x(), inflatedRect.y());
             context->scale(zoomFactor, zoomFactor);
             context->translate(-inflatedRect.x(), -inflatedRect.y());
         }
     }
 
     LocalCurrentGraphicsContext localContext(context, ThemeMac::inflateRectForFocusRing(inflatedRect));
     NSView* view = ensuredView(scrollableArea);
 
     [buttonCell drawWithFrame:NSRect(inflatedRect) inView:view];
-#if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
-    if (states & FocusControlState)
-        [buttonCell _web_drawFocusRingWithFrame:NSRect(inflatedRect) inView:view];
-#endif
+    if (!ThemeMac::drawWithFrameDrawsFocusRing() && states & FocusControlState)
+        [buttonCell cr_drawFocusRingWithFrame:NSRect(inflatedRect) inView:view];
     [buttonCell setControlView:nil];
 
     END_BLOCK_OBJC_EXCEPTIONS
 }
 
 // Stepper
 
 static const IntSize* stepperSizes()
 {
     static const IntSize sizes[3] = { IntSize(19, 27), IntSize(15, 22), IntSize(13, 15) };
@@ skipping 213 matching lines @@
             paintButton(part, states, context, zoomedRect, zoomFactor, scrollableArea);
             break;
         case InnerSpinButtonPart:
             paintStepper(states, context, zoomedRect, zoomFactor, scrollableArea);
             break;
         default:
             break;
     }
 }
 
+#ifndef NSAppKitVersionNumber10_9
+#define NSAppKitVersionNumber10_9 1265
+#endif
+
+bool ThemeMac::drawWithFrameDrawsFocusRing()
+{
+    // drawWithFrame has changed in 10.10 Yosemite and it does not draw the focus ring.
+    return floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_9;
 }
+
+}