[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[senorblanco at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 39580c6a92837f332300e3e41963cdaf117be7f3
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 8 20:25:21 2010 +0000

    2010-02-08  Stephen White  <senorblanco at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            Make an inline function containing a static var out-of-line.  This is
            a workaround for Xcode 3.1 bug radar 7070016.  We tripped on this in
            deviceRGBColorSpaceRef on the Chromium canaries.  This is a proactive
            fix for the same problem in sRGBColorSpaceRef().
    
            https://bugs.webkit.org/show_bug.cgi?id=34663
    
            * platform/graphics/cg/GraphicsContextCG.cpp:
            (WebCore::sRGBColorSpaceRef):
            * platform/graphics/cg/GraphicsContextPlatformPrivateCG.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 98d5988..de955e7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-08  Stephen White  <senorblanco at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Make an inline function containing a static var out-of-line.  This is
+        a workaround for Xcode 3.1 bug radar 7070016.  We tripped on this in
+        deviceRGBColorSpaceRef on the Chromium canaries.  This is a proactive
+        fix for the same problem in sRGBColorSpaceRef().
+
+        https://bugs.webkit.org/show_bug.cgi?id=34663
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::sRGBColorSpaceRef):
+        * platform/graphics/cg/GraphicsContextPlatformPrivateCG.h:
+
 2010-02-08  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/graphics/cg/GraphicsContextCG.cpp b/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
index 205ea87..64de707 100644
--- a/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
+++ b/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
@@ -132,6 +132,17 @@ CGColorSpaceRef deviceRGBColorSpaceRef()
     return deviceSpace;
 }
 
+CGColorSpaceRef sRGBColorSpaceRef()
+{
+    // FIXME: Windows should be able to use kCGColorSpaceSRGB, this is tracked by http://webkit.org/b/31363.
+#if PLATFORM(WIN) || defined(BUILDING_ON_TIGER)
+    return deviceRGBColorSpaceRef();
+#else
+    static CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
+    return sRGBSpace;
+#endif
+}
+
 GraphicsContext::GraphicsContext(CGContextRef cgContext)
     : m_common(createGraphicsContextPrivate())
     , m_data(new GraphicsContextPlatformPrivate(cgContext))
diff --git a/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h b/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h
index c1d5c3f..dd8cca3 100644
--- a/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h
+++ b/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h
@@ -31,16 +31,7 @@ namespace WebCore {
 CGColorSpaceRef deviceRGBColorSpaceRef();
 
 // FIXME: This would be in GraphicsContextCG.h if that existed.
-inline CGColorSpaceRef sRGBColorSpaceRef()
-{
-    // FIXME: Windows should be able to use kCGColorSpaceSRGB, this is tracked by http://webkit.org/b/31363.
-#if PLATFORM(WIN) || defined(BUILDING_ON_TIGER)
-    return deviceRGBColorSpaceRef();
-#else
-    static CGColorSpaceRef sRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
-    return sRGBSpace;
-#endif
-}
+CGColorSpaceRef sRGBColorSpaceRef();
 
 class GraphicsContextPlatformPrivate {
 public:

-- 
WebKit Debian packaging