Reland #1: Fix the mechanism by which Blink determines OSX version number.

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 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #import "config.h"
 #import "platform/mac/ThemeMac.h"
 
 #import <Carbon/Carbon.h>
 #import "platform/graphics/GraphicsContextStateSaver.h"
 #import "platform/mac/BlockExceptions.h"
 #import "platform/mac/LocalCurrentGraphicsContext.h"
+#import "platform/mac/VersionUtilMac.h"
 #import "platform/mac/WebCoreNSCellExtras.h"
 #import "platform/scroll/ScrollableArea.h"
 #include "wtf/StdLibExtras.h"
 
 // This is a view whose sole purpose is to tell AppKit that it's flipped.
 @interface WebCoreFlippedView : NSControl
 @end
 
 @implementation WebCoreFlippedView
 
@@ skipping 646 matching lines @@
             paintButton(part, states, context, zoomedRect, zoomFactor, scrollableArea);
             break;
         case InnerSpinButtonPart:
             paintStepper(states, context, zoomedRect, zoomFactor, scrollableArea);
             break;
         default:
             break;
     }
 }
 
-#ifndef NSAppKitVersionNumber10_7
-#define NSAppKitVersionNumber10_7 1138
-#endif
-#ifndef NSAppKitVersionNumber10_9
-#define NSAppKitVersionNumber10_9 1265
-#endif
-
 bool ThemeMac::drawWithFrameDrawsFocusRing()
 {
 #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
 // If compiling against an OSX 10.8+ SDK, only 10.7 and older OSes will draw a
 // focus ring with the frame.
-    return floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_7;
+    return IsOSLionOrEarlier();
 #else
 // If compiling an OSX 10.7 or older SDK, OSes up through 10.9 will draw a focus
 // ring with the frame.
-    return floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_9;
+    return IsOSMavericksOrEarlier();
 #endif
 }
 
 }