Merge remote-tracking branch 'upstream/master' into NEW--CPTextView

AppKit/CoreAnimation/CALayer.j

@@ -27,7 +27,8 @@
 
 @import "CGContext.j"
 @import "CGGeometry.j"
-
+@import "CPColor.j"
+@import "CPView.j"
 
 #define DOM(aLayer) aLayer._DOMElement
 
@@ -494,11 +495,11 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 */
 - (void)display
 {
+#if PLATFORM(DOM)
     if (!_context)
     {
         _context = CGBitmapGraphicsContextCreate();
 
-#if PLATFORM(DOM)
         _DOMContentsElement = _context.DOMElement;
 
         _DOMContentsElement.style.zIndex = -100;
@@ -516,7 +517,6 @@ var CALayerRegisteredRunLoopUpdates             = nil;
         _DOMContentsElement.style.height = ROUND(CGRectGetHeight(_backingStoreFrame)) + "px";
 
         _DOMElement.appendChild(_DOMContentsElement);
-#endif
     }
 
     if (USE_BUFFER)
@@ -534,6 +534,7 @@ var CALayerRegisteredRunLoopUpdates             = nil;
 
         [self drawInContext:CABackingStoreGetContext(_contents)];
     }
+#endif
 
     [self composite];
 }
@@ -796,7 +797,6 @@ if (_DOMContentsElement && aLayer._zPosition > _DOMContentsElement.style.zIndex)
 
         if (mask & CALayerDisplayUpdateMask)
             [layer display];
-
         else if (mask & CALayerFrameSizeUpdateMask || mask & CALayerCompositeUpdateMask)
             [layer composite];
 

Foundation/CPUserNotificationCenter.j

@@ -34,6 +34,9 @@
 
 @end
 
+// Remove compiling warnings
+@class Notification
+
 @global CPApp
 
 var CPUserNotificationCenterDelegate_userNotificationCenter_shouldPresentNotification_  = 1 << 0,

Tests/AppKit/CPDatePickerTest.j

@@ -1,7 +1,8 @@
+@import <OJUnit/OJTestCase.j>
 
 @import <AppKit/CPDatePicker.j>
 @import <AppKit/CPApplication.j>
-@import <AppKit/CPText.j>
+@import <Foundation/Foundation.j>
 
 [CPApplication sharedApplication];
 
@@ -20,4 +21,9 @@
     [self assertTrue:!!datePicker];
 }
 
+- (void)testLayoutSubviews
+{
+    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+}
+
 @end