[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 41c70dd0e7f2d950833d71ee7d2942c009e27dc4
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 7 23:37:32 2010 +0000

    2010-12-07  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Chris Marrin.
    
            Fix the Color -> CGColorRef conversions for the debug colors
            used for compositing layers.
    
            * platform/graphics/ca/mac/PlatformCALayerMac.mm:
            (PlatformCALayer::setBackgroundColor):
            (PlatformCALayer::setBorderColor):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73472 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 348cf7a..fff9380 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-07  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Chris Marrin.
+
+        Fix the Color -> CGColorRef conversions for the debug colors
+        used for compositing layers.
+
+        * platform/graphics/ca/mac/PlatformCALayerMac.mm:
+        (PlatformCALayer::setBackgroundColor):
+        (PlatformCALayer::setBorderColor):
+
 2010-12-07  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by John Sullivan.
diff --git a/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm b/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
index 00a8fe6..b94f07b 100644
--- a/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
+++ b/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm
@@ -623,14 +623,15 @@ Color PlatformCALayer::backgroundColor() const
 
 void PlatformCALayer::setBackgroundColor(const Color& value)
 {
-    const CGFloat components[5] = { value.red(), value.green(), value.blue(), value.alpha() };
-    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGColorRef color = CGColorCreate(colorSpace, components);
-    CGColorSpaceRelease(colorSpace);
+    CGFloat components[4];
+    value.getRGBA(components[0], components[1], components[2], components[3]);
+
+    RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
+    RetainPtr<CGColorRef> color(AdoptCF, CGColorCreate(colorSpace.get(), components));
+
     BEGIN_BLOCK_OBJC_EXCEPTIONS
-    [m_layer.get() setBackgroundColor:color];
+    [m_layer.get() setBackgroundColor:color.get()];
     END_BLOCK_OBJC_EXCEPTIONS
-    CGColorRelease(color);
 }
 
 float PlatformCALayer::borderWidth() const
@@ -652,14 +653,15 @@ Color PlatformCALayer::borderColor() const
 
 void PlatformCALayer::setBorderColor(const Color& value)
 {
-    const CGFloat components[5] = { value.red(), value.green(), value.blue(), value.alpha() };
-    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGColorRef color = CGColorCreate(colorSpace, components);
-    CGColorSpaceRelease(colorSpace);
+    CGFloat components[4];
+    value.getRGBA(components[0], components[1], components[2], components[3]);
+
+    RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGColorSpaceCreateDeviceRGB());
+    RetainPtr<CGColorRef> color(AdoptCF, CGColorCreate(colorSpace.get(), components));
+
     BEGIN_BLOCK_OBJC_EXCEPTIONS
-    [m_layer.get() setBorderColor:color];
+    [m_layer.get() setBorderColor:color.get()];
     END_BLOCK_OBJC_EXCEPTIONS
-    CGColorRelease(color);
 }
 
 float PlatformCALayer::opacity() const

-- 
WebKit Debian packaging