Changeset 54502 in webkit

Timestamp:

Feb 8, 2010 12:25:21 PM (14 years ago)

Author:

senorblanco@chromium.org

Message:

2010-02-08 Stephen White <​senorblanco@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:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/GraphicsContextCG.cpp (modified) (1 diff)
• platform/graphics/cg/GraphicsContextPlatformPrivateCG.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-08  Stephen White  <senorblanco@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@chromium.org>
 

trunk/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -133 +133 @@
 }
 
+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())

trunk/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h

@@ -32 +32 @@
 
 // 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 {