Title: [122496] trunk/Source/WebKit/chromium
- Revision
- 122496
- Author
- [email protected]
- Date
- 2012-07-12 13:19:04 -0700 (Thu, 12 Jul 2012)
Log Message
[chromium][Mac] r122400 broke 10.6 build
https://bugs.webkit.org/show_bug.cgi?id=91103
Patch by Robert Sesek <[email protected]> on 2012-07-12
Reviewed by Tony Chang.
Use the right availability macros for forward-declaring methods and
defining constants.
* src/mac/WebInputEventFactory.mm:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (122495 => 122496)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-12 20:04:17 UTC (rev 122495)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-12 20:19:04 UTC (rev 122496)
@@ -1,3 +1,15 @@
+2012-07-12 Robert Sesek <[email protected]>
+
+ [chromium][Mac] r122400 broke 10.6 build
+ https://bugs.webkit.org/show_bug.cgi?id=91103
+
+ Reviewed by Tony Chang.
+
+ Use the right availability macros for forward-declaring methods and
+ defining constants.
+
+ * src/mac/WebInputEventFactory.mm:
+
2012-07-12 Tony Chang <[email protected]>
[chromium] Remove drag and drop API methods that are no longer used
Modified: trunk/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm (122495 => 122496)
--- trunk/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm 2012-07-12 20:04:17 UTC (rev 122495)
+++ trunk/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm 2012-07-12 20:19:04 UTC (rev 122496)
@@ -34,7 +34,7 @@
#include "WebInputEvent.h"
#include <wtf/ASCIICType.h>
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1070
// Additional Lion APIs.
enum {
@@ -53,9 +53,11 @@
- (NSEventPhase)momentumPhase;
@end
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
+#endif // __MAC_OS_X_VERSION_MAX_ALLOWED < 1070
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
+// 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.
@@ -64,7 +66,7 @@
NSEventTypeEndGesture = 20
};
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED == 1050
+#endif // MAC_OS_X_VERSION_MAX_ALLOWED <= 1050
namespace WebKit {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
