Title: [192194] trunk/Source/WebCore
- Revision
- 192194
- Author
- simon.fra...@apple.com
- Date
- 2015-11-09 17:10:51 -0800 (Mon, 09 Nov 2015)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (192193 => 192194)
--- trunk/Source/WebCore/ChangeLog 2015-11-10 01:07:47 UTC (rev 192193)
+++ trunk/Source/WebCore/ChangeLog 2015-11-10 01:10:51 UTC (rev 192194)
@@ -1,3 +1,18 @@
+2015-11-09 Simon Fraser <simon.fra...@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_hs...@apple.com>
Sometimes unable to scroll fixed div when the body is scrollable
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (192193 => 192194)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-11-10 01:07:47 UTC (rev 192193)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2015-11-10 01:10:51 UTC (rev 192194)
@@ -51,10 +51,6 @@
#include <WebKitSystemInterface/WebKitSystemInterface.h>
#endif
-#if PLATFORM(IOS)
-#include <wtf/HashMap.h>
-#endif
-
// FIXME: The following using declaration should be in <wtf/HashFunctions.h>.
using WTF::pairIntHash;
@@ -93,7 +89,7 @@
return sRGBSpace;
}
-#if PLATFORM(WIN) || PLATFORM(IOS)
+#if PLATFORM(WIN)
CGColorSpaceRef linearRGBColorSpaceRef()
{
// FIXME: Windows should be able to use linear sRGB, this is tracked by http://webkit.org/b/80000.
Modified: trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm (192193 => 192194)
--- trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2015-11-10 01:07:47 UTC (rev 192193)
+++ trunk/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2015-11-10 01:10:51 UTC (rev 192194)
@@ -292,10 +292,9 @@
CGContextRestoreGState(context);
}
-#if !PLATFORM(IOS)
CGColorSpaceRef linearRGBColorSpaceRef()
{
- static CGColorSpaceRef linearSRGBSpace = 0;
+ static CGColorSpaceRef linearSRGBSpace = nullptr;
if (linearSRGBSpace)
return linearSRGBSpace;
@@ -312,6 +311,5 @@
return linearSRGBSpace;
}
-#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
