<!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>[201478] trunk/Source/WebCore</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/201478">201478</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-05-27 18:22:50 -0700 (Fri, 27 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/190574">r190574</a>): Swipe snapshots are always black on iPhone 5
https://bugs.webkit.org/show_bug.cgi?id=158171
<rdar://problem/24639709>
Reviewed by Beth Dakin.
* platform/graphics/cocoa/IOSurface.mm:
(optionsForBiplanarSurface):
(optionsFor32BitSurface):
(IOSurface::IOSurface):
(IOSurface::format):
We are supposed to be using bi-planar 422f, not yuvf. They're the same
size, but different formats, and 422f is supported in more places.
Clean up the IOSurface constructor so we don't have a switch inside an if
with random ASSERT_NOT_REACHED, making helper functions to build the
options dictionary for arbitrary-size biplanar and 32-bit single-planar
surfaces.
I don't know how to write a test because IOSurface is not supported
in the simulator.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm">trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201477 => 201478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-28 00:44:13 UTC (rev 201477)
+++ trunk/Source/WebCore/ChangeLog 2016-05-28 01:22:50 UTC (rev 201478)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-05-27 Tim Horton <timothy_horton@apple.com>
+
+ REGRESSION (r190574): Swipe snapshots are always black on iPhone 5
+ https://bugs.webkit.org/show_bug.cgi?id=158171
+ <rdar://problem/24639709>
+
+ Reviewed by Beth Dakin.
+
+ * platform/graphics/cocoa/IOSurface.mm:
+ (optionsForBiplanarSurface):
+ (optionsFor32BitSurface):
+ (IOSurface::IOSurface):
+ (IOSurface::format):
+ We are supposed to be using bi-planar 422f, not yuvf. They're the same
+ size, but different formats, and 422f is supported in more places.
+
+ Clean up the IOSurface constructor so we don't have a switch inside an if
+ with random ASSERT_NOT_REACHED, making helper functions to build the
+ options dictionary for arbitrary-size biplanar and 32-bit single-planar
+ surfaces.
+
+ I don't know how to write a test because IOSurface is not supported
+ in the simulator.
+
</ins><span class="cx"> 2016-05-27 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> EventHandler finds incorrect scrollable container.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaIOSurfacemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm (201477 => 201478)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-05-28 00:44:13 UTC (rev 201477)
+++ trunk/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-05-28 01:22:50 UTC (rev 201478)
</span><span class="lines">@@ -107,117 +107,102 @@
</span><span class="cx"> return WTFMove(imageBuffer->m_data.surface);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IOSurface::IOSurface(IntSize size, ColorSpace colorSpace, Format format)
- : m_colorSpace(colorSpace)
- , m_size(size)
- , m_contextSize(size)
</del><ins>+static NSDictionary *optionsForBiplanarSurface(IntSize size, unsigned pixelFormat, size_t firstPlaneBytesPerPixel, size_t secondPlaneBytesPerPixel)
</ins><span class="cx"> {
</span><del>- unsigned pixelFormat;
- unsigned bytesPerPixel;
- unsigned bytesPerElement;
-
</del><span class="cx"> int width = size.width();
</span><span class="cx"> int height = size.height();
</span><span class="cx">
</span><del>- NSDictionary *options;
</del><ins>+ size_t firstPlaneBytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, width * firstPlaneBytesPerPixel);
+ size_t firstPlaneTotalBytes = IOSurfaceAlignProperty(kIOSurfaceAllocSize, height * firstPlaneBytesPerRow);
+
+ size_t secondPlaneBytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, width * secondPlaneBytesPerPixel);
+ size_t secondPlaneTotalBytes = IOSurfaceAlignProperty(kIOSurfaceAllocSize, height * secondPlaneBytesPerRow);
</ins><span class="cx">
</span><del>- if (format == Format::RGB10A8) {
- pixelFormat = 'b3a8';
-
- // RGB plane (10-10-10)
- bytesPerPixel = 4;
- bytesPerElement = 4;
</del><ins>+ size_t totalBytes = firstPlaneTotalBytes + secondPlaneTotalBytes;
+ ASSERT(totalBytes);
</ins><span class="cx">
</span><del>- size_t rgbPlaneBytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, width * bytesPerElement);
- size_t rgbPlaneTotalBytes = IOSurfaceAlignProperty(kIOSurfaceAllocSize, height * rgbPlaneBytesPerRow);
</del><ins>+ NSArray *planeInfo = @[
+ @{
+ (id)kIOSurfacePlaneWidth: @(width),
+ (id)kIOSurfacePlaneHeight: @(height),
+ (id)kIOSurfacePlaneBytesPerRow: @(firstPlaneBytesPerRow),
+ (id)kIOSurfacePlaneOffset: @(0),
+ (id)kIOSurfacePlaneSize: @(firstPlaneTotalBytes)
+ },
+ @{
+ (id)kIOSurfacePlaneWidth: @(width),
+ (id)kIOSurfacePlaneHeight: @(height),
+ (id)kIOSurfacePlaneBytesPerRow: @(secondPlaneBytesPerRow),
+ (id)kIOSurfacePlaneOffset: @(firstPlaneTotalBytes),
+ (id)kIOSurfacePlaneSize: @(secondPlaneTotalBytes)
+ }
+ ];
</ins><span class="cx">
</span><del>- // 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),
</del><ins>+ return @{
+ (id)kIOSurfaceWidth: @(width),
+ (id)kIOSurfaceHeight: @(height),
+ (id)kIOSurfacePixelFormat: @(pixelFormat),
+ (id)kIOSurfaceAllocSize: @(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)kIOSurfacePlaneInfo: planeInfo,
- };
- } else {
- unsigned elementWidth;
</del><ins>+ (id)kIOSurfacePlaneInfo: planeInfo,
+ };
+}
</ins><span class="cx">
</span><del>- 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;
- }
</del><ins>+static NSDictionary *optionsFor32BitSurface(IntSize size, unsigned pixelFormat)
+{
+ int width = size.width();
+ int height = size.height();
</ins><span class="cx">
</span><del>- size_t bytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, width * bytesPerPixel);
- ASSERT(bytesPerRow);
</del><ins>+ unsigned bytesPerElement = 4;
+ unsigned bytesPerPixel = 4;
</ins><span class="cx">
</span><del>- m_totalBytes = IOSurfaceAlignProperty(kIOSurfaceAllocSize, height * bytesPerRow);
- ASSERT(m_totalBytes);
</del><ins>+ size_t bytesPerRow = IOSurfaceAlignProperty(kIOSurfaceBytesPerRow, width * bytesPerPixel);
+ ASSERT(bytesPerRow);
</ins><span class="cx">
</span><del>- options = @{
- (id)kIOSurfaceWidth: @(width),
- (id)kIOSurfaceHeight: @(height),
- (id)kIOSurfacePixelFormat: @(pixelFormat),
- (id)kIOSurfaceBytesPerElement: @(bytesPerElement),
- (id)kIOSurfaceBytesPerRow: @(bytesPerRow),
- (id)kIOSurfaceAllocSize: @(m_totalBytes),
</del><ins>+ size_t totalBytes = IOSurfaceAlignProperty(kIOSurfaceAllocSize, height * bytesPerRow);
+ ASSERT(totalBytes);
+
+ return @{
+ (id)kIOSurfaceWidth: @(width),
+ (id)kIOSurfaceHeight: @(height),
+ (id)kIOSurfacePixelFormat: @(pixelFormat),
+ (id)kIOSurfaceBytesPerElement: @(bytesPerElement),
+ (id)kIOSurfaceBytesPerRow: @(bytesPerRow),
+ (id)kIOSurfaceAllocSize: @(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)kIOSurfaceElementHeight: @(1)
+ };
+
+}
+
+IOSurface::IOSurface(IntSize size, ColorSpace colorSpace, Format format)
+ : m_colorSpace(colorSpace)
+ , m_size(size)
+ , m_contextSize(size)
+{
+ NSDictionary *options;
+
+ switch (format) {
+ case Format::RGBA:
+ options = optionsFor32BitSurface(size, 'BGRA');
+ break;
+ case Format::RGB10:
+ options = optionsFor32BitSurface(size, 'w30r');
+ break;
+ case Format::RGB10A8:
+ options = optionsForBiplanarSurface(size, 'b3a8', 4, 1);
+ break;
+ case Format::YUV422:
+ options = optionsForBiplanarSurface(size, '422f', 1, 1);
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_surface = adoptCF(IOSurfaceCreate((CFDictionaryRef)options));
</span><ins>+ m_totalBytes = IOSurfaceGetAllocSize(m_surface.get());
</ins><span class="cx"> if (!m_surface)
</span><span class="cx"> NSLog(@"Surface creation failed for options %@", options);
</span><span class="cx"> }
</span><span class="lines">@@ -368,7 +353,7 @@
</span><span class="cx"> if (pixelFormat == 'b3a8')
</span><span class="cx"> return Format::RGB10A8;
</span><span class="cx">
</span><del>- if (pixelFormat == 'yuvf')
</del><ins>+ if (pixelFormat == '422f')
</ins><span class="cx"> return Format::YUV422;
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre>
</div>
</div>
</body>
</html>