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 150 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

[Robert Sesek, 2014/07/02 14:45:42]

Why is it safe to remove this?

[keishi, 2014/07/02 15:54:05]

Hmm.
setShowsFirstResponder draws the focus ring on <=10.7
and drawFocusRingMaskWithFrame exists for >=10.7
so on 10.7 two focus rings might be drawn.

Maybe I need to test if drawFocusRingMaskWithFrame exists here too.

[keishi, 2014/07/07 09:16:07]

I confirmed by building using 10.9 SDK and running on 10.7,
setShowsFirstResponder: draws the focus ring and drawFocusRingMaskWithFrame does
nothing. So removing this #if seems to be ok

     // Focused state
     bool oldFocused = [cell showsFirstResponder];
     bool focused = states & FocusControlState;
     if (focused != oldFocused)
         [cell setShowsFirstResponder:focused];
-#endif
 
     // 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 531 matching lines @@
             break;
         case InnerSpinButtonPart:
             paintStepper(states, context, zoomedRect, zoomFactor, scrollView);
             break;
         default:
             break;
     }
 }
 
 }