Index: Source/WebKit/chromium/src/mac/WebInputEventFactory.mm |
diff --git a/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm b/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm |
index f08b6930b9fbd51fc40bf62856bce57cf8c69d73..05546cc5d0332c572ff31f093d03398dc042eab9 100644 |
--- a/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm |
+++ b/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm |
@@ -34,7 +34,7 @@ |
#import "core/platform/cocoa/KeyEventCocoa.h" |
#include <wtf/ASCIICType.h> |
-#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1070 |
+#if __MAC_OS_X_VERSION_MAX_ALLOWED == 1060 |
// Additional Lion APIs. |
enum { |
@@ -52,7 +52,7 @@ typedef NSUInteger NSEventPhase; |
- (NSEventPhase)momentumPhase; |
@end |
-#endif // __MAC_OS_X_VERSION_MAX_ALLOWED < 1070 |
+#endif // __MAC_OS_X_VERSION_MAX_ALLOWED == 1060 |
#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1080 |
@@ -63,19 +63,6 @@ enum { |
#endif // __MAC_OS_X_VERSION_MAX_ALLOWED < 1080 |
-// Do not __MAC_OS_X_VERSION_MAX_ALLOWED here because of a bug in the 10.5 SDK, |
-// see <http://lists.webkit.org/pipermail/webkit-dev/2012-July/021442.html>. |
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1050 |
- |
-// These are not defined in the 10.5 SDK but are defined in later SDKs inside |
-// a MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 #ifdef. |
-enum { |
- NSEventTypeBeginGesture = 19, |
- NSEventTypeEndGesture = 20 |
-}; |
- |
-#endif // MAC_OS_X_VERSION_MAX_ALLOWED <= 1050 |
- |
namespace WebKit { |
// WebKeyboardEvent ----------------------------------------------------------- |