<!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>[208020] 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/208020">208020</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-27 17:50:53 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for wide gamut for ShareableBitmap for image popovers
https://bugs.webkit.org/show_bug.cgi?id=164001
Patch by Megan Gardner <megan_gardner@apple.com> on 2016-10-27
Reviewed by Simon Fraser.
Source/WebCore:
Add a function to return a CGColorSpaceRef for extended sRGB.
This is currently untestable, so no tests added.
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::extendedSRGBColorSpaceRef):
Source/WebKit2:
Added suppport for wide gamut in ShareableBitmap. SharableBitmaps now know the size of their pixels,
and that data is passed back and forth between the processes. The callers of SharedBitmap will determine
if their image should support wide gamut, but ShareableBitmap will override a set flag on a device that
is incapbable of supporting a wide gamut image.
This makes it possible to show wide gamut images in image popovers on iOS.
This is currently untestable, so no tests added.
* Platform/IPC/Decoder.cpp:
(IPC::Decoder::decode):
* Platform/IPC/Decoder.h:
* Platform/IPC/Encoder.cpp:
(IPC::Encoder::encode):
* Platform/IPC/Encoder.h:
* Shared/ShareableBitmap.cpp:
(WebKit::bytesPerPixel):
(WebKit::ShareableBitmap::Handle::encode):
(WebKit::ShareableBitmap::Handle::decode):
(WebKit::ShareableBitmap::Handle::clear):
(WebKit::ShareableBitmap::create):
(WebKit::ShareableBitmap::createShareable):
(WebKit::ShareableBitmap::createHandle):
(WebKit::ShareableBitmap::ShareableBitmap):
* Shared/ShareableBitmap.h:
(WebKit::ShareableBitmap::numBytesForSize):
(WebKit::ShareableBitmap::sizeInBytes):
* Shared/cg/ShareableBitmapCG.cpp:
(WebKit::bitmapInfo):
(WebKit::ShareableBitmap::createGraphicsContext):
(WebKit::ShareableBitmap::createCGImage):
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation):</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="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGh">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedShareableBitmapcpp">trunk/Source/WebKit2/Shared/ShareableBitmap.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedShareableBitmaph">trunk/Source/WebKit2/Shared/ShareableBitmap.h</a></li>
<li><a href="#trunkSourceWebKit2SharedcgShareableBitmapCGcpp">trunk/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208019 => 208020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-28 00:21:31 UTC (rev 208019)
+++ trunk/Source/WebCore/ChangeLog 2016-10-28 00:50:53 UTC (rev 208020)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-27 Megan Gardner <megan_gardner@apple.com>
+
+ Add support for wide gamut for ShareableBitmap for image popovers
+ https://bugs.webkit.org/show_bug.cgi?id=164001
+
+ Reviewed by Simon Fraser.
+
+ Add a function to return a CGColorSpaceRef for extended sRGB.
+
+ This is currently untestable, so no tests added.
+
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::extendedSRGBColorSpaceRef):
+
</ins><span class="cx"> 2016-10-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win][Direct2D] Create a RAII Helper Class for the Render Target
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (208019 => 208020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-10-28 00:21:31 UTC (rev 208019)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2016-10-28 00:50:53 UTC (rev 208020)
</span><span class="lines">@@ -93,6 +93,18 @@
</span><span class="cx"> #endif // PLATFORM(WIN)
</span><span class="cx"> return sRGBSpace;
</span><span class="cx"> }
</span><ins>+
+CGColorSpaceRef extendedSRGBColorSpaceRef()
+{
+ static CGColorSpaceRef extendedSRGBSpace;
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101200)
+ extendedSRGBSpace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB);
+#endif
+ // If there is no support for exteneded sRGB, fall back to sRGB.
+ if (!extendedSRGBSpace)
+ extendedSRGBSpace = sRGBColorSpaceRef();
+ return extendedSRGBSpace;
+}
</ins><span class="cx">
</span><span class="cx"> CGColorSpaceRef displayP3ColorSpaceRef()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h (208019 => 208020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h 2016-10-28 00:21:31 UTC (rev 208019)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.h 2016-10-28 00:50:53 UTC (rev 208020)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> CGColorSpaceRef deviceRGBColorSpaceRef();
</span><span class="cx"> WEBCORE_EXPORT CGColorSpaceRef sRGBColorSpaceRef();
</span><ins>+WEBCORE_EXPORT CGColorSpaceRef extendedSRGBColorSpaceRef();
</ins><span class="cx"> WEBCORE_EXPORT CGColorSpaceRef displayP3ColorSpaceRef();
</span><span class="cx"> CGColorSpaceRef linearRGBColorSpaceRef();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208019 => 208020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-28 00:21:31 UTC (rev 208019)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-28 00:50:53 UTC (rev 208020)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2016-10-27 Megan Gardner <megan_gardner@apple.com>
+
+ Add support for wide gamut for ShareableBitmap for image popovers
+ https://bugs.webkit.org/show_bug.cgi?id=164001
+
+ Reviewed by Simon Fraser.
+
+ Added suppport for wide gamut in ShareableBitmap. SharableBitmaps now know the size of their pixels,
+ and that data is passed back and forth between the processes. The callers of SharedBitmap will determine
+ if their image should support wide gamut, but ShareableBitmap will override a set flag on a device that
+ is incapbable of supporting a wide gamut image.
+ This makes it possible to show wide gamut images in image popovers on iOS.
+ This is currently untestable, so no tests added.
+
+ * Platform/IPC/Decoder.cpp:
+ (IPC::Decoder::decode):
+ * Platform/IPC/Decoder.h:
+ * Platform/IPC/Encoder.cpp:
+ (IPC::Encoder::encode):
+ * Platform/IPC/Encoder.h:
+ * Shared/ShareableBitmap.cpp:
+ (WebKit::bytesPerPixel):
+ (WebKit::ShareableBitmap::Handle::encode):
+ (WebKit::ShareableBitmap::Handle::decode):
+ (WebKit::ShareableBitmap::Handle::clear):
+ (WebKit::ShareableBitmap::create):
+ (WebKit::ShareableBitmap::createShareable):
+ (WebKit::ShareableBitmap::createHandle):
+ (WebKit::ShareableBitmap::ShareableBitmap):
+ * Shared/ShareableBitmap.h:
+ (WebKit::ShareableBitmap::numBytesForSize):
+ (WebKit::ShareableBitmap::sizeInBytes):
+ * Shared/cg/ShareableBitmapCG.cpp:
+ (WebKit::bitmapInfo):
+ (WebKit::ShareableBitmap::createGraphicsContext):
+ (WebKit::ShareableBitmap::createCGImage):
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation):
+
</ins><span class="cx"> 2016-10-27 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Support "insertFromDrop" and "deleteByDrag" for the InputEvent spec
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableBitmapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableBitmap.cpp (208019 => 208020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ShareableBitmap.cpp 2016-10-28 00:21:31 UTC (rev 208019)
+++ trunk/Source/WebKit2/Shared/ShareableBitmap.cpp 2016-10-28 00:50:53 UTC (rev 208020)
</span><span class="lines">@@ -33,6 +33,13 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><ins>+
+static unsigned calculateBytesPerPixel(ShareableBitmap::Flags flags)
+{
+ if (flags & ShareableBitmap::SupportsExtendedColor)
+ return 8; // for extended color, we are using half-float representations
+ return 4;
+}
</ins><span class="cx">
</span><span class="cx"> ShareableBitmap::Handle::Handle()
</span><span class="cx"> : m_flags(0)
</span><span class="lines">@@ -54,6 +61,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(handle.m_flags))
</span><span class="cx"> return false;
</span><ins>+ handle.m_bytesPerPixel = calculateBytesPerPixel(handle.m_flags);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -62,11 +70,13 @@
</span><span class="cx"> m_handle.clear();
</span><span class="cx"> m_size = IntSize();
</span><span class="cx"> m_flags = Flag::NoFlags;
</span><ins>+ m_bytesPerPixel = calculateBytesPerPixel(m_flags);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<ShareableBitmap> ShareableBitmap::create(const IntSize& size, Flags flags)
</span><span class="cx"> {
</span><del>- auto numBytes = numBytesForSize(size);
</del><ins>+ unsigned bytesPerPixel = calculateBytesPerPixel(flags);
+ auto numBytes = numBytesForSize(size, bytesPerPixel);
</ins><span class="cx"> if (numBytes.hasOverflowed())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -79,7 +89,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<ShareableBitmap> ShareableBitmap::createShareable(const IntSize& size, Flags flags)
</span><span class="cx"> {
</span><del>- auto numBytes = numBytesForSize(size);
</del><ins>+ unsigned bytesPerPixel = calculateBytesPerPixel(flags);
+ auto numBytes = numBytesForSize(size, bytesPerPixel);
</ins><span class="cx"> if (numBytes.hasOverflowed())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -94,7 +105,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(sharedMemory);
</span><span class="cx">
</span><del>- auto numBytes = numBytesForSize(size);
</del><ins>+ unsigned bytesPerPixel = calculateBytesPerPixel(flags);
+ auto numBytes = numBytesForSize(size, bytesPerPixel);
</ins><span class="cx"> if (numBytes.hasOverflowed())
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (sharedMemory->size() < numBytes.unsafeGet()) {
</span><span class="lines">@@ -101,7 +113,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return adoptRef(new ShareableBitmap(size, flags, sharedMemory));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -123,6 +135,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> handle.m_size = m_size;
</span><span class="cx"> handle.m_flags = m_flags;
</span><ins>+ handle.m_bytesPerPixel = m_bytesPerPixel;
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -131,6 +144,7 @@
</span><span class="cx"> , m_flags(flags)
</span><span class="cx"> , m_data(data)
</span><span class="cx"> {
</span><ins>+ m_bytesPerPixel = calculateBytesPerPixel(flags);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ShareableBitmap::ShareableBitmap(const IntSize& size, Flags flags, RefPtr<SharedMemory> sharedMemory)
</span><span class="lines">@@ -139,6 +153,7 @@
</span><span class="cx"> , m_sharedMemory(sharedMemory)
</span><span class="cx"> , m_data(0)
</span><span class="cx"> {
</span><ins>+ m_bytesPerPixel = calculateBytesPerPixel(flags);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ShareableBitmap::~ShareableBitmap()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableBitmaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableBitmap.h (208019 => 208020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ShareableBitmap.h 2016-10-28 00:21:31 UTC (rev 208019)
+++ trunk/Source/WebKit2/Shared/ShareableBitmap.h 2016-10-28 00:50:53 UTC (rev 208020)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> enum Flag {
</span><span class="cx"> NoFlags = 0,
</span><span class="cx"> SupportsAlpha = 1 << 0,
</span><ins>+ SupportsExtendedColor = 1 << 1,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned Flags;
</span><span class="cx">
</span><span class="lines">@@ -72,6 +73,7 @@
</span><span class="cx"> mutable SharedMemory::Handle m_handle;
</span><span class="cx"> WebCore::IntSize m_size;
</span><span class="cx"> Flags m_flags;
</span><ins>+ unsigned m_bytesPerPixel;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Create a shareable bitmap that uses malloced memory.
</span><span class="lines">@@ -126,8 +128,9 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> static Checked<unsigned, RecordOverflow> numBytesForSize(const WebCore::IntSize&);
</span><ins>+ static Checked<unsigned, RecordOverflow> numBytesForSize(const WebCore::IntSize& size, unsigned bytesPerPixel) { return numBytesForSize(size); }
</ins><span class="cx"> #else
</span><del>- static Checked<unsigned, RecordOverflow> numBytesForSize(const WebCore::IntSize& size) { return size.area<RecordOverflow>() * 4; }
</del><ins>+ static Checked<unsigned, RecordOverflow> numBytesForSize(const WebCore::IntSize& size, unsigned bytesPerPixel) { return size.area<RecordOverflow>() * bytesPerPixel; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="lines">@@ -141,10 +144,15 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void* data() const;
</span><ins>+#if USE(CAIRO)
</ins><span class="cx"> size_t sizeInBytes() const { return numBytesForSize(m_size).unsafeGet(); }
</span><del>-
</del><ins>+#else
+ size_t sizeInBytes() const { return numBytesForSize(m_size, m_bytesPerPixel).unsafeGet(); }
+#endif
+
</ins><span class="cx"> WebCore::IntSize m_size;
</span><span class="cx"> Flags m_flags;
</span><ins>+ unsigned m_bytesPerPixel;
</ins><span class="cx">
</span><span class="cx"> // If the shareable bitmap is backed by shared memory, this points to the shared memory object.
</span><span class="cx"> RefPtr<SharedMemory> m_sharedMemory;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcgShareableBitmapCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp (208019 => 208020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp 2016-10-28 00:21:31 UTC (rev 208019)
+++ trunk/Source/WebKit2/Shared/cg/ShareableBitmapCG.cpp 2016-10-28 00:50:53 UTC (rev 208020)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/BitmapImage.h>
</span><span class="cx"> #include <WebCore/GraphicsContextCG.h>
</span><ins>+#include <WebCore/PlatformScreen.h>
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include "CGUtilities.h"
</span><span class="cx">
</span><span class="lines">@@ -37,12 +38,24 @@
</span><span class="cx">
</span><span class="cx"> static CGBitmapInfo bitmapInfo(ShareableBitmap::Flags flags)
</span><span class="cx"> {
</span><del>- CGBitmapInfo info = kCGBitmapByteOrder32Host;
- if (flags & ShareableBitmap::SupportsAlpha)
- info |= kCGImageAlphaPremultipliedFirst;
- else
- info |= kCGImageAlphaNoneSkipFirst;
-
</del><ins>+ CGBitmapInfo info = 0;
+ if ((flags & ShareableBitmap::SupportsExtendedColor) && screenSupportsExtendedColor()) {
+ info |= kCGBitmapFloatComponents | kCGBitmapByteOrder16Host;
+
+ if (flags & ShareableBitmap::SupportsAlpha)
+ info |= kCGImageAlphaPremultipliedLast;
+ else
+ info |= kCGImageAlphaNoneSkipLast;
+
+ } else {
+ info |= kCGBitmapByteOrder32Host;
+
+ if (flags & ShareableBitmap::SupportsAlpha)
+ info |= kCGImageAlphaPremultipliedFirst;
+ else
+ info |= kCGImageAlphaNoneSkipFirst;
+ }
+
</ins><span class="cx"> return info;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -49,9 +62,16 @@
</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><del>- RetainPtr<CGContextRef> bitmapContext = adoptCF(CGBitmapContextCreateWithData(data(),
- m_size.width(), m_size.height(), 8, m_size.width() * 4, sRGBColorSpaceRef(),
- bitmapInfo(m_flags), releaseBitmapContextData, this));
</del><ins>+
+ CGColorSpaceRef colorSpace;
+ if (m_flags & ShareableBitmap::SupportsExtendedColor)
+ colorSpace = extendedSRGBColorSpaceRef();
+ else
+ colorSpace = sRGBColorSpaceRef();
+
+ 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));
+
+ ASSERT(bitmapContext.get());
</ins><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="cx"> CGContextTranslateCTM(bitmapContext.get(), 0, m_size.height());
</span><span class="lines">@@ -87,7 +107,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>-
</del><ins>+ // FIXME: Make this use extended color, etc.
</ins><span class="cx"> 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));
</span><span class="cx"> return image;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (208019 => 208020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-10-28 00:21:31 UTC (rev 208019)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-10-28 00:50:53 UTC (rev 208020)
</span><span class="lines">@@ -2357,7 +2357,10 @@
</span><span class="cx"> screenSizeInPixels.scale(corePage()->deviceScaleFactor());
</span><span class="cx"> FloatSize scaledSize = largestRectWithAspectRatioInsideRect(image->size().width() / image->size().height(), FloatRect(0, 0, screenSizeInPixels.width(), screenSizeInPixels.height())).size();
</span><span class="cx"> FloatSize bitmapSize = scaledSize.width() < image->size().width() ? scaledSize : image->size();
</span><del>- if (RefPtr<ShareableBitmap> sharedBitmap = ShareableBitmap::createShareable(IntSize(bitmapSize), ShareableBitmap::SupportsAlpha)) {
</del><ins>+ // FIXME: Only select ExtendedColor on images known to need wide gamut
+ ShareableBitmap::Flags flags = ShareableBitmap::SupportsAlpha;
+ flags |= screenSupportsExtendedColor() ? ShareableBitmap::SupportsExtendedColor : 0;
+ if (RefPtr<ShareableBitmap> sharedBitmap = ShareableBitmap::createShareable(IntSize(bitmapSize), flags)) {
</ins><span class="cx"> auto graphicsContext = sharedBitmap->createGraphicsContext();
</span><span class="cx"> graphicsContext->drawImage(*image, FloatRect(0, 0, bitmapSize.width(), bitmapSize.height()));
</span><span class="cx"> info.image = sharedBitmap;
</span></span></pre>
</div>
</div>
</body>
</html>