Title: [197810] trunk/Source/WTF
- Revision
- 197810
- Author
- [email protected]
- Date
- 2016-03-08 15:44:00 -0800 (Tue, 08 Mar 2016)
Log Message
Add AppKit compatibility header
https://bugs.webkit.org/show_bug.cgi?id=155202
Reviewed by Beth Dakin.
* WTF.xcodeproj/project.pbxproj:
* wtf/mac/AppKitCompatibilityDeclarations.h: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (197809 => 197810)
--- trunk/Source/WTF/ChangeLog 2016-03-08 23:31:14 UTC (rev 197809)
+++ trunk/Source/WTF/ChangeLog 2016-03-08 23:44:00 UTC (rev 197810)
@@ -1,3 +1,13 @@
+2016-03-08 Anders Carlsson <[email protected]>
+
+ Add AppKit compatibility header
+ https://bugs.webkit.org/show_bug.cgi?id=155202
+
+ Reviewed by Beth Dakin.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/mac/AppKitCompatibilityDeclarations.h: Added.
+
2016-03-08 Commit Queue <[email protected]>
Unreviewed, rolling out r197793 and r197799.
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (197809 => 197810)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-03-08 23:31:14 UTC (rev 197809)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-03-08 23:44:00 UTC (rev 197810)
@@ -81,6 +81,7 @@
1A1D8B9C173186CE00141DA4 /* FunctionDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1D8B9B173186CE00141DA4 /* FunctionDispatcher.h */; };
1A1D8B9E1731879800141DA4 /* FunctionDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */; };
1A233C7D17DAA6E300A93ACF /* MallocPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A233C7C17DAA6E300A93ACF /* MallocPtr.h */; };
+ 1A428B8C1C8F89DD0051E9EB /* AppKitCompatibilityDeclarations.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A428B8B1C8F89DD0051E9EB /* AppKitCompatibilityDeclarations.h */; };
1A4656191C7FC68E00F5920F /* OptionSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4656181C7FC68E00F5920F /* OptionSet.h */; };
1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6BB768162F300500DD16DB /* StreamBuffer.h */; };
1A6EB1E0187D0BD30030126F /* StringView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6EB1DF187D0BD30030126F /* StringView.h */; };
@@ -390,6 +391,7 @@
1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionDispatcher.cpp; sourceTree = "<group>"; };
1A233C7C17DAA6E300A93ACF /* MallocPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MallocPtr.h; sourceTree = "<group>"; };
1A3F6BE6174ADA2100B2EEA7 /* NeverDestroyed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NeverDestroyed.h; sourceTree = "<group>"; };
+ 1A428B8B1C8F89DD0051E9EB /* AppKitCompatibilityDeclarations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppKitCompatibilityDeclarations.h; sourceTree = "<group>"; };
1A4656181C7FC68E00F5920F /* OptionSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionSet.h; sourceTree = "<group>"; };
1A6BB768162F300500DD16DB /* StreamBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamBuffer.h; sourceTree = "<group>"; };
1A6EB1DF187D0BD30030126F /* StringView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringView.h; sourceTree = "<group>"; };
@@ -988,6 +990,7 @@
A8A472C4151A825A004123FF /* mac */ = {
isa = PBXGroup;
children = (
+ 1A428B8B1C8F89DD0051E9EB /* AppKitCompatibilityDeclarations.h */,
1ACADD821884480100D8B71D /* DeprecatedSymbolsUsedBySafari.mm */,
A8A472C5151A825A004123FF /* MainThreadMac.mm */,
);
@@ -1150,6 +1153,7 @@
DE5A09FC1BA36992003D4424 /* CommonCryptoSPI.h in Headers */,
0F8F2B91172E00FC007DBDA5 /* CompilationThread.h in Headers */,
A8A47398151A825B004123FF /* Compiler.h in Headers */,
+ 1A428B8C1C8F89DD0051E9EB /* AppKitCompatibilityDeclarations.h in Headers */,
0FDB698E1B7C643A000C1078 /* Condition.h in Headers */,
A8A4748C151A8264004123FF /* config.h in Headers */,
0F8F2B9C172F2596007DBDA5 /* ConversionMode.h in Headers */,
Added: trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h (0 => 197810)
--- trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h (rev 0)
+++ trunk/Source/WTF/wtf/mac/AppKitCompatibilityDeclarations.h 2016-03-08 23:44:00 UTC (rev 197810)
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2016 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
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef AppKitCompatibilityDeclarations_h
+#define AppKitCompatibilityDeclarations_h
+
+#import <Availability.h>
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101200
+
+#import <AppKit/AppKit.h>
+
+static const NSAlertStyle NSAlertStyleCritical = NSCriticalAlertStyle;
+static const NSAlertStyle NSAlertStyleInformational = NSInformationalAlertStyle;
+static const NSAlertStyle NSAlertStyleWarning = NSWarningAlertStyle;
+
+static const NSCompositingOperation NSCompositingOperationCopy = NSCompositeCopy;
+static const NSCompositingOperation NSCompositingOperationDestinationIn = NSCompositeDestinationIn;
+static const NSCompositingOperation NSCompositingOperationDestinationOut = NSCompositeDestinationOut;
+static const NSCompositingOperation NSCompositingOperationDestinationOver = NSCompositeDestinationOver;
+static const NSCompositingOperation NSCompositingOperationSourceAtop = NSCompositeSourceAtop;
+static const NSCompositingOperation NSCompositingOperationSourceIn = NSCompositeSourceIn;
+static const NSCompositingOperation NSCompositingOperationSourceOver = NSCompositeSourceOver;
+
+static const NSControlSize NSControlSizeRegular = NSRegularControlSize;
+static const NSControlSize NSControlSizeSmall = NSSmallControlSize;
+
+static const NSEventMask NSEventMaskAny = NSAnyEventMask;
+static const NSEventMask NSEventMaskFlagsChanged = NSFlagsChangedMask;
+static const NSEventMask NSEventMaskKeyDown = NSKeyDownMask;
+static const NSEventMask NSEventMaskKeyUp = NSKeyUpMask;
+static const NSEventMask NSEventMaskLeftMouseDown = NSLeftMouseDownMask;
+static const NSEventMask NSEventMaskLeftMouseDragged = NSLeftMouseDraggedMask;
+static const NSEventMask NSEventMaskLeftMouseUp = NSLeftMouseUpMask;
+static const NSEventMask NSEventMaskOtherMouseDown = NSOtherMouseDownMask;
+static const NSEventMask NSEventMaskOtherMouseUp = NSOtherMouseUpMask;
+static const NSEventMask NSEventMaskPeriodic = NSPeriodicMask;
+static const NSEventMask NSEventMaskRightMouseDown = NSRightMouseDownMask;
+static const NSEventMask NSEventMaskRightMouseUp = NSRightMouseUpMask;
+static const NSEventMask NSEventMaskScrollWheel = NSScrollWheelMask;
+
+static const NSEventModifierFlags NSEventModifierFlagOption = NSAlternateKeyMask;
+static const NSEventModifierFlags NSEventModifierFlagControl = NSControlKeyMask;
+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;
+static const NSEventType NSEventTypeKeyDown = NSKeyDown;
+static const NSEventType NSEventTypeKeyUp = NSKeyUp;
+static const NSEventType NSEventTypeLeftMouseDown = NSLeftMouseDown;
+static const NSEventType NSEventTypeLeftMouseDragged = NSLeftMouseDragged;
+static const NSEventType NSEventTypeLeftMouseUp = NSLeftMouseUp;
+static const NSEventType NSEventTypeMouseMoved = NSMouseMoved;
+static const NSEventType NSEventTypeOtherMouseDown = NSOtherMouseDown;
+static const NSEventType NSEventTypePeriodic = NSPeriodic;
+static const NSEventType NSEventTypeRightMouseDown = NSRightMouseDown;
+static const NSEventType NSEventTypeScrollWheel = NSScrollWheel;
+static const NSEventType NSEventTypeSystemDefined = NSSystemDefined;
+
+static const NSTextAlignment NSTextAlignmentRight = NSRightTextAlignment;
+static const NSTextAlignment NSTextAlignmentCenter = NSCenterTextAlignment;
+static const NSTextAlignment NSTextAlignmentLeft = NSLeftTextAlignment;
+static const NSTextAlignment NSTextAlignmentNatural = NSNaturalTextAlignment;
+
+static const NSWindowStyleMask NSWindowStyleMaskBorderless = NSBorderlessWindowMask;
+static const NSWindowStyleMask NSWindowStyleMaskClosable = NSClosableWindowMask;
+static const NSWindowStyleMask NSWindowStyleMaskFullScreen = NSFullScreenWindowMask;
+static const NSWindowStyleMask NSWindowStyleMaskFullSizeContentView = NSFullSizeContentViewWindowMask;
+static const NSWindowStyleMask NSWindowStyleMaskHUDWindow = NSHUDWindowMask;
+static const NSWindowStyleMask NSWindowStyleMaskMiniaturizable = NSMiniaturizableWindowMask;
+static const NSWindowStyleMask NSWindowStyleMaskNonactivatingPanel = NSNonactivatingPanelMask;
+static const NSWindowStyleMask NSWindowStyleMaskResizable = NSResizableWindowMask;
+static const NSWindowStyleMask NSWindowStyleMaskTexturedBackground = NSTexturedBackgroundWindowMask;
+static const NSWindowStyleMask NSWindowStyleMaskTitled = NSTitledWindowMask;
+static const NSWindowStyleMask NSWindowStyleMaskUtilityWindow = NSUtilityWindowMask;
+
+#endif
+
+#endif // AppKitCompatibilityDeclarations_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
