Merge branch 'master' of git://github.com/cappuccino/cappuccino

AppKit/CPColor.j

@@ -480,7 +480,9 @@ function CPColorWithImages()
         parts[3] ? parseFloat(parts[3], 10) : 1.0
     ];
 
-    _cssString = aString;
+    // We can't reuse aString as _cssString because the browser might not support the `rgba` syntax, and aString might
+    // use it (issue #1413.)
+    [self _initCSSStringFromComponents];
 
     return self;
 }
@@ -494,18 +496,23 @@ function CPColorWithImages()
     {
         _components = components;
 
-        var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
-
-        _cssString = (hasAlpha ? "rgba(" : "rgb(") +
-            parseInt(_components[0] * 255.0) + ", " +
-            parseInt(_components[1] * 255.0) + ", " +
-            parseInt(_components[2] * 255.0) +
-            (hasAlpha ?  (", " + _components[3]) : "") + ")";
+        [self _initCSSStringFromComponents];
     }
 
     return self;
 }
 
+- (void)_initCSSStringFromComponents
+{
+    var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
+
+    _cssString = (hasAlpha ? "rgba(" : "rgb(") +
+        parseInt(_components[0] * 255.0) + ", " +
+        parseInt(_components[1] * 255.0) + ", " +
+        parseInt(_components[2] * 255.0) +
+        (hasAlpha ?  (", " + _components[3]) : "") + ")";
+}
+
 /* @ignore */
 - (id)_initWithPatternImage:(CPImage)anImage
 {

AppKit/CPTableView.j

@@ -768,10 +768,6 @@ NOT YET IMPLEMENTED
 */
 - (void)setSelectionHighlightStyle:(unsigned)aSelectionHighlightStyle
 {
-    //early return for IE.
-    if (aSelectionHighlightStyle == CPTableViewSelectionHighlightStyleSourceList && !CPFeatureIsCompatible(CPHTMLCanvasFeature))
-        return;
-
     _selectionHighlightStyle = aSelectionHighlightStyle;
     [self setNeedsDisplay:YES];
 
@@ -3690,7 +3686,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     if (!count)
         return;
 
-    var drawGradient = (_selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList && [_selectedRowIndexes count] >= 1),
+    var drawGradient = (CPFeatureIsCompatible(CPHTMLCanvasFeature) && _selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList && [_selectedRowIndexes count] >= 1),
         deltaHeight = 0.5 * (_gridStyleMask & CPTableViewSolidHorizontalGridLineMask);
 
     CGContextBeginPath(context);
@@ -3817,7 +3813,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (void)_drawGroupRowsForRects:(CPArray)rects
 {
-    if (_selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList || !rects.length)
+    if ((CPFeatureIsCompatible(CPHTMLCanvasFeature) && _selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList) || !rects.length)
         return;
 
     var context = [[CPGraphicsContext currentContext] graphicsPort],

AppKit/_CPImageAndTextView.j

@@ -390,7 +390,10 @@ var _CPimageAndTextViewFrameSizeChangedFlag         = 1 << 0,
     var textStyle = hasDOMTextElement ? _DOMTextElement.style : nil;
 
     // Create or destroy the DOM Text Shadow element as necessary.
-    var needsDOMTextShadowElement = hasDOMTextElement && !!_textShadowColor,
+    // If _textShadowColor's alphaComponent is 0, don't bother drawing anything (issue #1412).
+    // This improves performance as we get rid of an invisible element, and makes IE <9.0 capable
+    // of correctly 'rendering' shadows with [CPColor clearColor].
+    var needsDOMTextShadowElement = hasDOMTextElement && [_textShadowColor alphaComponent] > 0.0,
         hasDOMTextShadowElement = !!_DOMTextShadowElement;
 
     if (needsDOMTextShadowElement !== hasDOMTextShadowElement)