<!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>[193953] branches/safari-601.1.46-branch/Source</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/193953">193953</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-11 04:34:30 -0800 (Fri, 11 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192712">r192712</a>. rdar://problem/23814340</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscacocoaPlatformCAFiltersCocoamm">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscacocoaWebSystemBackdropLayermm">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/WebSystemBackdropLayer.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscgGradientCGcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/GradientCG.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscgGraphicsContext3DCGcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscgImageBufferCGcpp">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsmacGraphicsContextMacmm">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsmacWebGLLayermm">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingRenderThemeIOSmm">branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingRenderThemeMacmm">branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2SharedcgShareableBitmapCGcpp">branches/safari-601.1.46-branch/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2SharedmacRemoteLayerTreePropertyAppliermm">branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2015-12-09 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r192712. rdar://problem/23814340
+
+ 2015-11-20 Simon Fraser <simon.fraser@apple.com>
+
+ More deviceRGB color cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=151523
+ <rdar://problem/23638597>
+
+ Reviewed by Tim Horton.
+
+ Replace calls to deviceRGBColorSpaceRef() with sRGBColorSpaceRef(), and use
+ sRGBColorSpaceRef() in a few places that were manually creating the colorspace.
+
+ Also use cachedCGColor() in a more places that were manually constructing CGColorRefs
+ from Colors.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createImageForTimeInRect):
+ (WebCore::createImageFromPixelBuffer):
+ * platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm:
+ * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+ (PlatformCALayerCocoa::setBackgroundColor):
+ (PlatformCALayerCocoa::setBorderColor):
+ * platform/graphics/ca/cocoa/WebSystemBackdropLayer.mm:
+ (-[WebLightSystemBackdropLayer init]):
+ (-[WebDarkSystemBackdropLayer init]):
+ * platform/graphics/cg/GradientCG.cpp:
+ (WebCore::Gradient::platformGradient):
+ * platform/graphics/cg/GraphicsContext3DCG.cpp:
+ (WebCore::GraphicsContext3D::ImageExtractor::extractImage):
+ (WebCore::GraphicsContext3D::paintToCanvas):
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::copyImage):
+ (WebCore::ImageBuffer::toDataURL):
+ (WebCore::ImageDataToDataURL):
+ * platform/graphics/mac/GraphicsContextMac.mm:
+ (WebCore::linearRGBColorSpaceRef):
+ * platform/graphics/mac/WebGLLayer.mm:
+ (-[WebGLLayer copyImageSnapshotWithColorSpace:]):
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::currentFrameCGImage):
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::drawRadialGradient):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintMenuListButtonGradients):
+ (WebCore::RenderThemeMac::paintSliderTrack):
+
</ins><span class="cx"> 2015-12-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r193859. rdar://problem/23814345
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -1576,7 +1576,7 @@
</span><span class="cx">
</span><span class="cx"> [m_imageGenerator.get() setMaximumSize:CGSize(rect.size())];
</span><span class="cx"> RetainPtr<CGImageRef> rawImage = adoptCF([m_imageGenerator.get() copyCGImageAtTime:CMTimeMakeWithSeconds(time, 600) actualTime:nil error:nil]);
</span><del>- RetainPtr<CGImageRef> image = adoptCF(CGImageCreateCopyWithColorSpace(rawImage.get(), deviceRGBColorSpaceRef()));
</del><ins>+ RetainPtr<CGImageRef> image = adoptCF(CGImageCreateCopyWithColorSpace(rawImage.get(), sRGBColorSpaceRef()));
</ins><span class="cx">
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> double duration = monotonicallyIncreasingTime() - start;
</span><span class="lines">@@ -2310,7 +2310,7 @@
</span><span class="cx"> CGDataProviderDirectCallbacks providerCallbacks = { 0, CVPixelBufferGetBytePointerCallback, CVPixelBufferReleaseBytePointerCallback, 0, CVPixelBufferReleaseInfoCallback };
</span><span class="cx"> RetainPtr<CGDataProviderRef> provider = adoptCF(CGDataProviderCreateDirect(pixelBuffer, byteLength, &providerCallbacks));
</span><span class="cx">
</span><del>- return adoptCF(CGImageCreate(width, height, 8, 32, bytesPerRow, deviceRGBColorSpaceRef(), bitmapInfo, provider.get(), NULL, false, kCGRenderingIntentDefault));
</del><ins>+ return adoptCF(CGImageCreate(width, height, 8, 32, bytesPerRow, sRGBColorSpaceRef(), bitmapInfo, provider.get(), NULL, false, kCGRenderingIntentDefault));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateAVFoundationObjC::updateLastImage()
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscacocoaPlatformCAFiltersCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCAFiltersCocoa.mm 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -86,12 +86,7 @@
</span><span class="cx"> // <rdar://problem/10959969> Handle case where drop-shadow is not the last filter.
</span><span class="cx"> const auto& dropShadowOperation = downcast<DropShadowFilterOperation>(filterOperation);
</span><span class="cx"> [layer setShadowOffset:CGSizeMake(dropShadowOperation.x(), dropShadowOperation.y())];
</span><del>-
- CGFloat components[4];
- dropShadowOperation.color().getRGBA(components[0], components[1], components[2], components[3]);
- RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
- RetainPtr<CGColorRef> color = adoptCF(CGColorCreate(colorSpace.get(), components));
- [layer setShadowColor:color.get()];
</del><ins>+ [layer setShadowColor:cachedCGColor(dropShadowOperation.color(), ColorSpaceDeviceRGB)];
</ins><span class="cx"> [layer setShadowRadius:dropShadowOperation.stdDeviation()];
</span><span class="cx"> [layer setShadowOpacity:1];
</span><span class="cx"> break;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscacocoaPlatformCALayerCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -702,14 +702,8 @@
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerCocoa::setBackgroundColor(const Color& value)
</span><span class="cx"> {
</span><del>- CGFloat components[4];
- value.getRGBA(components[0], components[1], components[2], components[3]);
-
- RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
- RetainPtr<CGColorRef> color = adoptCF(CGColorCreate(colorSpace.get(), components));
-
</del><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><del>- [m_layer setBackgroundColor:color.get()];
</del><ins>+ [m_layer setBackgroundColor:cachedCGColor(value, ColorSpaceDeviceRGB)];
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -723,14 +717,8 @@
</span><span class="cx"> void PlatformCALayerCocoa::setBorderColor(const Color& value)
</span><span class="cx"> {
</span><span class="cx"> if (value.isValid()) {
</span><del>- CGFloat components[4];
- value.getRGBA(components[0], components[1], components[2], components[3]);
-
- RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
- RetainPtr<CGColorRef> color = adoptCF(CGColorCreate(colorSpace.get(), components));
-
</del><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><del>- [m_layer setBorderColor:color.get()];
</del><ins>+ [m_layer setBorderColor:cachedCGColor(value, ColorSpaceDeviceRGB)];
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> } else {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscacocoaWebSystemBackdropLayermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/WebSystemBackdropLayer.mm (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/WebSystemBackdropLayer.mm 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/ca/cocoa/WebSystemBackdropLayer.mm 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CGFloat components[4] = { 0.8, 0.8, 0.8, 0.8 };
</span><del>- [super setBackgroundColor:CGColorCreate(cachedCGColorSpace(ColorSpaceSRGB), components)];
</del><ins>+ [super setBackgroundColor:CGColorCreate(sRGBColorSpaceRef(), components)];
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CGFloat components[4] = { 0.2, 0.2, 0.2, 0.8 };
</span><del>- [super setBackgroundColor:CGColorCreate(cachedCGColorSpace(ColorSpaceSRGB), components)];
</del><ins>+ [super setBackgroundColor:CGColorCreate(sRGBColorSpaceRef(), components)];
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscgGradientCGcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/GradientCG.cpp (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/GradientCG.cpp 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/GradientCG.cpp 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> locations.uncheckedAppend(m_stops[i].stop);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_gradient = CGGradientCreateWithColorComponents(deviceRGBColorSpaceRef(), colorComponents.data(), locations.data(), m_stops.size());
</del><ins>+ m_gradient = CGGradientCreateWithColorComponents(sRGBColorSpaceRef(), colorComponents.data(), locations.data(), m_stops.size());
</ins><span class="cx">
</span><span class="cx"> return m_gradient;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscgGraphicsContext3DCGcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> // alpha channel. Creation of a bitmap context with an alpha channel
</span><span class="cx"> // doesn't seem to work unless it's premultiplied.
</span><span class="cx"> bitmapContext = adoptCF(CGBitmapContextCreate(0, m_imageWidth, m_imageHeight, 8, m_imageWidth * 4,
</span><del>- deviceRGBColorSpaceRef(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
</del><ins>+ sRGBColorSpaceRef(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host));
</ins><span class="cx"> if (!bitmapContext)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -521,7 +521,7 @@
</span><span class="cx"> } else
</span><span class="cx"> dataProvider = adoptCF(CGDataProviderCreateWithData(0, imagePixels, rowBytes * imageHeight, 0));
</span><span class="cx">
</span><del>- RetainPtr<CGImageRef> cgImage = adoptCF(CGImageCreate(imageWidth, imageHeight, 8, 32, rowBytes, deviceRGBColorSpaceRef(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host,
</del><ins>+ RetainPtr<CGImageRef> cgImage = adoptCF(CGImageCreate(imageWidth, imageHeight, 8, 32, rowBytes, sRGBColorSpaceRef(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host,
</ins><span class="cx"> dataProvider.get(), 0, false, kCGRenderingIntentDefault));
</span><span class="cx">
</span><span class="cx"> // CSS styling may cause the canvas's content to be resized on
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> image = createCroppedImageIfNecessary(image.get(), internalSize());
</span><span class="cx"> } else {
</span><span class="cx"> image = copyNativeImage(DontCopyBackingStore);
</span><del>- RetainPtr<CGContextRef> context = adoptCF(CGBitmapContextCreate(0, logicalSize().width(), logicalSize().height(), 8, 4 * logicalSize().width(), deviceRGBColorSpaceRef(), kCGImageAlphaPremultipliedLast));
</del><ins>+ RetainPtr<CGContextRef> context = adoptCF(CGBitmapContextCreate(0, logicalSize().width(), logicalSize().height(), 8, 4 * logicalSize().width(), sRGBColorSpaceRef(), kCGImageAlphaPremultipliedLast));
</ins><span class="cx"> CGContextSetBlendMode(context.get(), kCGBlendModeCopy);
</span><span class="cx"> CGContextClipToRect(context.get(), FloatRect(FloatPoint::zero(), logicalSize()));
</span><span class="cx"> FloatSize imageSizeInUserSpace = scaleSizeToUserSpace(logicalSize(), m_data.backingStoreSize, internalSize());
</span><span class="lines">@@ -448,14 +448,14 @@
</span><span class="cx"> return "data:,";
</span><span class="cx">
</span><span class="cx"> image = adoptCF(CGImageCreate(logicalSize().width(), logicalSize().height(), 8, 32, 4 * logicalSize().width(),
</span><del>- deviceRGBColorSpaceRef(), kCGBitmapByteOrderDefault | kCGImageAlphaNoneSkipLast,
</del><ins>+ sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | kCGImageAlphaNoneSkipLast,
</ins><span class="cx"> dataProvider.get(), 0, false, kCGRenderingIntentDefault));
</span><span class="cx"> } else if (m_resolutionScale == 1) {
</span><span class="cx"> image = copyNativeImage(CopyBackingStore);
</span><span class="cx"> image = createCroppedImageIfNecessary(image.get(), internalSize());
</span><span class="cx"> } else {
</span><span class="cx"> image = copyNativeImage(DontCopyBackingStore);
</span><del>- RetainPtr<CGContextRef> context = adoptCF(CGBitmapContextCreate(0, logicalSize().width(), logicalSize().height(), 8, 4 * logicalSize().width(), deviceRGBColorSpaceRef(), kCGImageAlphaPremultipliedLast));
</del><ins>+ RetainPtr<CGContextRef> context = adoptCF(CGBitmapContextCreate(0, logicalSize().width(), logicalSize().height(), 8, 4 * logicalSize().width(), sRGBColorSpaceRef(), kCGImageAlphaPremultipliedLast));
</ins><span class="cx"> CGContextSetBlendMode(context.get(), kCGBlendModeCopy);
</span><span class="cx"> CGContextClipToRect(context.get(), CGRectMake(0, 0, logicalSize().width(), logicalSize().height()));
</span><span class="cx"> FloatSize imageSizeInUserSpace = scaleSizeToUserSpace(logicalSize(), m_data.backingStoreSize, internalSize());
</span><span class="lines">@@ -509,7 +509,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CGImageRef> image;
</span><span class="cx"> image = adoptCF(CGImageCreate(source.width(), source.height(), 8, 32, 4 * source.width(),
</span><del>- deviceRGBColorSpaceRef(), kCGBitmapByteOrderDefault | dataAlphaInfo,
</del><ins>+ sRGBColorSpaceRef(), kCGBitmapByteOrderDefault | dataAlphaInfo,
</ins><span class="cx"> dataProvider.get(), 0, false, kCGRenderingIntentDefault));
</span><span class="cx">
</span><span class="cx"> return CGImageToDataURL(image.get(), mimeType, quality);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsmacGraphicsContextMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/GraphicsContextMac.mm 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -301,9 +301,9 @@
</span><span class="cx"> if (iccProfileData)
</span><span class="cx"> linearSRGBSpace = CGColorSpaceCreateWithICCProfile((CFDataRef)iccProfileData.get());
</span><span class="cx">
</span><del>- // If we fail to load the linearized sRGB ICC profile, fall back to DeviceRGB.
</del><ins>+ // If we fail to load the linearized sRGB ICC profile, fall back to sRGB.
</ins><span class="cx"> if (!linearSRGBSpace)
</span><del>- return deviceRGBColorSpaceRef();
</del><ins>+ return sRGBColorSpaceRef();
</ins><span class="cx">
</span><span class="cx"> return linearSRGBSpace;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsmacWebGLLayermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CGColorSpaceRef> imageColorSpace = colorSpace;
</span><span class="cx"> if (!imageColorSpace)
</span><del>- imageColorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
</del><ins>+ imageColorSpace = sRGBColorSpaceRef();
</ins><span class="cx">
</span><span class="cx"> CGRect layerBounds = CGRectIntegral([self bounds]);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderThemeIOS.mm (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderThemeIOS.mm 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderThemeIOS.mm 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> static void drawRadialGradient(CGContextRef context, IOSGradientRef gradient, const FloatPoint& startPoint, float startRadius, const FloatPoint& stopPoint, float stopRadius, Interpolation interpolation)
</span><span class="cx"> {
</span><del>- RetainPtr<CGShadingRef> shading = adoptCF(CGShadingCreateRadial(deviceRGBColorSpaceRef(), startPoint, startRadius, stopPoint, stopRadius, getSharedFunctionRef(gradient, interpolation), false, false));
</del><ins>+ RetainPtr<CGShadingRef> shading = adoptCF(CGShadingCreateRadial(sRGBColorSpaceRef(), startPoint, startRadius, stopPoint, stopRadius, getSharedFunctionRef(gradient, interpolation), false, false));
</ins><span class="cx"> CGContextDrawShading(context, shading.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderThemeMac.mm (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderThemeMac.mm 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderThemeMac.mm 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -1231,7 +1231,7 @@
</span><span class="cx"> FloatRoundedRect border = FloatRoundedRect(o.style().getRoundedBorderFor(r));
</span><span class="cx"> int radius = border.radii().topLeft().width();
</span><span class="cx">
</span><del>- CGColorSpaceRef cspace = deviceRGBColorSpaceRef();
</del><ins>+ CGColorSpaceRef cspace = sRGBColorSpaceRef();
</ins><span class="cx">
</span><span class="cx"> FloatRect topGradient(r.x(), r.y(), r.width(), r.height() / 2.0f);
</span><span class="cx"> struct CGFunctionCallbacks topCallbacks = { 0, TopGradientInterpolate, NULL };
</span><span class="lines">@@ -1496,7 +1496,7 @@
</span><span class="cx">
</span><span class="cx"> LocalCurrentGraphicsContext localContext(paintInfo.context);
</span><span class="cx"> CGContextRef context = localContext.cgContext();
</span><del>- CGColorSpaceRef cspace = deviceRGBColorSpaceRef();
</del><ins>+ CGColorSpaceRef cspace = sRGBColorSpaceRef();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATALIST_ELEMENT)
</span><span class="cx"> paintSliderTicks(o, paintInfo, r);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-12-09 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r192712. rdar://problem/23814340
+
+ 2015-11-20 Simon Fraser <simon.fraser@apple.com>
+
+ More deviceRGB color cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=151523
+ <rdar://problem/23638597>
+
+ Reviewed by Tim Horton.
+
+ Replace calls to deviceRGBColorSpaceRef() with sRGBColorSpaceRef(), and use
+ sRGBColorSpaceRef() in a few places that were manually creating the colorspace.
+
+ Also use cachedCGColor() in a more places that were manually constructing CGColorRefs
+ from Colors.
+
+ * Shared/cg/ShareableBitmapCG.cpp:
+ (WebKit::ShareableBitmap::createGraphicsContext):
+ (WebKit::ShareableBitmap::createCGImage):
+ * Shared/mac/RemoteLayerTreePropertyApplier.mm:
+ (WebKit::cgColorFromColor):
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::initializeDebugIndicator):
+
</ins><span class="cx"> 2015-12-10 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r193481. rdar://problem/23110745
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2SharedcgShareableBitmapCGcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx">
</span><span class="cx"> #include <WebCore/BitmapImage.h>
</span><del>-#include <WebCore/GraphicsContext.h>
</del><ins>+#include <WebCore/GraphicsContextCG.h>
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include "CGUtilities.h"
</span><span class="cx">
</span><span class="lines">@@ -48,11 +48,9 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<GraphicsContext> ShareableBitmap::createGraphicsContext()
</span><span class="cx"> {
</span><del>- RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
-
</del><span class="cx"> ref(); // Balanced by deref in releaseBitmapContextData.
</span><span class="cx"> RetainPtr<CGContextRef> bitmapContext = adoptCF(CGBitmapContextCreateWithData(data(),
</span><del>- m_size.width(), m_size.height(), 8, m_size.width() * 4, colorSpace.get(),
</del><ins>+ m_size.width(), m_size.height(), 8, m_size.width() * 4, sRGBColorSpaceRef(),
</ins><span class="cx"> bitmapInfo(m_flags), releaseBitmapContextData, this));
</span><span class="cx">
</span><span class="cx"> // We want the origin to be in the top left corner so we flip the backing store context.
</span><span class="lines">@@ -90,8 +88,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(dataProvider, dataProvider);
</span><span class="cx">
</span><del>- RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
- RetainPtr<CGImageRef> image = adoptCF(CGImageCreate(m_size.width(), m_size.height(), 8, 32, m_size.width() * 4, colorSpace.get(), bitmapInfo(m_flags), dataProvider, 0, false, kCGRenderingIntentDefault));
</del><ins>+ RetainPtr<CGImageRef> image = adoptCF(CGImageCreate(m_size.width(), m_size.height(), 8, 32, m_size.width() * 4, sRGBColorSpaceRef(), bitmapInfo(m_flags), dataProvider, 0, false, kCGRenderingIntentDefault));
</ins><span class="cx"> return image;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2SharedmacRemoteLayerTreePropertyAppliermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -81,16 +81,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static RetainPtr<CGColorRef> cgColorFromColor(Color color)
</del><ins>+static CGColorRef cgColorFromColor(const Color& color)
</ins><span class="cx"> {
</span><span class="cx"> if (!color.isValid())
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- CGFloat components[4];
- color.getRGBA(components[0], components[1], components[2], components[3]);
-
- RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
- return adoptCF(CGColorCreate(colorSpace.get(), components));
</del><ins>+ return cachedCGColor(color, ColorSpaceDeviceRGB);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static NSString *toCAFilterType(PlatformCALayer::FilterType type)
</span><span class="lines">@@ -149,10 +145,10 @@
</span><span class="cx"> layer.bounds = properties.bounds;
</span><span class="cx">
</span><span class="cx"> if (properties.changedProperties & RemoteLayerTreeTransaction::BackgroundColorChanged)
</span><del>- layer.backgroundColor = cgColorFromColor(properties.backgroundColor).get();
</del><ins>+ layer.backgroundColor = cgColorFromColor(properties.backgroundColor);
</ins><span class="cx">
</span><span class="cx"> if (properties.changedProperties & RemoteLayerTreeTransaction::BorderColorChanged)
</span><del>- layer.borderColor = cgColorFromColor(properties.borderColor).get();
</del><ins>+ layer.borderColor = cgColorFromColor(properties.borderColor);
</ins><span class="cx">
</span><span class="cx"> if (properties.changedProperties & RemoteLayerTreeTransaction::BorderWidthChanged)
</span><span class="cx"> layer.borderWidth = properties.borderWidth;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (193952 => 193953)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2015-12-11 10:01:24 UTC (rev 193952)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2015-12-11 12:34:30 UTC (rev 193953)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><ins>+#import <WebCore/GraphicsContextCG.h>
</ins><span class="cx"> #import <WebCore/IOSurfacePool.h>
</span><span class="cx"> #import <WebCore/MachSendRight.h>
</span><span class="cx"> #import <WebCore/WebActionDisablingCALayerDelegate.h>
</span><span class="lines">@@ -355,14 +356,14 @@
</span><span class="cx"> [m_tileMapHostLayer setMasksToBounds:YES];
</span><span class="cx"> [m_tileMapHostLayer setBorderWidth:2];
</span><span class="cx">
</span><del>- RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreateDeviceRGB());
</del><ins>+ CGColorSpaceRef colorSpace = sRGBColorSpaceRef();
</ins><span class="cx"> {
</span><span class="cx"> const CGFloat components[] = { 1, 1, 1, 0.6 };
</span><del>- RetainPtr<CGColorRef> color = adoptCF(CGColorCreate(colorSpace.get(), components));
</del><ins>+ RetainPtr<CGColorRef> color = adoptCF(CGColorCreate(colorSpace, components));
</ins><span class="cx"> [m_tileMapHostLayer setBackgroundColor:color.get()];
</span><span class="cx">
</span><span class="cx"> const CGFloat borderComponents[] = { 0, 0, 0, 1 };
</span><del>- RetainPtr<CGColorRef> borderColor = adoptCF(CGColorCreate(colorSpace.get(), borderComponents));
</del><ins>+ RetainPtr<CGColorRef> borderColor = adoptCF(CGColorCreate(colorSpace, borderComponents));
</ins><span class="cx"> [m_tileMapHostLayer setBorderColor:borderColor.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -372,7 +373,7 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> const CGFloat components[] = { 0, 1, 0, 1 };
</span><del>- RetainPtr<CGColorRef> color = adoptCF(CGColorCreate(colorSpace.get(), components));
</del><ins>+ RetainPtr<CGColorRef> color = adoptCF(CGColorCreate(colorSpace, components));
</ins><span class="cx"> [m_exposedRectIndicatorLayer setBorderColor:color.get()];
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>