<!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>[195370] 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/195370">195370</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-20 12:59:53 -0800 (Wed, 20 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/195082">r195082</a>. rdar://problem/23633319</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="#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 (195369 => 195370)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-20 20:59:44 UTC (rev 195369)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-20 20:59:53 UTC (rev 195370)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r195082. rdar://problem/23633319
+
+ 2016-01-14 Simon Fraser <simon.fraser@apple.com>
+
+ Remove workaround for rdar://problem/23623670
+ https://bugs.webkit.org/show_bug.cgi?id=153107
+ rdar://problem/23633319
+
+ Reviewed by Tim Horton.
+
+ Remove the code that uses IOSurfaceAcceleratorTransformSurface() when copying from
+ back-to-front buffer, now that CGIOSurfaceContextCreate()-code path works correctly.
+
+ * platform/graphics/cocoa/IOSurface.h:
+ * platform/graphics/cocoa/IOSurface.mm:
+ (IOSurface::ensurePlatformContext):
+ (IOSurface::copyToSurface): Deleted.
+
+2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r188377. rdar://problem/24208161
</span><span class="cx">
</span><span class="cx"> 2015-08-12 Myles C. Maxfield <mmaxfield@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 (195369 => 195370)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2016-01-20 20:59:44 UTC (rev 195369)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2016-01-20 20:59:53 UTC (rev 195370)
</span><span class="lines">@@ -91,7 +91,6 @@
</span><span class="cx"> WEBCORE_EXPORT void releaseGraphicsContext();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- WEBCORE_EXPORT void copyToSurface(IOSurface&);
</del><span class="cx"> WEBCORE_EXPORT static bool allowConversionFromFormatToFormat(Format, Format);
</span><span class="cx"> WEBCORE_EXPORT static void convertToFormat(std::unique_ptr<WebCore::IOSurface>&& inSurface, Format, std::function<void(std::unique_ptr<WebCore::IOSurface>)>);
</span><span class="cx"> #endif
</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 (195369 => 195370)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-01-20 20:59:44 UTC (rev 195369)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2016-01-20 20:59:53 UTC (rev 195370)
</span><span class="lines">@@ -269,13 +269,12 @@
</span><span class="cx"> case Format::RGBA:
</span><span class="cx"> break;
</span><span class="cx"> case Format::RGB10:
</span><del>- bitsPerComponent = 10;
- bitsPerPixel = 32;
- break;
</del><span class="cx"> case Format::RGB10A8:
</span><del>- // FIXME: This doesn't take the two-plane format into account.
- bitsPerComponent = 10;
- bitsPerPixel = 32;
</del><ins>+ // A half-float format will be used if CG needs to read back the IOSurface contents,
+ // but for an IOSurface-to-IOSurface copy, there shoud be no conversion.
+ bitsPerComponent = 16;
+ bitsPerPixel = 64;
+ bitmapInfo = kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder16Host | kCGBitmapFloatComponents;
</ins><span class="cx"> break;
</span><span class="cx"> case Format::YUV422:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -357,27 +356,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-WEBCORE_EXPORT void IOSurface::copyToSurface(IOSurface& destSurface)
-{
- if (destSurface.format() != format()) {
- WTFLogAlways("Trying to copy IOSurface to another surface with a different format");
- return;
- }
-
- if (destSurface.size() != size()) {
- WTFLogAlways("Trying to copy IOSurface to another surface with a different size");
- return;
- }
-
- static IOSurfaceAcceleratorRef accelerator;
- if (!accelerator)
- IOSurfaceAcceleratorCreate(nullptr, nullptr, &accelerator);
-
- IOReturn ret = IOSurfaceAcceleratorTransformSurface(accelerator, m_surface.get(), destSurface.surface(), nullptr, nullptr, nullptr, nullptr, nullptr);
- if (ret)
- WTFLogAlways("IOSurfaceAcceleratorTransformSurface %p to %p failed with error %d", m_surface.get(), destSurface.surface(), ret);
-}
-
</del><span class="cx"> bool IOSurface::allowConversionFromFormatToFormat(Format sourceFormat, Format destFormat)
</span><span class="cx"> {
</span><span class="cx"> if ((sourceFormat == Format::RGB10 || sourceFormat == Format::RGB10A8) && destFormat == Format::YUV422)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (195369 => 195370)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-20 20:59:44 UTC (rev 195369)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2016-01-20 20:59:53 UTC (rev 195370)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r195082. rdar://problem/23633319
+
+ 2016-01-14 Simon Fraser <simon.fraser@apple.com>
+
+ Remove workaround for rdar://problem/23623670
+ https://bugs.webkit.org/show_bug.cgi?id=153107
+ rdar://problem/23633319
+
+ Reviewed by Tim Horton.
+
+ Remove the code that uses IOSurfaceAcceleratorTransformSurface() when copying from
+ back-to-front buffer, now that CGIOSurfaceContextCreate()-code path works correctly.
+
+ * Shared/mac/RemoteLayerBackingStore.mm:
+ (WebKit::RemoteLayerBackingStore::display):
+
</ins><span class="cx"> 2016-01-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r194750. rdar://problem/24074335
</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 (195369 => 195370)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2016-01-20 20:59:44 UTC (rev 195369)
+++ branches/safari-601.1.46-branch/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2016-01-20 20:59:53 UTC (rev 195370)
</span><span class="lines">@@ -265,15 +265,8 @@
</span><span class="cx"> #if USE(IOSURFACE)
</span><span class="cx"> if (m_acceleratesDrawing) {
</span><span class="cx"> RetainPtr<CGImageRef> backImage;
</span><del>- if (m_backBuffer.surface && !willPaintEntireBackingStore) {
-#if PLATFORM(IOS)
- if (m_backBuffer.surface->format() == WebCore::IOSurface::Format::RGB10A8) {
- // FIXME: remove this when rdar://problem/23623670 is fixed.
- m_backBuffer.surface->copyToSurface(*m_frontBuffer.surface);
- } else
-#endif
- backImage = m_backBuffer.surface->createImage();
- }
</del><ins>+ if (m_backBuffer.surface && !willPaintEntireBackingStore)
+ backImage = m_backBuffer.surface->createImage();
</ins><span class="cx">
</span><span class="cx"> GraphicsContext& context = m_frontBuffer.surface->ensureGraphicsContext();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>