Changeset 192194 in webkit

Timestamp:

Nov 9, 2015 5:10:51 PM (9 years ago)

Author:

Simon Fraser

Message:

Allow iOS to create linearRGB colorspaces
​https://bugs.webkit.org/show_bug.cgi?id=151059

Reviewed by Tim Horton.

Remove iOS #ifdefs around code that creates linearized RGB colorspaces, as used
by SVG filters. Blending doesn't actually work correctly, but there's no reason
to #ifdef differently here.

• platform/graphics/cg/GraphicsContextCG.cpp:
• platform/graphics/mac/GraphicsContextMac.mm:

(WebCore::linearRGBColorSpaceRef):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/GraphicsContextCG.cpp (modified) (2 diffs)
• platform/graphics/mac/GraphicsContextMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-09  Simon Fraser  <simon.fraser@apple.com>
+
+        Allow iOS to create linearRGB colorspaces
+        https://bugs.webkit.org/show_bug.cgi?id=151059
+
+        Reviewed by Tim Horton.
+
+        Remove iOS #ifdefs around code that creates linearized RGB colorspaces, as used
+        by SVG filters. Blending doesn't actually work correctly, but there's no reason
+        to #ifdef differently here.
+
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        * platform/graphics/mac/GraphicsContextMac.mm:
+        (WebCore::linearRGBColorSpaceRef):
+
 2015-11-09  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -52 +52 @@
 #endif
 
-#if PLATFORM(IOS)
-#include <wtf/HashMap.h>
-#endif
-
 // FIXME: The following using declaration should be in <wtf/HashFunctions.h>.
 using WTF::pairIntHash;
@@ -94 +90 @@
 }
 
-#if PLATFORM(WIN) || PLATFORM(IOS)
+#if PLATFORM(WIN)
 CGColorSpaceRef linearRGBColorSpaceRef()
 {

trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm

@@ -293 +293 @@
 }
 
-#if !PLATFORM(IOS)
 CGColorSpaceRef linearRGBColorSpaceRef()
 {
-    static CGColorSpaceRef linearSRGBSpace = 0;
+    static CGColorSpaceRef linearSRGBSpace = nullptr;
 
     if (linearSRGBSpace)
@@ -313 +312 @@
     return linearSRGBSpace;
 }
-#endif
-
-}
+
+}