[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[bdakin at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 478a621d2271e1e8696db828d01892cf81bbc8a8
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 10 23:16:43 2009 +0000

    Attempt 2 to fix Tiger build. No review needed.
    
    * platform/graphics/cg/GraphicsContextCG.cpp:
    (WebCore::deviceRGBColorSpaceRef):
    (WebCore::sRGBColorSpaceRef):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50776 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d8cdc85..c1002af 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-10  Beth Dakin  <bdakin at apple.com>
+
+        Attempt 2 to fix Tiger build. No review needed.
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::deviceRGBColorSpaceRef):
+        (WebCore::sRGBColorSpaceRef):
+
 2009-11-10  Kevin Ollivier  <kevino at theolliviers.com>
 
         wx build fix. Changes needed after r50760.
diff --git a/WebCore/platform/graphics/cg/GraphicsContextCG.cpp b/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
index 1259f19..05e7059 100644
--- a/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
+++ b/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
@@ -61,19 +61,20 @@ using namespace std;
 
 namespace WebCore {
 
+static CGColorSpaceRef deviceRGBColorSpaceRef()
+{
+    static CGColorSpaceRef deviceSpace = CGColorSpaceCreateDeviceRGB();
+    return deviceSpace;
+}
+
 static CGColorSpaceRef sRGBColorSpaceRef()
 {
 #ifdef BUILDING_ON_TIGER
     return deviceRGBColorSpaceRef();
-#endif
+#else
     static CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
     return sRGBSpace;
-}
-
-static CGColorSpaceRef deviceRGBColorSpaceRef()
-{
-    static CGColorSpaceRef deviceSpace = CGColorSpaceCreateDeviceRGB();
-    return deviceSpace;
+#endif
 }
 
 static void setCGFillColor(CGContextRef context, const Color& color, ColorSpace colorSpace)

-- 
WebKit Debian packaging