Title: [207742] branches/safari-602-branch/Source/WebCore
- Revision
- 207742
- Author
- matthew_han...@apple.com
- Date
- 2016-10-24 00:18:25 -0700 (Mon, 24 Oct 2016)
Log Message
Merge r206706. rdar://problem/28635081
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207741 => 207742)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-24 07:18:22 UTC (rev 207741)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-24 07:18:25 UTC (rev 207742)
@@ -1,5 +1,26 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r206706. rdar://problem/28635081
+
+ 2016-09-30 David Kilzer <ddkil...@apple.com>
+
+ REGRESSION (r203424): WebCore::ImageBuffer::createCompatibleBuffer() in ImageBufferCG.cpp over-releases CGColorSpaceRef objects
+ <https://webkit.org/b/162823>
+ <rdar://problem/27723268>
+
+ Reviewed by Joseph Pecoraro.
+
+ Code is covered by existing tests, but no crashes have been
+ observed in practice. May require running one test multiple
+ times to reproduce.
+
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::createCompatibleBuffer): Don't use
+ adoptCF() when the function doesn't return a +1 retained
+ CGColorSpaceRef.
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r206074. rdar://problem/28216061
2016-09-17 David Kilzer <ddkil...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (207741 => 207742)
--- branches/safari-602-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-10-24 07:18:22 UTC (rev 207741)
+++ branches/safari-602-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-10-24 07:18:25 UTC (rev 207742)
@@ -80,11 +80,11 @@
CGContextRef cgContext = context.platformContext();
switch (CGContextGetType(cgContext)) {
case kCGContextTypeBitmap:
- colorSpace = adoptCF(CGBitmapContextGetColorSpace(cgContext));
+ colorSpace = CGBitmapContextGetColorSpace(cgContext);
break;
#if USE(IOSURFACE)
case kCGContextTypeIOSurface:
- colorSpace = adoptCF(CGIOSurfaceContextGetColorSpace(cgContext));
+ colorSpace = CGIOSurfaceContextGetColorSpace(cgContext);
break;
#endif
default:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
