Unreviewed, rolling out r122477.
authortony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Jul 2012 17:29:42 +0000 (17:29 +0000)
committertony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 Jul 2012 17:29:42 +0000 (17:29 +0000)
http://trac.webkit.org/changeset/122477
https://bugs.webkit.org/show_bug.cgi?id=91103

Broke Chromium Mac build

* src/mac/WebInputEventFactory.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@122479 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/mac/WebInputEventFactory.mm

index 24a1cb0..f19a095 100644 (file)
@@ -1,3 +1,13 @@
+2012-07-12  Tony Chang  <tony@chromium.org>
+
+        Unreviewed, rolling out r122477.
+        http://trac.webkit.org/changeset/122477
+        https://bugs.webkit.org/show_bug.cgi?id=91103
+
+        Broke Chromium Mac build
+
+        * src/mac/WebInputEventFactory.mm:
+
 2012-07-12  Robert Sesek  <rsesek@chromium.org>
 
         [chromium][Mac] r122400 broke 10.6 build
index 35e4641..f541ef6 100644 (file)
 #include "WebInputEventFactory.h"
 
 #include <ApplicationServices/ApplicationServices.h>
-#include <Availability.h>
 #import <Cocoa/Cocoa.h>
 
 #import "KeyEventCocoa.h"
 #include "WebInputEvent.h"
 #include <wtf/ASCIICType.h>
 
-#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
 
 // Additional Lion APIs.
 enum {
@@ -54,9 +53,9 @@ typedef NSUInteger NSEventPhase;
 - (NSEventPhase)momentumPhase;
 @end
 
-#endif  // __MAC_OS_X_VERSION_MAX_ALLOWED < 1070
+#endif  // __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
 
-#if __MAC_OS_X_VERSION_MAX_ALLOWED <= 1050
+#if __MAC_OS_X_VERSION_MIN_REQUIRED == 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.
@@ -65,7 +64,7 @@ enum {
     NSEventTypeEndGesture       = 20
 };
 
-#endif  // __MAC_OS_X_VERSION_MAX_ALLOWED <= 1050
+#endif  // __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
 
 namespace WebKit {