Title: [197819] trunk/Source/WTF
- Revision
- 197819
- Author
- [email protected]
- Date
- 2016-03-08 16:40:03 -0800 (Tue, 08 Mar 2016)
Log Message
Fix AppKitCompatibilityDeclarations build.
* wtf/mac/AppKitCompatibilityDeclarations.h:
Remove duplicate declarations, conditionally define NSTextAlignment and
add a NSWindowStyleMask typedef.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (197818 => 197819)
--- trunk/Source/WTF/ChangeLog 2016-03-09 00:25:48 UTC (rev 197818)
+++ trunk/Source/WTF/ChangeLog 2016-03-09 00:40:03 UTC (rev 197819)
@@ -1,3 +1,11 @@
+2016-03-08 Anders Carlsson <[email protected]>
+
+ Fix AppKitCompatibilityDeclarations build.
+
+ * wtf/mac/AppKitCompatibilityDeclarations.h:
+ Remove duplicate declarations, conditionally define NSTextAlignment and
+ add a NSWindowStyleMask typedef.
+
2016-03-08 Oliver Hunt <[email protected]>
Start moving to separated writable and executable mappings in the JIT
Modified: trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h (197818 => 197819)
--- trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h 2016-03-09 00:25:48 UTC (rev 197818)
+++ trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h 2016-03-09 00:40:03 UTC (rev 197819)
@@ -66,10 +66,8 @@
static const NSEventModifierFlags NSEventModifierFlagCapsLock = NSAlphaShiftKeyMask;
static const NSEventModifierFlags NSEventModifierFlagCommand = NSCommandKeyMask;
static const NSEventModifierFlags NSEventModifierFlagDeviceIndependentFlagsMask = NSDeviceIndependentModifierFlagsMask;
-static const NSEventModifierFlags NSEventModifierFlagDeviceIndependentFlagsMask = NSDeviceIndependentModifierFlagsMask;
static const NSEventModifierFlags NSEventModifierFlagFunction = NSFunctionKeyMask;
static const NSEventModifierFlags NSEventModifierFlagNumericPad = NSNumericPadKeyMask;
-static const NSEventModifierFlags NSEventModifierFlagNumericPad = NSNumericPadKeyMask;
static const NSEventModifierFlags NSEventModifierFlagShift = NSShiftKeyMask;
static const NSEventType NSEventTypeFlagsChanged = NSFlagsChanged;
@@ -85,11 +83,14 @@
static const NSEventType NSEventTypeScrollWheel = NSScrollWheel;
static const NSEventType NSEventTypeSystemDefined = NSSystemDefined;
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101100
static const NSTextAlignment NSTextAlignmentRight = NSRightTextAlignment;
static const NSTextAlignment NSTextAlignmentCenter = NSCenterTextAlignment;
static const NSTextAlignment NSTextAlignmentLeft = NSLeftTextAlignment;
static const NSTextAlignment NSTextAlignmentNatural = NSNaturalTextAlignment;
+#endif
+typedef NSUInteger NSWindowStyleMask;
static const NSWindowStyleMask NSWindowStyleMaskBorderless = NSBorderlessWindowMask;
static const NSWindowStyleMask NSWindowStyleMaskClosable = NSClosableWindowMask;
static const NSWindowStyleMask NSWindowStyleMaskFullScreen = NSFullScreenWindowMask;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
