<!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>[209292] trunk/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/209292">209292</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-12-02 18:44:49 -0800 (Fri, 02 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Put names on layers in release builds
https://bugs.webkit.org/show_bug.cgi?id=165347
Reviewed by Tim Horton.
Put names on GraphicsLayers (and therefore CALayers) in release builds. Release names
are a simpler, truncated version of debug names, with <tagname> id class names.
Non-primary layer names converted to lowercase and "layer" removed.
Fix comments that refer to gdb.
Use ENABLE(TREE_DEBUGGING) in more places.
* dom/Node.h:
* dom/Position.h:
* dom/Range.h:
* editing/FrameSelection.h:
* editing/VisiblePosition.h:
* editing/VisibleSelection.h:
* history/HistoryItem.h:
* page/FrameTree.h:
* platform/graphics/GraphicsLayer.h:
* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::setName):
(WebCore::GraphicsLayerCA::setContentsToSolidColor):
(WebCore::GraphicsLayerCA::updateNames):
(WebCore::GraphicsLayerCA::updateBackdropFilters):
(WebCore::GraphicsLayerCA::updateContentsImage):
(WebCore::GraphicsLayerCA::updateClippingStrategy):
(WebCore::GraphicsLayerCA::updateContentsRects):
(WebCore::GraphicsLayerCA::changeLayerTypeTo):
* platform/graphics/ca/TileController.cpp:
(WebCore::TileController::tileGridContainerLayerName):
(WebCore::TileController::zoomedOutTileGridContainerLayerName):
(WebCore::TileController::createTileLayer):
* rendering/CounterNode.h:
* rendering/InlineBox.h:
* rendering/InlineFlowBox.h:
* rendering/RenderCounter.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::name):
* rendering/RenderLayer.h:
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::createGraphicsLayer):
(WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
(WebCore::RenderLayerBacking::updateAncestorClippingLayer):
(WebCore::RenderLayerBacking::updateDescendantClippingLayer):
(WebCore::RenderLayerBacking::updateForegroundLayer):
(WebCore::RenderLayerBacking::updateBackgroundLayer):
(WebCore::RenderLayerBacking::updateMaskingLayer):
(WebCore::RenderLayerBacking::updateChildClippingStrategy):
(WebCore::RenderLayerBacking::updateScrollingLayers):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateLayerForTopOverhangArea):
(WebCore::RenderLayerCompositor::updateLayerForBottomOverhangArea):
(WebCore::RenderLayerCompositor::updateLayerForHeader):
(WebCore::RenderLayerCompositor::updateLayerForFooter):
(WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
(WebCore::RenderLayerCompositor::ensureRootLayer):
* rendering/RenderObject.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCoredomPositionh">trunk/Source/WebCore/dom/Position.h</a></li>
<li><a href="#trunkSourceWebCoredomRangeh">trunk/Source/WebCore/dom/Range.h</a></li>
<li><a href="#trunkSourceWebCoreeditingFrameSelectionh">trunk/Source/WebCore/editing/FrameSelection.h</a></li>
<li><a href="#trunkSourceWebCoreeditingVisiblePositionh">trunk/Source/WebCore/editing/VisiblePosition.h</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleSelectionh">trunk/Source/WebCore/editing/VisibleSelection.h</a></li>
<li><a href="#trunkSourceWebCorehistoryHistoryItemh">trunk/Source/WebCore/history/HistoryItem.h</a></li>
<li><a href="#trunkSourceWebCorepageFrameTreeh">trunk/Source/WebCore/page/FrameTree.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsLayerh">trunk/Source/WebCore/platform/graphics/GraphicsLayer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp">trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllercpp">trunk/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingCounterNodeh">trunk/Source/WebCore/rendering/CounterNode.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineBoxh">trunk/Source/WebCore/rendering/InlineBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxh">trunk/Source/WebCore/rendering/InlineFlowBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCounterh">trunk/Source/WebCore/rendering/RenderCounter.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/ChangeLog 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2016-12-02 Simon Fraser <simon.fraser@apple.com>
+
+ Put names on layers in release builds
+ https://bugs.webkit.org/show_bug.cgi?id=165347
+
+ Reviewed by Tim Horton.
+
+ Put names on GraphicsLayers (and therefore CALayers) in release builds. Release names
+ are a simpler, truncated version of debug names, with <tagname> id class names.
+
+ Non-primary layer names converted to lowercase and "layer" removed.
+
+ Fix comments that refer to gdb.
+
+ Use ENABLE(TREE_DEBUGGING) in more places.
+
+ * dom/Node.h:
+ * dom/Position.h:
+ * dom/Range.h:
+ * editing/FrameSelection.h:
+ * editing/VisiblePosition.h:
+ * editing/VisibleSelection.h:
+ * history/HistoryItem.h:
+ * page/FrameTree.h:
+ * platform/graphics/GraphicsLayer.h:
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::setName):
+ (WebCore::GraphicsLayerCA::setContentsToSolidColor):
+ (WebCore::GraphicsLayerCA::updateNames):
+ (WebCore::GraphicsLayerCA::updateBackdropFilters):
+ (WebCore::GraphicsLayerCA::updateContentsImage):
+ (WebCore::GraphicsLayerCA::updateClippingStrategy):
+ (WebCore::GraphicsLayerCA::updateContentsRects):
+ (WebCore::GraphicsLayerCA::changeLayerTypeTo):
+ * platform/graphics/ca/TileController.cpp:
+ (WebCore::TileController::tileGridContainerLayerName):
+ (WebCore::TileController::zoomedOutTileGridContainerLayerName):
+ (WebCore::TileController::createTileLayer):
+ * rendering/CounterNode.h:
+ * rendering/InlineBox.h:
+ * rendering/InlineFlowBox.h:
+ * rendering/RenderCounter.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::name):
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::createGraphicsLayer):
+ (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
+ (WebCore::RenderLayerBacking::updateAncestorClippingLayer):
+ (WebCore::RenderLayerBacking::updateDescendantClippingLayer):
+ (WebCore::RenderLayerBacking::updateForegroundLayer):
+ (WebCore::RenderLayerBacking::updateBackgroundLayer):
+ (WebCore::RenderLayerBacking::updateMaskingLayer):
+ (WebCore::RenderLayerBacking::updateChildClippingStrategy):
+ (WebCore::RenderLayerBacking::updateScrollingLayers):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateLayerForTopOverhangArea):
+ (WebCore::RenderLayerCompositor::updateLayerForBottomOverhangArea):
+ (WebCore::RenderLayerCompositor::updateLayerForHeader):
+ (WebCore::RenderLayerCompositor::updateLayerForFooter):
+ (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
+ (WebCore::RenderLayerCompositor::ensureRootLayer):
+ * rendering/RenderObject.h:
+
</ins><span class="cx"> 2016-12-02 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Update the media controls size as the media element is resized
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/dom/Node.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showTree(const WebCore::Node*);
</span><span class="cx"> void showNodePath(const WebCore::Node*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomPositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Position.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Position.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/dom/Position.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showTree(const WebCore::Position&);
</span><span class="cx"> void showTree(const WebCore::Position*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/dom/Range.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -183,6 +183,6 @@
</span><span class="cx"> } // namespace
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showTree(const WebCore::Range*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/FrameSelection.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/FrameSelection.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showTree(const WebCore::FrameSelection&);
</span><span class="cx"> void showTree(const WebCore::FrameSelection*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisiblePositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisiblePosition.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisiblePosition.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/editing/VisiblePosition.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showTree(const WebCore::VisiblePosition*);
</span><span class="cx"> void showTree(const WebCore::VisiblePosition&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleSelectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleSelection.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleSelection.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/editing/VisibleSelection.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showTree(const WebCore::VisibleSelection&);
</span><span class="cx"> void showTree(const WebCore::VisibleSelection*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryHistoryItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/HistoryItem.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/HistoryItem.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/history/HistoryItem.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#ifndef NDEBUG
-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+#if ENABLE(TREE_DEBUGGING)
+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> extern "C" int showTree(const WebCore::HistoryItem*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameTree.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameTree.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/page/FrameTree.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#ifndef NDEBUG
-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+#if ENABLE(TREE_DEBUGGING)
+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> WEBCORE_EXPORT void showFrameTree(const WebCore::Frame*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -680,7 +680,7 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaGraphicsLayerCAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -451,13 +451,17 @@
</span><span class="cx">
</span><span class="cx"> void GraphicsLayerCA::setName(const String& name)
</span><span class="cx"> {
</span><ins>+#if ENABLE(TREE_DEBUGGING)
</ins><span class="cx"> String caLayerDescription;
</span><span class="cx">
</span><span class="cx"> if (!m_layer->isPlatformCALayerRemote())
</span><span class="cx"> caLayerDescription = String::format("CALayer(%p) ", m_layer->platformLayer());
</span><span class="cx">
</span><del>- String longName = caLayerDescription + String::format("GraphicsLayer(%p, %llu) ", this, primaryLayerID()) + name;
- GraphicsLayer::setName(longName);
</del><ins>+ GraphicsLayer::setName(caLayerDescription + String::format("GraphicsLayer(%p, %llu) ", this, primaryLayerID()) + name);
+#else
+ GraphicsLayer::setName(name);
+#endif
+
</ins><span class="cx"> noteLayerPropertyChanged(NameChanged);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1008,8 +1012,10 @@
</span><span class="cx"> if (!m_contentsLayer || m_contentsLayerPurpose != ContentsLayerForBackgroundColor) {
</span><span class="cx"> m_contentsLayerPurpose = ContentsLayerForBackgroundColor;
</span><span class="cx"> m_contentsLayer = createPlatformCALayer(PlatformCALayer::LayerTypeLayer, this);
</span><del>-#ifndef NDEBUG
- m_contentsLayer->setName(String::format("Background Color Layer %llu", m_contentsLayer->layerID()));
</del><ins>+#if ENABLE(TREE_DEBUGGING)
+ m_contentsLayer->setName(String::format("contents color %llu", m_contentsLayer->layerID()));
+#else
+ m_contentsLayer->setName("contents color");
</ins><span class="cx"> #endif
</span><span class="cx"> contentsLayerChanged = true;
</span><span class="cx"> }
</span><span class="lines">@@ -1703,13 +1709,13 @@
</span><span class="cx"> {
</span><span class="cx"> switch (structuralLayerPurpose()) {
</span><span class="cx"> case StructuralLayerForPreserves3D:
</span><del>- m_structuralLayer->setName("Transform layer " + name());
</del><ins>+ m_structuralLayer->setName("preserve-3d: " + name());
</ins><span class="cx"> break;
</span><span class="cx"> case StructuralLayerForReplicaFlattening:
</span><del>- m_structuralLayer->setName("Replica flattening layer " + name());
</del><ins>+ m_structuralLayer->setName("replica flattening: " + name());
</ins><span class="cx"> break;
</span><span class="cx"> case StructuralLayerForBackdrop:
</span><del>- m_structuralLayer->setName("Backdrop hosting layer " + name());
</del><ins>+ m_structuralLayer->setName("backdrop hosting: " + name());
</ins><span class="cx"> break;
</span><span class="cx"> case NoStructuralLayer:
</span><span class="cx"> break;
</span><span class="lines">@@ -1973,6 +1979,7 @@
</span><span class="cx"> m_backdropLayer = createPlatformCALayer(PlatformCALayer::LayerTypeBackdropLayer, this);
</span><span class="cx"> m_backdropLayer->setAnchorPoint(FloatPoint3D());
</span><span class="cx"> m_backdropLayer->setMasksToBounds(true);
</span><ins>+ m_backdropLayer->setName("backdrop");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_backdropLayer->setHidden(!m_contentsVisible);
</span><span class="lines">@@ -2321,8 +2328,10 @@
</span><span class="cx"> if (m_pendingContentsImage) {
</span><span class="cx"> if (!m_contentsLayer.get()) {
</span><span class="cx"> m_contentsLayer = createPlatformCALayer(PlatformCALayer::LayerTypeLayer, this);
</span><del>-#ifndef NDEBUG
- m_contentsLayer->setName(String::format("Image Layer %llu", m_contentsLayer->layerID()));
</del><ins>+#if ENABLE(TREE_DEBUGGING)
+ m_contentsLayer->setName(String::format("contents image %llu", m_contentsLayer->layerID()));
+#else
+ m_contentsLayer->setName("contents image");
</ins><span class="cx"> #endif
</span><span class="cx"> setupContentsLayer(m_contentsLayer.get());
</span><span class="cx"> // m_contentsLayer will be parented by updateSublayerList
</span><span class="lines">@@ -2398,6 +2407,7 @@
</span><span class="cx"> if (!shapeMaskLayer) {
</span><span class="cx"> shapeMaskLayer = createPlatformCALayer(PlatformCALayer::LayerTypeShapeLayer, this);
</span><span class="cx"> shapeMaskLayer->setAnchorPoint(FloatPoint3D());
</span><ins>+ shapeMaskLayer->setName("shape mask");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> shapeMaskLayer->setPosition(FloatPoint());
</span><span class="lines">@@ -2426,8 +2436,10 @@
</span><span class="cx"> if (!m_contentsClippingLayer) {
</span><span class="cx"> m_contentsClippingLayer = createPlatformCALayer(PlatformCALayer::LayerTypeLayer, this);
</span><span class="cx"> m_contentsClippingLayer->setAnchorPoint(FloatPoint());
</span><del>-#ifndef NDEBUG
- m_contentsClippingLayer->setName(String::format("Contents Clipping Layer %llu", m_contentsClippingLayer->layerID()));
</del><ins>+#if ENABLE(TREE_DEBUGGING)
+ m_contentsClippingLayer->setName(String::format("contents clipping %llu", m_contentsClippingLayer->layerID()));
+#else
+ m_contentsClippingLayer->setName("contents clipping");
</ins><span class="cx"> #endif
</span><span class="cx"> gainedOrLostClippingLayer = true;
</span><span class="cx"> }
</span><span class="lines">@@ -3586,16 +3598,12 @@
</span><span class="cx"> | BackdropFiltersChanged
</span><span class="cx"> | MaskLayerChanged
</span><span class="cx"> | OpacityChanged
</span><ins>+ | NameChanged
</ins><span class="cx"> | DebugIndicatorsChanged;
</span><span class="cx">
</span><span class="cx"> if (m_usingTiledBacking)
</span><span class="cx"> m_uncommittedChanges |= CoverageRectChanged;
</span><span class="cx">
</span><del>-#ifndef NDEBUG
- String name = String::format("%sCALayer(%p) GraphicsLayer(%p, %llu) ", (newLayerType == PlatformCALayer::LayerTypeWebTiledLayer) ? "Tiled " : "", m_layer->platformLayer(), this, primaryLayerID()) + m_name;
- m_layer->setName(name);
-#endif
-
</del><span class="cx"> moveAnimations(oldLayer.get(), m_layer.get());
</span><span class="cx">
</span><span class="cx"> // need to tell new layer to draw itself
</span><span class="lines">@@ -3647,8 +3655,10 @@
</span><span class="cx"> resultLayer = addResult.iterator->value.get();
</span><span class="cx"> } else {
</span><span class="cx"> resultLayer = cloneLayer(sourceLayer, cloneLevel);
</span><del>-#ifndef NDEBUG
- resultLayer->setName(String::format("Clone %d of layer %llu", cloneID[0U], sourceLayer->layerID()));
</del><ins>+#if ENABLE(TREE_DEBUGGING)
+ resultLayer->setName(String::format("clone %d of %llu", cloneID[0U], sourceLayer->layerID()));
+#else
+ resultLayer->setName("clone of " + m_name);
</ins><span class="cx"> #endif
</span><span class="cx"> addResult.iterator->value = resultLayer;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -53,12 +53,12 @@
</span><span class="cx">
</span><span class="cx"> String TileController::tileGridContainerLayerName()
</span><span class="cx"> {
</span><del>- return ASCIILiteral("TileGrid Container Layer");
</del><ins>+ return ASCIILiteral("TileGrid container");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String TileController::zoomedOutTileGridContainerLayerName()
</span><span class="cx"> {
</span><del>- return ASCIILiteral("Zoomed Out TileGrid Container Layer");
</del><ins>+ return ASCIILiteral("Zoomed-out TileGrid container");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TileController::TileController(PlatformCALayer* rootPlatformLayer)
</span><span class="lines">@@ -702,10 +702,14 @@
</span><span class="cx"> layer->setBorderWidth(m_tileDebugBorderWidth);
</span><span class="cx"> layer->setEdgeAntialiasingMask(0);
</span><span class="cx"> layer->setOpaque(m_tilesAreOpaque);
</span><del>-#ifndef NDEBUG
- layer->setName("Tile");
-#endif
</del><span class="cx">
</span><ins>+ StringBuilder nameBuilder;
+ nameBuilder.append("tile at ");
+ nameBuilder.appendNumber(tileRect.location().x());
+ nameBuilder.append(',');
+ nameBuilder.appendNumber(tileRect.location().y());
+ layer->setName(nameBuilder.toString());
+
</ins><span class="cx"> float temporaryScaleFactor = owningGraphicsLayer()->platformCALayerContentsScaleMultiplierForNewTiles(m_tileCacheLayer);
</span><span class="cx"> m_hasTilesWithTemporaryScaleFactor |= temporaryScaleFactor != 1;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingCounterNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/CounterNode.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/CounterNode.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/rendering/CounterNode.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -92,6 +92,6 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showCounterTree(const WebCore::CounterNode*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineBox.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineBox.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/rendering/InlineBox.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showNodeTree(const WebCore::InlineBox*);
</span><span class="cx"> void showLineTree(const WebCore::InlineBox*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -374,6 +374,6 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_INLINE_BOX(InlineFlowBox, isInlineFlowBox())
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showTree(const WebCore::InlineFlowBox*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCounterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCounter.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCounter.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/rendering/RenderCounter.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -59,6 +59,6 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderCounter, isCounter())
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showCounterRendererTree(const WebCore::RenderObject*, const char* counterName = nullptr);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -386,11 +386,11 @@
</span><span class="cx"> String RenderLayer::name() const
</span><span class="cx"> {
</span><span class="cx"> StringBuilder name;
</span><del>- name.append(renderer().renderName());
</del><span class="cx">
</span><span class="cx"> if (Element* element = renderer().element()) {
</span><del>- name.append(' ');
- name.append(element->tagName());
</del><ins>+ name.append(" <");
+ name.append(element->tagName().convertToLowercaseWithoutLocale());
+ name.append('>');
</ins><span class="cx">
</span><span class="cx"> if (element->hasID()) {
</span><span class="cx"> name.appendLiteral(" id=\'");
</span><span class="lines">@@ -400,14 +400,25 @@
</span><span class="cx">
</span><span class="cx"> if (element->hasClass()) {
</span><span class="cx"> name.appendLiteral(" class=\'");
</span><del>- for (size_t i = 0; i < element->classNames().size(); ++i) {
</del><ins>+ size_t classNamesToDump = element->classNames().size();
+ const size_t maxNumClassNames = 7;
+ bool addEllipsis = false;
+ if (classNamesToDump > maxNumClassNames) {
+ classNamesToDump = maxNumClassNames;
+ addEllipsis = true;
+ }
+
+ for (size_t i = 0; i < classNamesToDump; ++i) {
</ins><span class="cx"> if (i > 0)
</span><span class="cx"> name.append(' ');
</span><span class="cx"> name.append(element->classNames()[i]);
</span><span class="cx"> }
</span><ins>+ if (addEllipsis)
+ name.append("...");
</ins><span class="cx"> name.append('\'');
</span><span class="cx"> }
</span><del>- }
</del><ins>+ } else
+ name.append(renderer().renderName());
</ins><span class="cx">
</span><span class="cx"> if (isReflection())
</span><span class="cx"> name.appendLiteral(" (reflection)");
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -1198,7 +1198,7 @@
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from lldb.
</ins><span class="cx"> void showLayerTree(const WebCore::RenderLayer*);
</span><span class="cx"> void showLayerTree(const WebCore::RenderObject*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -169,11 +169,8 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<GraphicsLayer> graphicsLayer = GraphicsLayer::create(graphicsLayerFactory, *this, layerType);
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx"> graphicsLayer->setName(name);
</span><del>-#else
- UNUSED_PARAM(name);
-#endif
</del><ins>+
</ins><span class="cx"> #if PLATFORM(COCOA) && USE(CA)
</span><span class="cx"> graphicsLayer->setAcceleratesDrawing(compositor().acceleratedDrawingEnabled());
</span><span class="cx"> graphicsLayer->setUsesDisplayListDrawing(compositor().displayListDrawingEnabled());
</span><span class="lines">@@ -299,15 +296,16 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayerBacking::createPrimaryGraphicsLayer()
</span><span class="cx"> {
</span><del>- String layerName;
-#if ENABLE(TREE_DEBUGGING)
- layerName = m_owningLayer.name();
-#endif
-
</del><ins>+ String layerName = m_owningLayer.name();
+ const unsigned maxLayerNameLength = 100;
+ if (layerName.length() > maxLayerNameLength) {
+ layerName.truncate(maxLayerNameLength);
+ layerName.append("...");
+ }
</ins><span class="cx"> m_graphicsLayer = createGraphicsLayer(layerName, m_usingTiledCacheLayer ? GraphicsLayer::Type::PageTiledBacking : GraphicsLayer::Type::Normal);
</span><span class="cx">
</span><span class="cx"> if (m_usingTiledCacheLayer) {
</span><del>- m_childContainmentLayer = createGraphicsLayer("TiledBacking Flattening Layer");
</del><ins>+ m_childContainmentLayer = createGraphicsLayer("TiledBacking containment");
</ins><span class="cx"> m_graphicsLayer->addChild(m_childContainmentLayer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1328,7 +1326,7 @@
</span><span class="cx">
</span><span class="cx"> if (needsAncestorClip) {
</span><span class="cx"> if (!m_ancestorClippingLayer) {
</span><del>- m_ancestorClippingLayer = createGraphicsLayer("Ancestor clipping Layer");
</del><ins>+ m_ancestorClippingLayer = createGraphicsLayer("ancestor clipping");
</ins><span class="cx"> m_ancestorClippingLayer->setMasksToBounds(true);
</span><span class="cx"> layersChanged = true;
</span><span class="cx"> }
</span><span class="lines">@@ -1349,7 +1347,7 @@
</span><span class="cx">
</span><span class="cx"> if (needsDescendantClip) {
</span><span class="cx"> if (!m_childContainmentLayer && !m_usingTiledCacheLayer) {
</span><del>- m_childContainmentLayer = createGraphicsLayer("Child clipping Layer");
</del><ins>+ m_childContainmentLayer = createGraphicsLayer("child clipping");
</ins><span class="cx"> m_childContainmentLayer->setMasksToBounds(true);
</span><span class="cx"> layersChanged = true;
</span><span class="cx"> }
</span><span class="lines">@@ -1499,10 +1497,7 @@
</span><span class="cx"> bool layerChanged = false;
</span><span class="cx"> if (needsForegroundLayer) {
</span><span class="cx"> if (!m_foregroundLayer) {
</span><del>- String layerName;
-#if ENABLE(TREE_DEBUGGING)
- layerName = m_owningLayer.name() + " (foreground)";
-#endif
</del><ins>+ String layerName = m_owningLayer.name() + " (foreground)";
</ins><span class="cx"> m_foregroundLayer = createGraphicsLayer(layerName);
</span><span class="cx"> m_foregroundLayer->setDrawsContent(true);
</span><span class="cx"> m_foregroundLayer->setPaintingPhase(GraphicsLayerPaintForeground);
</span><span class="lines">@@ -1528,10 +1523,7 @@
</span><span class="cx"> bool layerChanged = false;
</span><span class="cx"> if (needsBackgroundLayer) {
</span><span class="cx"> if (!m_backgroundLayer) {
</span><del>- String layerName;
-#if ENABLE(TREE_DEBUGGING)
- layerName = m_owningLayer.name() + " (background)";
-#endif
</del><ins>+ String layerName = m_owningLayer.name() + " (background)";
</ins><span class="cx"> m_backgroundLayer = createGraphicsLayer(layerName);
</span><span class="cx"> m_backgroundLayer->setDrawsContent(true);
</span><span class="cx"> m_backgroundLayer->setAnchorPoint(FloatPoint3D());
</span><span class="lines">@@ -1540,10 +1532,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_contentsContainmentLayer) {
</span><del>- String layerName;
-#if ENABLE(TREE_DEBUGGING)
- layerName = m_owningLayer.name() + " (contents containment)";
-#endif
</del><ins>+ String layerName = m_owningLayer.name() + " (contents containment)";
</ins><span class="cx"> m_contentsContainmentLayer = createGraphicsLayer(layerName);
</span><span class="cx"> m_contentsContainmentLayer->setAppliesPageScale(true);
</span><span class="cx"> m_graphicsLayer->setAppliesPageScale(false);
</span><span class="lines">@@ -1598,7 +1587,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_maskLayer) {
</span><del>- m_maskLayer = createGraphicsLayer("Mask", requiredLayerType);
</del><ins>+ m_maskLayer = createGraphicsLayer("mask", requiredLayerType);
</ins><span class="cx"> m_maskLayer->setDrawsContent(paintsContent);
</span><span class="cx"> m_maskLayer->setPaintingPhase(maskPhases);
</span><span class="cx"> layerChanged = true;
</span><span class="lines">@@ -1630,7 +1619,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_childClippingMaskLayer) {
</span><del>- m_childClippingMaskLayer = createGraphicsLayer("Child Clipping Mask Layer");
</del><ins>+ m_childClippingMaskLayer = createGraphicsLayer("child clipping mask");
</ins><span class="cx"> m_childClippingMaskLayer->setDrawsContent(true);
</span><span class="cx"> m_childClippingMaskLayer->setPaintingPhase(GraphicsLayerPaintChildClippingMask);
</span><span class="cx"> clippingLayer()->setMaskLayer(m_childClippingMaskLayer.get());
</span><span class="lines">@@ -1654,12 +1643,12 @@
</span><span class="cx">
</span><span class="cx"> if (!m_scrollingLayer) {
</span><span class="cx"> // Outer layer which corresponds with the scroll view.
</span><del>- m_scrollingLayer = createGraphicsLayer("Scrolling container", GraphicsLayer::Type::Scrolling);
</del><ins>+ m_scrollingLayer = createGraphicsLayer("scrolling container", GraphicsLayer::Type::Scrolling);
</ins><span class="cx"> m_scrollingLayer->setDrawsContent(false);
</span><span class="cx"> m_scrollingLayer->setMasksToBounds(true);
</span><span class="cx">
</span><span class="cx"> // Inner layer which renders the content that scrolls.
</span><del>- m_scrollingContentsLayer = createGraphicsLayer("Scrolled Contents");
</del><ins>+ m_scrollingContentsLayer = createGraphicsLayer("scrolled Contents");
</ins><span class="cx"> m_scrollingContentsLayer->setDrawsContent(true);
</span><span class="cx">
</span><span class="cx"> GraphicsLayerPaintingPhase paintPhase = GraphicsLayerPaintOverflowContents | GraphicsLayerPaintCompositedScroll;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -3075,9 +3075,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_layerForTopOverhangArea) {
</span><span class="cx"> m_layerForTopOverhangArea = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><del>-#if ENABLE(TREE_DEBUGGING)
- m_layerForTopOverhangArea->setName("top overhang area");
-#endif
</del><ins>+ m_layerForTopOverhangArea->setName("top overhang");
</ins><span class="cx"> m_scrollLayer->addChildBelow(m_layerForTopOverhangArea.get(), m_rootContentLayer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3099,9 +3097,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_layerForBottomOverhangArea) {
</span><span class="cx"> m_layerForBottomOverhangArea = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><del>-#if ENABLE(TREE_DEBUGGING)
- m_layerForBottomOverhangArea->setName("bottom overhang area");
-#endif
</del><ins>+ m_layerForBottomOverhangArea->setName("bottom overhang");
</ins><span class="cx"> m_scrollLayer->addChildBelow(m_layerForBottomOverhangArea.get(), m_rootContentLayer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3130,9 +3126,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_layerForHeader) {
</span><span class="cx"> m_layerForHeader = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx"> m_layerForHeader->setName("header");
</span><del>-#endif
</del><span class="cx"> m_scrollLayer->addChildAbove(m_layerForHeader.get(), m_rootContentLayer.get());
</span><span class="cx"> m_renderView.frameView().addPaintPendingMilestones(DidFirstFlushForHeaderLayer);
</span><span class="cx"> }
</span><span class="lines">@@ -3171,9 +3165,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_layerForFooter) {
</span><span class="cx"> m_layerForFooter = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx"> m_layerForFooter->setName("footer");
</span><del>-#endif
</del><span class="cx"> m_scrollLayer->addChildAbove(m_layerForFooter.get(), m_rootContentLayer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3278,9 +3270,7 @@
</span><span class="cx"> if (requiresOverhangAreasLayer()) {
</span><span class="cx"> if (!m_layerForOverhangAreas) {
</span><span class="cx"> m_layerForOverhangAreas = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx"> m_layerForOverhangAreas->setName("overhang areas");
</span><del>-#endif
</del><span class="cx"> m_layerForOverhangAreas->setDrawsContent(false);
</span><span class="cx">
</span><span class="cx"> float topContentInset = m_renderView.frameView().topContentInset();
</span><span class="lines">@@ -3307,9 +3297,7 @@
</span><span class="cx"> if (requiresContentShadowLayer()) {
</span><span class="cx"> if (!m_contentShadowLayer) {
</span><span class="cx"> m_contentShadowLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx"> m_contentShadowLayer->setName("content shadow");
</span><del>-#endif
</del><span class="cx"> m_contentShadowLayer->setSize(m_rootContentLayer->size());
</span><span class="cx"> m_contentShadowLayer->setPosition(m_rootContentLayer->position());
</span><span class="cx"> m_contentShadowLayer->setAnchorPoint(FloatPoint3D());
</span><span class="lines">@@ -3327,10 +3315,7 @@
</span><span class="cx"> if (!m_layerForHorizontalScrollbar) {
</span><span class="cx"> m_layerForHorizontalScrollbar = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><span class="cx"> m_layerForHorizontalScrollbar->setShowDebugBorder(m_showDebugBorders);
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx"> m_layerForHorizontalScrollbar->setName("horizontal scrollbar container");
</span><del>-
-#endif
</del><span class="cx"> #if PLATFORM(COCOA) && USE(CA)
</span><span class="cx"> m_layerForHorizontalScrollbar->setAcceleratesDrawing(acceleratedDrawingEnabled());
</span><span class="cx"> #endif
</span><span class="lines">@@ -3351,9 +3336,7 @@
</span><span class="cx"> if (!m_layerForVerticalScrollbar) {
</span><span class="cx"> m_layerForVerticalScrollbar = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><span class="cx"> m_layerForVerticalScrollbar->setShowDebugBorder(m_showDebugBorders);
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx"> m_layerForVerticalScrollbar->setName("vertical scrollbar container");
</span><del>-#endif
</del><span class="cx"> #if PLATFORM(COCOA) && USE(CA)
</span><span class="cx"> m_layerForVerticalScrollbar->setAcceleratesDrawing(acceleratedDrawingEnabled());
</span><span class="cx"> #endif
</span><span class="lines">@@ -3374,9 +3357,7 @@
</span><span class="cx"> if (!m_layerForScrollCorner) {
</span><span class="cx"> m_layerForScrollCorner = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><span class="cx"> m_layerForScrollCorner->setShowDebugBorder(m_showDebugBorders);
</span><del>-#ifndef NDEBUG
</del><span class="cx"> m_layerForScrollCorner->setName("scroll corner");
</span><del>-#endif
</del><span class="cx"> #if PLATFORM(COCOA) && USE(CA)
</span><span class="cx"> m_layerForScrollCorner->setAcceleratesDrawing(acceleratedDrawingEnabled());
</span><span class="cx"> #endif
</span><span class="lines">@@ -3398,9 +3379,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_rootContentLayer) {
</span><span class="cx"> m_rootContentLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx"> m_rootContentLayer->setName("content root");
</span><del>-#endif
</del><span class="cx"> IntRect overflowRect = snappedIntRect(m_renderView.layoutOverflowRect());
</span><span class="cx"> m_rootContentLayer->setSize(FloatSize(overflowRect.maxX(), overflowRect.maxY()));
</span><span class="cx"> m_rootContentLayer->setPosition(FloatPoint());
</span><span class="lines">@@ -3423,21 +3402,16 @@
</span><span class="cx">
</span><span class="cx"> // Create a layer to host the clipping layer and the overflow controls layers.
</span><span class="cx"> m_overflowControlsHostLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx"> m_overflowControlsHostLayer->setName("overflow controls host");
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Create a clipping layer if this is an iframe
</span><span class="cx"> m_clipLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx"> m_clipLayer->setName("frame clipping");
</span><del>-#endif
</del><span class="cx"> m_clipLayer->setMasksToBounds(true);
</span><span class="cx">
</span><span class="cx"> m_scrollLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx"> m_scrollLayer->setName("frame scrolling");
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> // Hook them up
</span><span class="cx"> m_overflowControlsHostLayer->addChild(m_clipLayer.get());
</span><span class="cx"> m_clipLayer->addChild(m_scrollLayer.get());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (209291 => 209292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2016-12-03 02:40:30 UTC (rev 209291)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2016-12-03 02:44:49 UTC (rev 209292)
</span><span class="lines">@@ -1112,7 +1112,7 @@
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><del>-// Outside the WebCore namespace for ease of invocation from gdb.
</del><ins>+// Outside the WebCore namespace for ease of invocation from the debugger.
</ins><span class="cx"> void showNodeTree(const WebCore::RenderObject*);
</span><span class="cx"> void showLineTree(const WebCore::RenderObject*);
</span><span class="cx"> void showRenderTree(const WebCore::RenderObject*);
</span></span></pre>
</div>
</div>
</body>
</html>