<!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>[192866] branches/safari-601.1.46-branch/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/192866">192866</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-12-01 00:16:51 -0800 (Tue, 01 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/190587">r190587</a>. rdar://problem/23694043</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>
</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 (192865 => 192866)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-01 08:15:45 UTC (rev 192865)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-01 08:16:51 UTC (rev 192866)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-12-01 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190587.
+
+ 2015-10-05 Beth Dakin <bdakin@apple.com>
+
+ WebCore::IOSurface should ask the IOSurface for the pixel format instead of
+ caching it
+ https://bugs.webkit.org/show_bug.cgi?id=149820
+ -and corresponding-
+ rdar://problem/22976230
+
+ Reviewed by Tim Horton.
+
+ Also there is no reason to make YUV be iOS only, so this patch removes those
+ PLATFORM checks.
+
+ * platform/graphics/cocoa/IOSurface.h:
+ * platform/graphics/cocoa/IOSurface.mm:
+ (IOSurface::IOSurface):
+ (IOSurface::format):
+ * platform/spi/cocoa/IOSurfaceSPI.h:
+
+2015-12-01 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r190576.
</span><span class="cx">
</span><span class="cx"> 2015-10-05 Beth Dakin <bdakin@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 (192865 => 192866)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2015-12-01 08:15:45 UTC (rev 192865)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.h 2015-12-01 08:16:51 UTC (rev 192866)
</span><span class="lines">@@ -40,11 +40,9 @@
</span><span class="cx"> public:
</span><span class="cx"> enum class Format {
</span><span class="cx"> RGBA,
</span><del>-#if PLATFORM(IOS)
</del><span class="cx"> YUV422,
</span><span class="cx"> RGB10,
</span><span class="cx"> RGB10A8,
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static std::unique_ptr<IOSurface> create(IntSize, ColorSpace, Format = Format::RGBA);
</span><span class="lines">@@ -82,7 +80,7 @@
</span><span class="cx"> IntSize size() const { return m_size; }
</span><span class="cx"> size_t totalBytes() const { return m_totalBytes; }
</span><span class="cx"> ColorSpace colorSpace() const { return m_colorSpace; }
</span><del>- Format format() const { return m_format; }
</del><ins>+ Format format() const;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool isInUse() const;
</span><span class="cx">
</span><span class="lines">@@ -104,7 +102,6 @@
</span><span class="cx"> void setContextSize(IntSize);
</span><span class="cx">
</span><span class="cx"> ColorSpace m_colorSpace;
</span><del>- Format m_format;
</del><span class="cx"> IntSize m_size;
</span><span class="cx"> IntSize m_contextSize;
</span><span class="cx"> size_t m_totalBytes;
</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 (192865 => 192866)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2015-12-01 08:15:45 UTC (rev 192865)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/cocoa/IOSurface.mm 2015-12-01 08:16:51 UTC (rev 192866)
</span><span class="lines">@@ -98,11 +98,9 @@
</span><span class="cx">
</span><span class="cx"> IOSurface::IOSurface(IntSize size, ColorSpace colorSpace, Format format)
</span><span class="cx"> : m_colorSpace(colorSpace)
</span><del>- , m_format(format)
</del><span class="cx"> , m_size(size)
</span><span class="cx"> , m_contextSize(size)
</span><span class="cx"> {
</span><del>-
</del><span class="cx"> unsigned pixelFormat;
</span><span class="cx"> unsigned bytesPerPixel;
</span><span class="cx"> unsigned bytesPerElement;
</span><span class="lines">@@ -223,7 +221,6 @@
</span><span class="cx">
</span><span class="cx"> IOSurface::IOSurface(IOSurfaceRef surface, ColorSpace colorSpace)
</span><span class="cx"> : m_colorSpace(colorSpace)
</span><del>- , m_format(Format::RGBA)
</del><span class="cx"> , m_surface(surface)
</span><span class="cx"> {
</span><span class="cx"> m_size = IntSize(IOSurfaceGetWidth(surface), IOSurfaceGetHeight(surface));
</span><span class="lines">@@ -308,6 +305,18 @@
</span><span class="cx"> return IOSurface::SurfaceState::Valid;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+IOSurface::Format IOSurface::format() const
+{
+ unsigned pixelFormat = IOSurfaceGetPixelFormat(m_surface.get());
+ if (pixelFormat == 'BGRA')
+ return Format::RGBA;
+ if (pixelFormat == 'yuvf')
+ return Format::YUV422;
+
+ ASSERT_NOT_REACHED();
+ return Format::RGBA;
+}
+
</ins><span class="cx"> bool IOSurface::isInUse() const
</span><span class="cx"> {
</span><span class="cx"> return IOSurfaceIsInUse(m_surface.get());
</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 (192865 => 192866)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2015-12-01 08:15:45 UTC (rev 192865)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/spi/cocoa/IOSurfaceSPI.h 2015-12-01 08:16:51 UTC (rev 192866)
</span><span class="lines">@@ -72,6 +72,7 @@
</span><span class="cx"> size_t IOSurfaceGetHeight(IOSurfaceRef buffer);
</span><span class="cx"> size_t IOSurfaceGetPropertyMaximum(CFStringRef property);
</span><span class="cx"> size_t IOSurfaceGetWidth(IOSurfaceRef buffer);
</span><ins>+OSType IOSurfaceGetPixelFormat(IOSurfaceRef buffer);
</ins><span class="cx"> Boolean IOSurfaceIsInUse(IOSurfaceRef buffer);
</span><span class="cx"> IOReturn IOSurfaceLock(IOSurfaceRef buffer, uint32_t options, uint32_t *seed);
</span><span class="cx"> IOSurfaceRef IOSurfaceLookupFromMachPort(mach_port_t);
</span></span></pre>
</div>
</div>
</body>
</html>