<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[203565] branches/safari-602-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/203565">203565</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-22 02:25:31 -0700 (Fri, 22 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203424">r203424</a>. rdar://problem/27391012</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformgraphicscgImageBufferCGcpp">branches/safari-602-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformspicgCoreGraphicsSPIh">branches/safari-602-branch/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203564 => 203565)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-22 09:25:28 UTC (rev 203564)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-22 09:25:31 UTC (rev 203565)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-07-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203424. rdar://problem/27391012
+
+ 2016-07-19 Dean Jackson <dino@apple.com>
+
+ REGRESSION(202927): The first slide is the only displayed slide when Quicklooking a Keynote file
+ https://bugs.webkit.org/show_bug.cgi?id=159948
+ <rdar://problem/27391012>
+
+ Reviewed by Simon Fraser.
+
+ There is an iOS bug (<rdar://problem/27416744>) that is causing us
+ to not always get a color space on CGContextRefs. Investigation of this
+ exposed some optimizations we can take when we are creating ImageBuffers.
+ In particular, if we have a bitmap context or an IOSurfaceContext we
+ can simply copy their color space using API. Otherwise we stick with
+ the existing CGContextCopyDeviceColorSpace.
+
+ Lastly, if for some reason we are unable to copy the device color space,
+ we should fall back to sRGB.
+
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::createCompatibleBuffer):
+ * platform/spi/cg/CoreGraphicsSPI.h: Add some SPI and enums.
+
+
+2016-07-22 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203415. rdar://problem/27409483
</span><span class="cx">
</span><span class="cx"> 2016-07-19 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (203564 => 203565)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-07-22 09:25:28 UTC (rev 203564)
+++ branches/safari-602-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-07-22 09:25:31 UTC (rev 203565)
</span><span class="lines">@@ -79,7 +79,22 @@
</span><span class="cx"> float resolutionScale = context.scaleFactor().width();
</span><span class="cx"> RetainPtr<CGColorSpaceRef> colorSpace;
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- colorSpace = adoptCF(CGContextCopyDeviceColorSpace(context.platformContext()));
</del><ins>+ CGContextRef cgContext = context.platformContext();
+ switch (CGContextGetType(cgContext)) {
+ case kCGContextTypeBitmap:
+ colorSpace = adoptCF(CGBitmapContextGetColorSpace(cgContext));
+ break;
+#if USE(IOSURFACE)
+ case kCGContextTypeIOSurface:
+ colorSpace = adoptCF(CGIOSurfaceContextGetColorSpace(cgContext));
+ break;
+#endif
+ default:
+ colorSpace = adoptCF(CGContextCopyDeviceColorSpace(cgContext));
+ }
+
+ if (!colorSpace)
+ colorSpace = sRGBColorSpaceRef();
</ins><span class="cx"> #else
</span><span class="cx"> colorSpace = sRGBColorSpaceRef();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformspicgCoreGraphicsSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h (203564 => 203565)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2016-07-22 09:25:28 UTC (rev 203564)
+++ branches/safari-602-branch/Source/WebCore/platform/spi/cg/CoreGraphicsSPI.h 2016-07-22 09:25:31 UTC (rev 203565)
</span><span class="lines">@@ -74,6 +74,19 @@
</span><span class="cx"> typedef const struct CGColorTransform* CGColorTransformRef;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><ins>+ kCGContextTypeUnknown,
+ kCGContextTypePDF,
+ kCGContextTypePostScript,
+ kCGContextTypeWindow,
+ kCGContextTypeBitmap,
+ kCGContextTypeGL,
+ kCGContextTypeDisplayList,
+ kCGContextTypeKSeparation,
+ kCGContextTypeIOSurface,
+ kCGContextTypeCount
+} CGContextType;
+
+typedef enum {
</ins><span class="cx"> kCGCompositeCopy = 1,
</span><span class="cx"> kCGCompositeSover = 2,
</span><span class="cx"> } CGCompositeOperation;
</span><span class="lines">@@ -156,6 +169,7 @@
</span><span class="cx"> void CGContextSetCompositeOperation(CGContextRef, CGCompositeOperation);
</span><span class="cx"> void CGContextSetShouldAntialiasFonts(CGContextRef, bool shouldAntialiasFonts);
</span><span class="cx"> void CGContextResetClip(CGContextRef);
</span><ins>+CGContextType CGContextGetType(CGContextRef);
</ins><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
</span><span class="cx"> void CGContextSetFontDilation(CGContextRef, CGSize);
</span><span class="cx"> void CGContextSetFontRenderingStyle(CGContextRef, CGFontRenderingStyle);
</span><span class="lines">@@ -182,6 +196,7 @@
</span><span class="cx"> CGContextRef CGIOSurfaceContextCreate(IOSurfaceRef, size_t, size_t, size_t, size_t, CGColorSpaceRef, CGBitmapInfo);
</span><span class="cx"> CGImageRef CGIOSurfaceContextCreateImage(CGContextRef);
</span><span class="cx"> CGImageRef CGIOSurfaceContextCreateImageReference(CGContextRef);
</span><ins>+CGColorSpaceRef CGIOSurfaceContextGetColorSpace(CGContextRef);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre>
</div>
</div>
</body>
</html>