<!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>[214646] trunk/Source/WebKit2</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/214646">214646</a></dd>
<dt>Author</dt> <dd>megan_gardner@apple.com</dd>
<dt>Date</dt> <dd>2017-03-30 18:36:20 -0700 (Thu, 30 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow for extended color in snapshots
https://bugs.webkit.org/show_bug.cgi?id=170314
<rdar://problem/28676092> WKImageCreateCGImage should support WideGamut in WebKit2 on macOS
Reviewed by Simon Fraser.
Piping options through snapshots to allow for wide gamut support.
* Shared/API/c/WKImage.h:
* Shared/API/c/WKSharedAPICast.h:
(WebKit::snapshotOptionsFromImageOptions):
* Shared/ImageOptions.h:
(WebKit::snapshotOptionsToImageOptions):
* Shared/WebImage.cpp:
(WebKit::WebImage::create):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKImageh">trunk/Source/WebKit2/Shared/API/c/WKImage.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2SharedImageOptionsh">trunk/Source/WebKit2/Shared/ImageOptions.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebImagecpp">trunk/Source/WebKit2/Shared/WebImage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (214645 => 214646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-31 01:15:25 UTC (rev 214645)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-31 01:36:20 UTC (rev 214646)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-30 Megan Gardner <megan_gardner@apple.com>
+
+ Allow for extended color in snapshots
+ https://bugs.webkit.org/show_bug.cgi?id=170314
+ <rdar://problem/28676092> WKImageCreateCGImage should support WideGamut in WebKit2 on macOS
+
+ Reviewed by Simon Fraser.
+
+ Piping options through snapshots to allow for wide gamut support.
+
+ * Shared/API/c/WKImage.h:
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::snapshotOptionsFromImageOptions):
+ * Shared/ImageOptions.h:
+ (WebKit::snapshotOptionsToImageOptions):
+ * Shared/WebImage.cpp:
+ (WebKit::WebImage::create):
+
</ins><span class="cx"> 2017-03-30 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Expose the WKView SPI, _prepareForMoveToWindow:withCompletionHandler as WKWebView SPI
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKImage.h (214645 => 214646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKImage.h 2017-03-31 01:15:25 UTC (rev 214645)
+++ trunk/Source/WebKit2/Shared/API/c/WKImage.h 2017-03-31 01:36:20 UTC (rev 214646)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> kWKSnapshotOptionsForceWhiteText = 1 << 5,
</span><span class="cx"> kWKSnapshotOptionsPrinting = 1 << 6,
</span><span class="cx"> kWKSnapshotOptionsExcludeOverflow = 1 << 7,
</span><ins>+ kWKSnapshotOptionsExtendedColor = 1 << 8,
</ins><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKSnapshotOptions;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (214645 => 214646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2017-03-31 01:15:25 UTC (rev 214645)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2017-03-31 01:36:20 UTC (rev 214646)
</span><span class="lines">@@ -931,6 +931,9 @@
</span><span class="cx"> if (wkImageOptions & kWKImageOptionsShareable)
</span><span class="cx"> snapshotOptions |= SnapshotOptionsShareable;
</span><span class="cx">
</span><ins>+ if (wkImageOptions & kWKSnapshotOptionsExtendedColor)
+ snapshotOptions |= SnapshotOptionsExtendedColor;
+
</ins><span class="cx"> return snapshotOptions;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedImageOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ImageOptions.h (214645 => 214646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ImageOptions.h 2017-03-31 01:15:25 UTC (rev 214645)
+++ trunk/Source/WebKit2/Shared/ImageOptions.h 2017-03-31 01:36:20 UTC (rev 214646)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> enum ImageOptions {
</span><span class="cx"> ImageOptionsShareable = 1 << 0,
</span><ins>+ ImageOptionsExtendedColor = 1 << 1,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum {
</span><span class="lines">@@ -41,6 +42,7 @@
</span><span class="cx"> SnapshotOptionsForceBlackText = 1 << 6,
</span><span class="cx"> SnapshotOptionsForceWhiteText = 1 << 7,
</span><span class="cx"> SnapshotOptionsPrinting = 1 << 8,
</span><ins>+ SnapshotOptionsExtendedColor = 1 << 9,
</ins><span class="cx"> };
</span><span class="cx"> typedef uint32_t SnapshotOptions;
</span><span class="cx">
</span><span class="lines">@@ -51,6 +53,10 @@
</span><span class="cx">
</span><span class="cx"> if (snapshotOptions & SnapshotOptionsShareable)
</span><span class="cx"> imageOptions |= ImageOptionsShareable;
</span><ins>+
+ if (snapshotOptions & SnapshotOptionsExtendedColor)
+ imageOptions |= ImageOptionsExtendedColor;
+
</ins><span class="cx">
</span><span class="cx"> return static_cast<ImageOptions>(imageOptions);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebImage.cpp (214645 => 214646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebImage.cpp 2017-03-31 01:15:25 UTC (rev 214645)
+++ trunk/Source/WebKit2/Shared/WebImage.cpp 2017-03-31 01:36:20 UTC (rev 214646)
</span><span class="lines">@@ -34,13 +34,17 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<WebImage> WebImage::create(const IntSize& size, ImageOptions options)
</span><span class="cx"> {
</span><ins>+ int sharableOptions = ShareableBitmap::SupportsAlpha;
+
+ if (options & ImageOptionsExtendedColor)
+ sharableOptions |= ShareableBitmap::SupportsExtendedColor;
</ins><span class="cx"> if (options & ImageOptionsShareable) {
</span><del>- auto bitmap = ShareableBitmap::createShareable(size, ShareableBitmap::SupportsAlpha);
</del><ins>+ auto bitmap = ShareableBitmap::createShareable(size, sharableOptions);
</ins><span class="cx"> if (!bitmap)
</span><span class="cx"> return nullptr;
</span><span class="cx"> return WebImage::create(bitmap.releaseNonNull());
</span><span class="cx"> }
</span><del>- auto bitmap = ShareableBitmap::create(size, ShareableBitmap::SupportsAlpha);
</del><ins>+ auto bitmap = ShareableBitmap::create(size, sharableOptions);
</ins><span class="cx"> if (!bitmap)
</span><span class="cx"> return nullptr;
</span><span class="cx"> return WebImage::create(bitmap.releaseNonNull());
</span></span></pre>
</div>
</div>
</body>
</html>