<!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>[164406] trunk/Source/WebKit2</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/164406">164406</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-02-19 18:03:40 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid sending redundant layer properties to the UI process, and avoid allocation of RemoteLayerBackingStore unless we need it
https://bugs.webkit.org/show_bug.cgi?id=129076
Reviewed by Tim Horton.
Normally we rely on GraphicsLayerCA to avoid redundant property
setting on PlatformCALayers, but for contents layers GraphicsLayerCA
sets properties on every update.
Make PlatformCALayerRemote more efficient in this case by not
setting dirty flags for unchanged property sets.
Also avoid creation of RemoteLayerBackingStore unless we
actually need one.
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(PlatformCALayerRemote::ensureBackingStore):
(PlatformCALayerRemote::updateBackingStore):
(PlatformCALayerRemote::setBounds):
(PlatformCALayerRemote::setPosition):
(PlatformCALayerRemote::setAnchorPoint):
(PlatformCALayerRemote::setMasksToBounds):
(PlatformCALayerRemote::setAcceleratesDrawing):
(PlatformCALayerRemote::setBorderWidth):
(PlatformCALayerRemote::setBorderColor):
(PlatformCALayerRemote::setContentsScale):
* WebProcess/WebPage/mac/PlatformCALayerRemote.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164405 => 164406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-20 02:03:37 UTC (rev 164405)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-20 02:03:40 UTC (rev 164406)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2014-02-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Avoid sending redundant layer properties to the UI process, and avoid allocation of RemoteLayerBackingStore unless we need it
+ https://bugs.webkit.org/show_bug.cgi?id=129076
+
+ Reviewed by Tim Horton.
+
+ Normally we rely on GraphicsLayerCA to avoid redundant property
+ setting on PlatformCALayers, but for contents layers GraphicsLayerCA
+ sets properties on every update.
+
+ Make PlatformCALayerRemote more efficient in this case by not
+ setting dirty flags for unchanged property sets.
+
+ Also avoid creation of RemoteLayerBackingStore unless we
+ actually need one.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (PlatformCALayerRemote::ensureBackingStore):
+ (PlatformCALayerRemote::updateBackingStore):
+ (PlatformCALayerRemote::setBounds):
+ (PlatformCALayerRemote::setPosition):
+ (PlatformCALayerRemote::setAnchorPoint):
+ (PlatformCALayerRemote::setMasksToBounds):
+ (PlatformCALayerRemote::setAcceleratesDrawing):
+ (PlatformCALayerRemote::setBorderWidth):
+ (PlatformCALayerRemote::setBorderColor):
+ (PlatformCALayerRemote::setContentsScale):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+
+2014-02-19 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> [UI-Side Compositing] 6% of main thread time spent copying LayerProperties when adding to hash table
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=129074
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (164405 => 164406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-02-20 02:03:37 UTC (rev 164405)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-02-20 02:03:40 UTC (rev 164406)
</span><span class="lines">@@ -151,6 +151,15 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_properties.backingStore)
</span><span class="cx"> m_properties.backingStore = std::make_unique<RemoteLayerBackingStore>();
</span><ins>+
+ updateBackingStore();
+}
+
+void PlatformCALayerRemote::updateBackingStore()
+{
+ if (!m_properties.backingStore)
+ return;
+
</ins><span class="cx"> m_properties.backingStore->ensureBackingStore(this, expandedIntSize(m_properties.size), m_properties.contentsScale, m_acceleratesDrawing);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -304,13 +313,16 @@
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::setBounds(const FloatRect& value)
</span><span class="cx"> {
</span><ins>+ if (value.size() == m_properties.size)
+ return;
+
</ins><span class="cx"> m_properties.size = value.size();
</span><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::SizeChanged);
</span><span class="cx">
</span><span class="cx"> if (requiresCustomAppearanceUpdateOnBoundsChange())
</span><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::CustomAppearanceChanged);
</span><span class="cx">
</span><del>- ensureBackingStore();
</del><ins>+ updateBackingStore();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatPoint3D PlatformCALayerRemote::position() const
</span><span class="lines">@@ -320,6 +332,9 @@
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::setPosition(const FloatPoint3D& value)
</span><span class="cx"> {
</span><ins>+ if (value == m_properties.position)
+ return;
+
</ins><span class="cx"> m_properties.position = value;
</span><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::PositionChanged);
</span><span class="cx"> }
</span><span class="lines">@@ -331,6 +346,9 @@
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::setAnchorPoint(const FloatPoint3D& value)
</span><span class="cx"> {
</span><ins>+ if (value == m_properties.anchorPoint)
+ return;
+
</ins><span class="cx"> m_properties.anchorPoint = value;
</span><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::AnchorPointChanged);
</span><span class="cx"> }
</span><span class="lines">@@ -387,6 +405,9 @@
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::setMasksToBounds(bool value)
</span><span class="cx"> {
</span><ins>+ if (value == m_properties.masksToBounds)
+ return;
+
</ins><span class="cx"> m_properties.masksToBounds = value;
</span><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::MasksToBoundsChanged);
</span><span class="cx"> }
</span><span class="lines">@@ -399,7 +420,7 @@
</span><span class="cx"> void PlatformCALayerRemote::setAcceleratesDrawing(bool acceleratesDrawing)
</span><span class="cx"> {
</span><span class="cx"> m_acceleratesDrawing = acceleratesDrawing;
</span><del>- ensureBackingStore();
</del><ins>+ updateBackingStore();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CFTypeRef PlatformCALayerRemote::contents() const
</span><span class="lines">@@ -442,12 +463,18 @@
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::setBorderWidth(float value)
</span><span class="cx"> {
</span><ins>+ if (value == m_properties.borderWidth)
+ return;
+
</ins><span class="cx"> m_properties.borderWidth = value;
</span><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::BorderWidthChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::setBorderColor(const Color& value)
</span><span class="cx"> {
</span><ins>+ if (value == m_properties.borderColor)
+ return;
+
</ins><span class="cx"> m_properties.borderColor = value;
</span><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::BorderColorChanged);
</span><span class="cx"> }
</span><span class="lines">@@ -509,7 +536,7 @@
</span><span class="cx"> m_properties.contentsScale = value;
</span><span class="cx"> m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::ContentsScaleChanged);
</span><span class="cx">
</span><del>- ensureBackingStore();
</del><ins>+ updateBackingStore();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::setEdgeAntialiasingMask(unsigned value)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (164405 => 164406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2014-02-20 02:03:37 UTC (rev 164405)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2014-02-20 02:03:40 UTC (rev 164406)
</span><span class="lines">@@ -155,6 +155,7 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual bool isPlatformCALayerRemote() const override { return true; }
</span><span class="cx"> void ensureBackingStore();
</span><ins>+ void updateBackingStore();
</ins><span class="cx"> void removeSublayer(PlatformCALayerRemote*);
</span><span class="cx">
</span><span class="cx"> bool requiresCustomAppearanceUpdateOnBoundsChange() const;
</span></span></pre>
</div>
</div>
</body>
</html>