<!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>[170139] 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/170139">170139</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-06-18 20:11:24 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove RemoteLayerBackingStore’s RemoteLayerTreeContext pointer
https://bugs.webkit.org/show_bug.cgi?id=134055
Reviewed by Simon Fraser.
* Shared/mac/RemoteLayerBackingStore.h:
* Shared/mac/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::RemoteLayerBackingStore):
(WebKit::RemoteLayerBackingStore::~RemoteLayerBackingStore):
(WebKit::RemoteLayerBackingStore::ensureBackingStore):
(WebKit::RemoteLayerBackingStore::display):
(WebKit::RemoteLayerBackingStore::drawInContext):
Remove RemoteLayerBackingStore's RemoteLayerTreeContext pointer. Instead, use the PlatformCALayer's.
Pass the PlatformCALayer in to the constructor, and remove it from ensureBackingStore();
RemoteLayerBackingStore is (for now) strictly tied to a single layer.
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(WebKit::PlatformCALayerRemote::ensureBackingStore):
(WebKit::PlatformCALayerRemote::updateBackingStore):
* WebProcess/WebPage/mac/PlatformCALayerRemote.h:
(WebKit::PlatformCALayerRemote::context):</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170138 => 170139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-19 02:19:18 UTC (rev 170138)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-19 03:11:24 UTC (rev 170139)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-06-18 Tim Horton <timothy_horton@apple.com>
+
+ Remove RemoteLayerBackingStore’s RemoteLayerTreeContext pointer
+ https://bugs.webkit.org/show_bug.cgi?id=134055
+
+ Reviewed by Simon Fraser.
+
+ * Shared/mac/RemoteLayerBackingStore.h:
+ * Shared/mac/RemoteLayerBackingStore.mm:
+ (WebKit::RemoteLayerBackingStore::RemoteLayerBackingStore):
+ (WebKit::RemoteLayerBackingStore::~RemoteLayerBackingStore):
+ (WebKit::RemoteLayerBackingStore::ensureBackingStore):
+ (WebKit::RemoteLayerBackingStore::display):
+ (WebKit::RemoteLayerBackingStore::drawInContext):
+ Remove RemoteLayerBackingStore's RemoteLayerTreeContext pointer. Instead, use the PlatformCALayer's.
+ Pass the PlatformCALayer in to the constructor, and remove it from ensureBackingStore();
+ RemoteLayerBackingStore is (for now) strictly tied to a single layer.
+
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+ (WebKit::PlatformCALayerRemote::ensureBackingStore):
+ (WebKit::PlatformCALayerRemote::updateBackingStore):
+ * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+ (WebKit::PlatformCALayerRemote::context):
+
</ins><span class="cx"> 2014-06-18 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Modernize one-method authentication
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h (170138 => 170139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h 2014-06-19 02:19:18 UTC (rev 170138)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.h 2014-06-19 03:11:24 UTC (rev 170139)
</span><span class="lines">@@ -42,16 +42,15 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class PlatformCALayerRemote;
</span><del>-class RemoteLayerTreeContext;
</del><span class="cx">
</span><span class="cx"> class RemoteLayerBackingStore {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(RemoteLayerBackingStore);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- RemoteLayerBackingStore(RemoteLayerTreeContext*);
</del><ins>+ RemoteLayerBackingStore(PlatformCALayerRemote*);
</ins><span class="cx"> ~RemoteLayerBackingStore();
</span><span class="cx">
</span><del>- void ensureBackingStore(PlatformCALayerRemote*, WebCore::FloatSize, float scale, bool acceleratesDrawing, bool isOpaque);
</del><ins>+ void ensureBackingStore(WebCore::FloatSize, float scale, bool acceleratesDrawing, bool isOpaque);
</ins><span class="cx">
</span><span class="cx"> void setNeedsDisplay(const WebCore::IntRect);
</span><span class="cx"> void setNeedsDisplay();
</span><span class="lines">@@ -128,8 +127,6 @@
</span><span class="cx">
</span><span class="cx"> WebCore::RepaintRectList m_paintingRects;
</span><span class="cx">
</span><del>- RemoteLayerTreeContext* m_context;
-
</del><span class="cx"> std::chrono::steady_clock::time_point m_lastDisplayTime;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacRemoteLayerBackingStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (170138 => 170139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-06-19 02:19:18 UTC (rev 170138)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-06-19 03:11:24 UTC (rev 170139)
</span><span class="lines">@@ -55,30 +55,32 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-RemoteLayerBackingStore::RemoteLayerBackingStore(RemoteLayerTreeContext* context)
- : m_layer(nullptr)
</del><ins>+RemoteLayerBackingStore::RemoteLayerBackingStore(PlatformCALayerRemote* layer)
+ : m_layer(layer)
</ins><span class="cx"> , m_isOpaque(false)
</span><del>- , m_context(context)
</del><span class="cx"> , m_lastDisplayTime(std::chrono::steady_clock::time_point::min())
</span><span class="cx"> {
</span><del>- if (m_context)
- m_context->backingStoreWasCreated(this);
</del><ins>+ if (!m_layer)
+ return;
+ if (RemoteLayerTreeContext* context = m_layer->context())
+ context->backingStoreWasCreated(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RemoteLayerBackingStore::~RemoteLayerBackingStore()
</span><span class="cx"> {
</span><span class="cx"> clearBackingStore();
</span><span class="cx">
</span><del>- if (m_context)
- m_context->backingStoreWillBeDestroyed(this);
</del><ins>+ if (!m_layer)
+ return;
+ if (RemoteLayerTreeContext* context = m_layer->context())
+ context->backingStoreWillBeDestroyed(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteLayerBackingStore::ensureBackingStore(PlatformCALayerRemote* layer, FloatSize size, float scale, bool acceleratesDrawing, bool isOpaque)
</del><ins>+void RemoteLayerBackingStore::ensureBackingStore(FloatSize size, float scale, bool acceleratesDrawing, bool isOpaque)
</ins><span class="cx"> {
</span><del>- if (m_layer == layer && m_size == size && m_scale == scale && m_acceleratesDrawing == acceleratesDrawing && m_isOpaque == isOpaque)
</del><ins>+ if (m_size == size && m_scale == scale && m_acceleratesDrawing == acceleratesDrawing && m_isOpaque == isOpaque)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_layer = layer;
</del><span class="cx"> m_size = size;
</span><span class="cx"> m_scale = scale;
</span><span class="cx"> m_acceleratesDrawing = acceleratesDrawing;
</span><span class="lines">@@ -201,8 +203,8 @@
</span><span class="cx">
</span><span class="cx"> m_lastDisplayTime = std::chrono::steady_clock::now();
</span><span class="cx">
</span><del>- if (m_context)
- m_context->backingStoreWillBeDisplayed(this);
</del><ins>+ if (RemoteLayerTreeContext* context = m_layer->context())
+ context->backingStoreWillBeDisplayed(this);
</ins><span class="cx">
</span><span class="cx"> // Make the previous front buffer non-volatile early, so that we can dirty the whole layer if it comes back empty.
</span><span class="cx"> setBufferVolatility(BufferType::Front, false);
</span><span class="lines">@@ -319,6 +321,7 @@
</span><span class="cx">
</span><span class="cx"> context.scale(FloatSize(m_scale, m_scale));
</span><span class="cx">
</span><ins>+ // FIXME: This should be moved to PlatformCALayerRemote for better layering.
</ins><span class="cx"> switch (m_layer->layerType()) {
</span><span class="cx"> case PlatformCALayer::LayerTypeSimpleLayer:
</span><span class="cx"> case PlatformCALayer::LayerTypeTiledBackingTileLayer:
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (170138 => 170139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-06-19 02:19:18 UTC (rev 170138)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp 2014-06-19 03:11:24 UTC (rev 170139)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> ASSERT(owner());
</span><span class="cx">
</span><span class="cx"> if (!m_properties.backingStore)
</span><del>- m_properties.backingStore = std::make_unique<RemoteLayerBackingStore>(m_context);
</del><ins>+ m_properties.backingStore = std::make_unique<RemoteLayerBackingStore>(this);
</ins><span class="cx">
</span><span class="cx"> updateBackingStore();
</span><span class="cx"> }
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> if (!m_properties.backingStore)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_properties.backingStore->ensureBackingStore(this, m_properties.bounds.size(), m_properties.contentsScale, m_acceleratesDrawing, m_properties.opaque);
</del><ins>+ m_properties.backingStore->ensureBackingStore(m_properties.bounds.size(), m_properties.contentsScale, m_acceleratesDrawing, m_properties.opaque);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformCALayerRemote::setNeedsDisplay(const FloatRect* rect)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacPlatformCALayerRemoteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (170138 => 170139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2014-06-19 02:19:18 UTC (rev 170138)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h 2014-06-19 03:11:24 UTC (rev 170139)
</span><span class="lines">@@ -161,13 +161,12 @@
</span><span class="cx"> void didCommit();
</span><span class="cx">
</span><span class="cx"> void clearContext() { m_context = nullptr; }
</span><ins>+ RemoteLayerTreeContext* context() const { return m_context; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> PlatformCALayerRemote(WebCore::PlatformCALayer::LayerType, WebCore::PlatformCALayerClient* owner, RemoteLayerTreeContext* context);
</span><span class="cx"> PlatformCALayerRemote(const PlatformCALayerRemote&, WebCore::PlatformCALayerClient*, RemoteLayerTreeContext*);
</span><span class="cx">
</span><del>- RemoteLayerTreeContext* context() const { return m_context; }
-
</del><span class="cx"> private:
</span><span class="cx"> virtual bool isPlatformCALayerRemote() const override { return true; }
</span><span class="cx"> void ensureBackingStore();
</span></span></pre>
</div>
</div>
</body>
</html>