Draw focus ring on Mac OS X SDK 10.8+

BUG=328814

Review URL: https://codereview.chromium.org/349123002

git-svn-id: svn://svn.chromium.org/blink/trunk@177068 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/platform/mac/ThemeMac.mm

@@ -472,7 +472,7 @@ static void paintButton(ControlPart part, ControlStates states, GraphicsContext*
 
     [buttonCell drawWithFrame:NSRect(inflatedRect) inView:view];
 #if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
-    if (states & FocusState)
+    if (states & FocusControlState)
         [buttonCell _web_drawFocusRingWithFrame:NSRect(inflatedRect) inView:view];
 #endif
     [buttonCell setControlView:nil];

third_party/WebKit/Source/platform/mac/WebCoreNSCellExtras.h

@@ -26,12 +26,12 @@
 #import <AppKit/AppKit.h>
 #include "platform/PlatformExport.h"
 
-#define BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING 1
+#define BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING (!defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7)
 
 #if !BUTTON_CELL_DRAW_WITH_FRAME_DRAWS_FOCUS_RING
 
 // FIXME: Might want to use this on Mac once we only support OS X 10.8+
-PLATFORM_EXPORT @interface NSCell (WebCoreFocusRingDrawing)
+@interface NSCell (WebCoreFocusRingDrawing)
 - (void)_web_drawFocusRingWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
 @end