<!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>[208596] trunk/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/208596">208596</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-11 10:54:21 -0800 (Fri, 11 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Support wide gamut for Drag Image UI
https://bugs.webkit.org/show_bug.cgi?id=164490
Patch by Megan Gardner <megan_gardner@apple.com> on 2016-11-11
Reviewed by Tim Horton.
Source/WebCore:
Fixed an error in the support define for wide gamut on Mac.
The testing infrastructure to test this does not exist, and will be landing in another patch.
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::extendedSRGBColorSpaceRef):
Source/WebKit2:
Fixed an error in the gating for the new wide gamut support in ShareableBitmap.
We should always respect the flags straight out, and not make decisions later, it can lead to mismatched data and data storage.
Added support for wide gamut in createCGImage.
* Shared/cg/ShareableBitmapCG.cpp:
(WebKit::bitmapInfo):
(WebKit::colorSpace):
(WebKit::ShareableBitmap::createGraphicsContext):
(WebKit::ShareableBitmap::createCGImage):
* WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
(WebKit::convertImageToBitmap):
(WebKit::WebDragClient::startDrag):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedcgShareableBitmapCGcpp">trunk/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208595 => 208596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-11 18:54:08 UTC (rev 208595)
+++ trunk/Source/WebCore/ChangeLog 2016-11-11 18:54:21 UTC (rev 208596)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-11-11 Megan Gardner <megan_gardner@apple.com>
+
+ [Cocoa] Support wide gamut for Drag Image UI
+ https://bugs.webkit.org/show_bug.cgi?id=164490
+
+ Reviewed by Tim Horton.
+
+ Fixed an error in the support define for wide gamut on Mac.
+
+ The testing infrastructure to test this does not exist, and will be landing in another patch.
+
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::extendedSRGBColorSpaceRef):
+
</ins><span class="cx"> 2016-11-11 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Get touch bar code building for open source builds
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (208595 => 208596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-11-11 18:54:08 UTC (rev 208595)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-11-11 18:54:21 UTC (rev 208596)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> CGColorSpaceRef extendedSRGBColorSpaceRef()
</span><span class="cx"> {
</span><span class="cx"> static CGColorSpaceRef extendedSRGBSpace;
</span><del>-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101200)
</del><ins>+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
</ins><span class="cx"> extendedSRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
</span><span class="cx"> #endif
</span><span class="cx"> // If there is no support for exteneded sRGB, fall back to sRGB.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208595 => 208596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-11 18:54:08 UTC (rev 208595)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-11 18:54:21 UTC (rev 208596)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-11-11 Megan Gardner <megan_gardner@apple.com>
+
+ [Cocoa] Support wide gamut for Drag Image UI
+ https://bugs.webkit.org/show_bug.cgi?id=164490
+
+ Reviewed by Tim Horton.
+
+ Fixed an error in the gating for the new wide gamut support in ShareableBitmap.
+ We should always respect the flags straight out, and not make decisions later, it can lead to mismatched data and data storage.
+ Added support for wide gamut in createCGImage.
+
+ * Shared/cg/ShareableBitmapCG.cpp:
+ (WebKit::bitmapInfo):
+ (WebKit::colorSpace):
+ (WebKit::ShareableBitmap::createGraphicsContext):
+ (WebKit::ShareableBitmap::createCGImage):
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+ (WebKit::convertImageToBitmap):
+ (WebKit::WebDragClient::startDrag):
+
</ins><span class="cx"> 2016-11-11 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Get touch bar code building for open source builds
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcgShareableBitmapCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp (208595 => 208596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp 2016-11-11 18:54:08 UTC (rev 208595)
+++ trunk/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp 2016-11-11 18:54:21 UTC (rev 208596)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> static CGBitmapInfo bitmapInfo(ShareableBitmap::Flags flags)
</span><span class="cx"> {
</span><span class="cx"> CGBitmapInfo info = 0;
</span><del>- if ((flags & ShareableBitmap::SupportsExtendedColor) && screenSupportsExtendedColor()) {
</del><ins>+ if (flags & ShareableBitmap::SupportsExtendedColor) {
</ins><span class="cx"> info |= kCGBitmapFloatComponents | kCGBitmapByteOrder16Host;
</span><span class="cx">
</span><span class="cx"> if (flags & ShareableBitmap::SupportsAlpha)
</span><span class="lines">@@ -58,19 +58,20 @@
</span><span class="cx">
</span><span class="cx"> return info;
</span><span class="cx"> }
</span><ins>+
+static CGColorSpaceRef colorSpace(ShareableBitmap::Flags flags)
+{
+ if (flags & ShareableBitmap::SupportsExtendedColor)
+ return extendedSRGBColorSpaceRef();
+ return sRGBColorSpaceRef();
+}
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<GraphicsContext> ShareableBitmap::createGraphicsContext()
</span><span class="cx"> {
</span><span class="cx"> ref(); // Balanced by deref in releaseBitmapContextData.
</span><span class="cx">
</span><del>- CGColorSpaceRef colorSpace;
- if (m_flags & ShareableBitmap::SupportsExtendedColor)
- colorSpace = extendedSRGBColorSpaceRef();
- else
- colorSpace = sRGBColorSpaceRef();
</del><ins>+ RetainPtr<CGContextRef> bitmapContext = adoptCF(CGBitmapContextCreateWithData(data(), m_size.width(), m_size.height(), m_bytesPerPixel * 8 / 4, m_size.width() * m_bytesPerPixel, colorSpace(m_flags), bitmapInfo(m_flags), releaseBitmapContextData, this));
</ins><span class="cx">
</span><del>- RetainPtr<CGContextRef> bitmapContext = adoptCF(CGBitmapContextCreateWithData(data(), m_size.width(), m_size.height(), m_bytesPerPixel * 8 / 4, m_size.width() * m_bytesPerPixel, colorSpace, bitmapInfo(m_flags), releaseBitmapContextData, this));
-
</del><span class="cx"> ASSERT(bitmapContext.get());
</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">@@ -107,8 +108,7 @@
</span><span class="cx"> RetainPtr<CGImageRef> ShareableBitmap::createCGImage(CGDataProviderRef dataProvider) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(dataProvider, dataProvider);
</span><del>- // FIXME: Make this use extended color, etc.
- 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));
</del><ins>+ RetainPtr<CGImageRef> image = adoptCF(CGImageCreate(m_size.width(), m_size.height(), m_bytesPerPixel * 8 / 4, m_bytesPerPixel * 8, m_size.width() * m_bytesPerPixel, colorSpace(m_flags), 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="trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (208595 => 208596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2016-11-11 18:54:08 UTC (rev 208595)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2016-11-11 18:54:21 UTC (rev 208596)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #import <WebCore/FrameView.h>
</span><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><span class="cx"> #import <WebCore/LegacyWebArchive.h>
</span><ins>+#import <WebCore/MainFrame.h>
</ins><span class="cx"> #import <WebCore/WebCoreNSURLExtras.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/RenderImage.h>
</span><span class="lines">@@ -52,9 +53,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static PassRefPtr<ShareableBitmap> convertImageToBitmap(NSImage *image, const IntSize& size)
</del><ins>+static PassRefPtr<ShareableBitmap> convertImageToBitmap(NSImage *image, const IntSize& size, Frame& frame)
</ins><span class="cx"> {
</span><del>- auto bitmap = ShareableBitmap::createShareable(size, ShareableBitmap::SupportsAlpha);
</del><ins>+ ShareableBitmap::Flags flags = ShareableBitmap::SupportsAlpha;
+ if (screenSupportsExtendedColor(frame.mainFrame().view()))
+ flags |= ShareableBitmap::SupportsExtendedColor;
+ auto bitmap = ShareableBitmap::createShareable(size, flags);
</ins><span class="cx"> if (!bitmap)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -73,7 +77,7 @@
</span><span class="cx"> void WebDragClient::startDrag(RetainPtr<NSImage> image, const IntPoint& point, const IntPoint&, DataTransfer&, Frame& frame, bool linkDrag)
</span><span class="cx"> {
</span><span class="cx"> IntSize bitmapSize([image size]);
</span><del>- RefPtr<ShareableBitmap> bitmap = convertImageToBitmap(image.get(), bitmapSize);
</del><ins>+ RefPtr<ShareableBitmap> bitmap = convertImageToBitmap(image.get(), bitmapSize, frame);
</ins><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (!bitmap || !bitmap->createHandle(handle))
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>