<!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>[193382] 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/193382">193382</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 15:44:52 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have layer memory use consult the backing store format
https://bugs.webkit.org/show_bug.cgi?id=151827
rdar://problem/23746497
Reviewed by Dean Jackson.
Source/WebCore:
When computing the backing store memory size, take the pixel format into account,
rather than assuming 4 bytes per pixel.
* platform/graphics/ca/GraphicsLayerCA.cpp:
* platform/graphics/ca/PlatformCALayer.h:
Source/WebKit2:
When computing the backing store memory size, take the pixel format into account,
rather than assuming 4 bytes per pixel.
* Shared/mac/RemoteLayerBackingStore.h:
* Shared/mac/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::bytesPerPixel):
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(WebKit::PlatformCALayerRemote::backingStoreBytesPerPixel):
* WebProcess/WebPage/mac/PlatformCALayerRemote.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaPlatformCALayerh">trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoreh">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm">trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh">trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193381 => 193382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-03 23:39:38 UTC (rev 193381)
+++ trunk/Source/WebCore/ChangeLog 2015-12-03 23:44:52 UTC (rev 193382)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-03 Simon Fraser <simon.fraser@apple.com>
+
+ Have layer memory use consult the backing store format
+ https://bugs.webkit.org/show_bug.cgi?id=151827
+ rdar://problem/23746497
+
+ Reviewed by Dean Jackson.
+
+ When computing the backing store memory size, take the pixel format into account,
+ rather than assuming 4 bytes per pixel.
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ * platform/graphics/ca/PlatformCALayer.h:
+
</ins><span class="cx"> 2015-12-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Objective-C GC support
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (193381 => 193382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-12-03 23:39:38 UTC (rev 193381)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2015-12-03 23:44:52 UTC (rev 193382)
</span><span class="lines">@@ -3775,7 +3775,7 @@
</span><span class="cx"> if (!m_layer->backingContributesToMemoryEstimate())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return 4.0 * size().width() * m_layer->contentsScale() * size().height() * m_layer->contentsScale();
</del><ins>+ return m_layer->backingStoreBytesPerPixel() * size().width() * m_layer->contentsScale() * size().height() * m_layer->contentsScale();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaPlatformCALayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h (193381 => 193382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2015-12-03 23:39:38 UTC (rev 193381)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h 2015-12-03 23:44:52 UTC (rev 193382)
</span><span class="lines">@@ -230,6 +230,8 @@
</span><span class="cx"> virtual void drawTextAtPoint(CGContextRef, CGFloat x, CGFloat y, CGSize scale, CGFloat fontSize, const char* text, size_t length) const;
</span><span class="cx">
</span><span class="cx"> static void flipContext(CGContextRef, CGFloat height);
</span><ins>+
+ virtual unsigned backingStoreBytesPerPixel() const { return 4; }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> virtual PlatformCALayer* rootLayer() const = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (193381 => 193382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-12-03 23:39:38 UTC (rev 193381)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-03 23:44:52 UTC (rev 193382)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-03 Simon Fraser <simon.fraser@apple.com>
+
+ Have layer memory use consult the backing store format
+ https://bugs.webkit.org/show_bug.cgi?id=151827
+ rdar://problem/23746497
+
+ Reviewed by Dean Jackson.
+
+ When computing the backing store memory size, take the pixel format into account,
+ rather than assuming 4 bytes per pixel.
+
+ * Shared/mac/RemoteLayerBackingStore.h:
+ * Shared/mac/RemoteLayerBackingStore.mm:
+ (WebKit::RemoteLayerBackingStore::bytesPerPixel):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (WebKit::PlatformCALayerRemote::backingStoreBytesPerPixel):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+
</ins><span class="cx"> 2015-12-03 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Expose WebCore's InvisibleAutoplayNotPermitted setting to WebKit & WebKit2
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h (193381 => 193382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h 2015-12-03 23:39:38 UTC (rev 193381)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h 2015-12-03 23:44:52 UTC (rev 193382)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> float scale() const { return m_scale; }
</span><span class="cx"> bool acceleratesDrawing() const { return m_acceleratesDrawing; }
</span><span class="cx"> bool isOpaque() const { return m_isOpaque; }
</span><ins>+ unsigned bytesPerPixel() const;
</ins><span class="cx">
</span><span class="cx"> PlatformCALayerRemote* layer() const { return m_layer; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (193381 => 193382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2015-12-03 23:39:38 UTC (rev 193381)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2015-12-03 23:44:52 UTC (rev 193382)
</span><span class="lines">@@ -187,6 +187,20 @@
</span><span class="cx"> return roundedIntSize(scaledSize);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+unsigned RemoteLayerBackingStore::bytesPerPixel() const
+{
+#if USE(IOSURFACE)
+ WebCore::IOSurface::Format format = bufferFormat(m_isOpaque);
+ switch (format) {
+ case IOSurface::Format::RGBA: return 4;
+ case IOSurface::Format::YUV422: return 2;
+ case IOSurface::Format::RGB10: return 4;
+ case IOSurface::Format::RGB10A8: return 5;
+ }
+#endif
+ return 4;
+}
+
</ins><span class="cx"> void RemoteLayerBackingStore::swapToValidFrontBuffer()
</span><span class="cx"> {
</span><span class="cx"> IntSize expandedScaledSize = backingStoreSize();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (193381 => 193382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2015-12-03 23:39:38 UTC (rev 193381)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2015-12-03 23:44:52 UTC (rev 193382)
</span><span class="lines">@@ -782,6 +782,14 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+unsigned PlatformCALayerRemote::backingStoreBytesPerPixel() const
+{
+ if (!m_properties.backingStore)
+ return 4;
+
+ return m_properties.backingStore->bytesPerPixel();
+}
+
</ins><span class="cx"> LayerPool& PlatformCALayerRemote::layerPool()
</span><span class="cx"> {
</span><span class="cx"> return m_context->layerPool();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (193381 => 193382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2015-12-03 23:39:38 UTC (rev 193381)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2015-12-03 23:44:52 UTC (rev 193382)
</span><span class="lines">@@ -172,6 +172,8 @@
</span><span class="cx">
</span><span class="cx"> virtual uint32_t hostingContextID();
</span><span class="cx">
</span><ins>+ virtual unsigned backingStoreBytesPerPixel() const override;
+
</ins><span class="cx"> void setClonedLayer(const PlatformCALayer*);
</span><span class="cx">
</span><span class="cx"> RemoteLayerTreeTransaction::LayerProperties& properties() { return m_properties; }
</span></span></pre>
</div>
</div>
</body>
</html>