<!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>[192648] 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/192648">192648</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-11-19 12:01:16 -0800 (Thu, 19 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/192284">r192284</a>. rdar://problem/22846841</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscocoaIOSurfaceh">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicscocoaIOSurfacemm">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformspicocoaIOSurfaceSPIh">branches/safari-601.1.46-branch/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2SharedmacRemoteLayerBackingStoremm">branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.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 (192647 => 192648)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-11-19 19:59:41 UTC (rev 192647)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-11-19 20:01:16 UTC (rev 192648)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-11-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192284.
+
+ 2015-11-10 Simon Fraser <simon.fraser@apple.com>
+
+ Use different pixel formats for displays that support them
+ https://bugs.webkit.org/show_bug.cgi?id=151122
+ rdar://problem/22846841
+
+ Reviewed by Tim Horton.
+
+ Add new IOSurface format enum values, and set up the appropriate IOSurfaceCreate()
+ property dictionaries for them.
+
+ * platform/graphics/cocoa/IOSurface.h:
+ * platform/graphics/cocoa/IOSurface.mm:
+ (IOSurface::IOSurface):
+ * platform/spi/cocoa/IOSurfaceSPI.h:
+
+2015-11-19 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r192138.
</span><span class="cx">
</span><span class="cx"> 2015-11-07 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscocoaIOSurfaceh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.h (192647 => 192648)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2015-11-19 19:59:41 UTC (rev 192647)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2015-11-19 20:01:16 UTC (rev 192648)
</span><span class="lines">@@ -41,7 +41,9 @@
</span><span class="cx"> enum class Format {
</span><span class="cx"> RGBA,
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- YUV422
</del><ins>+ YUV422,
+ RGB10,
+ RGB10A8,
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicscocoaIOSurfacemm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (192647 => 192648)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2015-11-19 19:59:41 UTC (rev 192647)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2015-11-19 20:01:16 UTC (rev 192648)
</span><span class="lines">@@ -102,44 +102,115 @@
</span><span class="cx"> , m_size(size)
</span><span class="cx"> , m_contextSize(size)
</span><span class="cx"> {
</span><del>- unsigned pixelFormat = 'BGRA';
- unsigned bytesPerPixel = 4;
- unsigned bytesPerElement = 4;
- unsigned elementWidth = 1;
</del><span class="cx">
</span><del>-#if PLATFORM(IOS)
- if (format == Format::YUV422) {
- pixelFormat = 'yuvf';
- bytesPerPixel = 2;
- elementWidth = 2;
- bytesPerElement = 4;
- }
-#endif
</del><ins>+ unsigned pixelFormat;
+ unsigned bytesPerPixel;
+ unsigned bytesPerElement;
</ins><span class="cx">
</span><span class="cx"> int width = size.width();
</span><span class="cx"> int height = size.height();
</span><span class="cx">
</span><del>- size_t bytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, width * bytesPerPixel);
- ASSERT(bytesPerRow);
</del><ins>+ NSDictionary *options;
+
+ if (format == Format::RGB10A8) {
+ pixelFormat = 'b3a8';
+
+ // RGB plane (10-10-10)
+ bytesPerPixel = 4;
+ bytesPerElement = 4;
</ins><span class="cx">
</span><del>- m_totalBytes = IOSurfaceAlignProperty(kIOSurfaceAllocSize, height * bytesPerRow);
- ASSERT(m_totalBytes);
</del><ins>+ size_t rgbPlaneBytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, width * bytesPerElement);
+ size_t rgbPlaneTotalBytes = IOSurfaceAlignProperty(kIOSurfaceAllocSize, height * rgbPlaneBytesPerRow);
</ins><span class="cx">
</span><del>- NSDictionary *options = @{
- (id)kIOSurfaceWidth: @(width),
- (id)kIOSurfaceHeight: @(height),
- (id)kIOSurfacePixelFormat: @(pixelFormat),
- (id)kIOSurfaceBytesPerElement: @(bytesPerElement),
- (id)kIOSurfaceBytesPerRow: @(bytesPerRow),
- (id)kIOSurfaceAllocSize: @(m_totalBytes),
</del><ins>+ // Alpha plane (8)
+ bytesPerElement = 1;
+ size_t alphaPlaneBytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, width * bytesPerElement);
+ size_t alphaPlaneTotalBytes = IOSurfaceAlignProperty(kIOSurfaceAllocSize, height * alphaPlaneBytesPerRow);
+
+ m_totalBytes = rgbPlaneTotalBytes + alphaPlaneTotalBytes;
+
+ NSArray *planeInfo = @[
+ @{
+ (id)kIOSurfacePlaneWidth: @(width),
+ (id)kIOSurfacePlaneHeight: @(height),
+ (id)kIOSurfacePlaneBytesPerRow: @(rgbPlaneBytesPerRow),
+ (id)kIOSurfacePlaneOffset: @(0),
+ (id)kIOSurfacePlaneSize: @(rgbPlaneTotalBytes)
+ },
+ @{
+ (id)kIOSurfacePlaneWidth: @(width),
+ (id)kIOSurfacePlaneHeight: @(height),
+ (id)kIOSurfacePlaneBytesPerRow: @(alphaPlaneBytesPerRow),
+ (id)kIOSurfacePlaneOffset: @(rgbPlaneTotalBytes),
+ (id)kIOSurfacePlaneSize: @(alphaPlaneTotalBytes)
+ }
+ ];
+
+ options = @{
+ (id)kIOSurfaceWidth: @(width),
+ (id)kIOSurfaceHeight: @(height),
+ (id)kIOSurfacePixelFormat: @(pixelFormat),
+ (id)kIOSurfaceAllocSize: @(m_totalBytes),
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>- (id)kIOSurfaceCacheMode: @(kIOMapWriteCombineCache),
</del><ins>+ (id)kIOSurfaceCacheMode: @(kIOMapWriteCombineCache),
</ins><span class="cx"> #endif
</span><del>- (id)kIOSurfaceElementWidth: @(elementWidth),
- (id)kIOSurfaceElementHeight: @(1)
- };
</del><ins>+ (id)kIOSurfacePlaneInfo: planeInfo,
+ };
+ } else {
+ unsigned elementWidth;
</ins><span class="cx">
</span><ins>+ switch (format) {
+ case Format::RGBA:
+ pixelFormat = 'BGRA';
+ bytesPerPixel = 4;
+ bytesPerElement = 4;
+ elementWidth = 1;
+ break;
+ case Format::YUV422:
+ pixelFormat = 'yuvf';
+ bytesPerPixel = 2;
+ bytesPerElement = 4;
+ elementWidth = 2;
+ break;
+ case Format::RGB10:
+ pixelFormat = 'w30r';
+ bytesPerPixel = 4;
+ bytesPerElement = 4;
+ elementWidth = 1;
+ break;
+ case Format::RGB10A8:
+ ASSERT_NOT_REACHED();
+ pixelFormat = 'b3a8';
+ bytesPerPixel = 1;
+ bytesPerElement = 1;
+ elementWidth = 1;
+ break;
+ }
+
+ size_t bytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, width * bytesPerPixel);
+ ASSERT(bytesPerRow);
+
+ m_totalBytes = IOSurfaceAlignProperty(kIOSurfaceAllocSize, height * bytesPerRow);
+ ASSERT(m_totalBytes);
+
+ options = @{
+ (id)kIOSurfaceWidth: @(width),
+ (id)kIOSurfaceHeight: @(height),
+ (id)kIOSurfacePixelFormat: @(pixelFormat),
+ (id)kIOSurfaceBytesPerElement: @(bytesPerElement),
+ (id)kIOSurfaceBytesPerRow: @(bytesPerRow),
+ (id)kIOSurfaceAllocSize: @(m_totalBytes),
+#if PLATFORM(IOS)
+ (id)kIOSurfaceCacheMode: @(kIOMapWriteCombineCache),
+#endif
+ (id)kIOSurfaceElementWidth: @(elementWidth),
+ (id)kIOSurfaceElementHeight: @(1)
+ };
+ }
+
</ins><span class="cx"> m_surface = adoptCF(IOSurfaceCreate((CFDictionaryRef)options));
</span><ins>+ if (!m_surface)
+ NSLog(@"Surface creation failed for options %@", options);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IOSurface::IOSurface(IntSize size, IntSize contextSize, ColorSpace colorSpace)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformspicocoaIOSurfaceSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h (192647 => 192648)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2015-11-19 19:59:41 UTC (rev 192647)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2015-11-19 20:01:16 UTC (rev 192648)
</span><span class="lines">@@ -56,6 +56,12 @@
</span><span class="cx"> extern const CFStringRef kIOSurfaceHeight;
</span><span class="cx"> extern const CFStringRef kIOSurfacePixelFormat;
</span><span class="cx"> extern const CFStringRef kIOSurfaceWidth;
</span><ins>+extern const CFStringRef kIOSurfacePlaneWidth;
+extern const CFStringRef kIOSurfacePlaneHeight;
+extern const CFStringRef kIOSurfacePlaneBytesPerRow;
+extern const CFStringRef kIOSurfacePlaneOffset;
+extern const CFStringRef kIOSurfacePlaneSize;
+extern const CFStringRef kIOSurfacePlaneInfo;
</ins><span class="cx">
</span><span class="cx"> size_t IOSurfaceAlignProperty(CFStringRef property, size_t value);
</span><span class="cx"> IOSurfaceRef IOSurfaceCreate(CFDictionaryRef properties);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (192647 => 192648)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-11-19 19:59:41 UTC (rev 192647)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-11-19 20:01:16 UTC (rev 192648)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-11-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192284.
+
+ 2015-11-10 Simon Fraser <simon.fraser@apple.com>
+
+ Use different pixel formats for displays that support them
+ https://bugs.webkit.org/show_bug.cgi?id=151122
+ rdar://problem/22846841
+
+ Reviewed by Tim Horton.
+
+ New the new IOSurface formats when appropriate for the properties of the
+ display.
+
+ * Shared/mac/RemoteLayerBackingStore.mm:
+ (WebKit::bufferFormat):
+ (WebKit::RemoteLayerBackingStore::swapToValidFrontBuffer):
+
+2015-11-19 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r192138.
</span><span class="cx">
</span><span class="cx"> 2015-11-07 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2SharedmacRemoteLayerBackingStoremm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (192647 => 192648)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2015-11-19 19:59:41 UTC (rev 192647)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2015-11-19 20:01:16 UTC (rev 192648)
</span><span class="lines">@@ -45,6 +45,23 @@
</span><span class="cx"> #import <mach/mach_port.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if __has_include(<WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>)
+#import <WebKitAdditions/RemoteLayerBackingStoreAdditions.mm>
+#else
+
+namespace WebKit {
+
+#if USE(IOSURFACE)
+static WebCore::IOSurface::Format bufferFormat(bool)
+{
+ return WebCore::IOSurface::Format::RGBA;
+}
+#endif // USE(IOSURFACE)
+
+} // namespace WebKit
+
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -186,10 +203,9 @@
</span><span class="cx"> std::swap(m_frontBuffer, m_backBuffer);
</span><span class="cx">
</span><span class="cx"> if (!m_frontBuffer.surface)
</span><del>- m_frontBuffer.surface = IOSurface::create(expandedScaledSize, ColorSpaceSRGB);
</del><ins>+ m_frontBuffer.surface = IOSurface::create(expandedScaledSize, ColorSpaceSRGB, bufferFormat(m_isOpaque));
</ins><span class="cx">
</span><span class="cx"> setBufferVolatility(BufferType::Front, false);
</span><del>-
</del><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>