Merge branch 'main' into refactor-remove-nativehost-target

AppKit/CPColor.j

@@ -1491,7 +1491,7 @@ var patternColorsFromPattern = function(pattern, attributes, imageFactory)
         else
         {
             numParts = 3;
-            isVertical = orientation === PatternIsVertical;
+            isVertical = orientation === CPColorPatternIsVertical;
 
             if (isVertical)
             {

AppKit/CPMenu/CPMenu.j

@@ -52,7 +52,8 @@ CPMenuDidEndTrackingNotification    = @"CPMenuDidEndTrackingNotification";
 var _CPMenuBarVisible               = NO,
     _CPMenuBarTitle                 = @"",
     _CPMenuBarAttributes            = nil,
-    _CPMenuBarSharedWindow          = nil;
+    _CPMenuBarSharedWindow          = nil,
+    _CPMenuBarImage                 = nil;
 
 /*!
     @ingroup appkit

AppKit/CPScrollView.j

@@ -234,10 +234,10 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
         heightInset = contentSize.height - bounds.size.height,
         frameSize = CGSizeMake(contentSize.width + widthInset, contentSize.height + heightInset);
 
-    if (hFlag)
+    if (horizontalScrollerClass)
         frameSize.height += [horizontalScrollerClass scrollerWidthInStyle:scrollerStyle];
 
-    if (vFlag)
+    if (verticalScrollerClass)
         frameSize.width += [verticalScrollerClass scrollerWidthForControlSize:scrollerStyle];
 
     return frameSize;

AppKit/CPSplitView.j

@@ -1263,8 +1263,11 @@ var CPThemeStatesForSplitViewDivider = @[@"dummy one as CPSplitViewDividerStyle
 - (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(CPUInteger)dividerIndex
 {
     // For compatibility with previous behavior
-    [aButtonBar setAutomaticResizeControl:YES];
-    [self attachButtonBar:aButtonBar];
+    if ([aButtonBar respondsToSelector:@selector(setAutomaticResizeControl:)])
+    {
+        [aButtonBar setAutomaticResizeControl:YES];
+        [self attachButtonBar:aButtonBar];
+    }
 }
 
 - (void)attachButtonBar:(CPButtonBar)aButtonBar
@@ -1906,4 +1909,3 @@ var CPSplitViewDelegateKey            = @"CPSplitViewDelegateKey",
 
 
 @end
-

AppKit/CoreGraphics/CGColor.j

@@ -212,7 +212,7 @@ function CGColorEqualToColor(lhs, rhs)
     if (lhs.pattern != rhs.pattern)
         return false;
 
-    if (CGColorSpaceEqualToColorSpace(lhs.colorspace, rhs.colorspace))
+    if (lhs.colorspace !== rhs.colorspace)
         return false;
 
     return true;

AppKit/CoreGraphics/CGContext.j

@@ -1191,7 +1191,9 @@ var scale_rotate = function(a, b, c, d)
     var sign = (a * d < 0.0 || b * c > 0.0) ? -1.0 : 1.0,
         a2 = (ATAN2(b, d) + ATAN2(-sign * c, sign * a)) / 2.0,
         cos = COS(a2),
-        sin = SIN(a2);
+        sin = SIN(a2),
+        abs_cos,
+        abs_sin;
 
     if (cos === 0)
     {
@@ -1218,7 +1220,9 @@ var rotate_scale = function(a, b, c, d)
     var sign = (a * d < 0.0 || b * c > 0.0) ? -1.0 : 1.0,
         a1 = (ATAN2(sign * b, sign * a) + ATAN2(-c, d)) / 2.0,
         cos = COS(a1),
-        sin = SIN(a1);
+        sin = SIN(a1),
+        abs_cos,
+        abs_sin;
 
     if (cos === 0)
     {

AppKit/CoreGraphics/CGContextText.j

@@ -37,7 +37,7 @@ function CGContextSetTextMatrix(/* CGContext */ aContext, /* CGAffineTransform *
 
 function CGContextGetTextPosition(/* CGContext */ aContext)
 {
-    return aContext._textPosition || _CGPointMakeZero();
+    return aContext._textPosition || CGPointMakeZero();
 }
 
 function CGContextSetTextPosition(/* CGContext */ aContext, /* float */ x, /* float */ y)