<!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>[181154] 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/181154">181154</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-06 06:34:51 -0800 (Fri, 06 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/181139">r181139</a>.
https://bugs.webkit.org/show_bug.cgi?id=142394
"Caused many crashes in API tests and layout tests in Debug
builds on bots." (Requested by ddkilzer on #webkit).
Reverted changeset:
"Allow tree dumping functions to be used in release builds by
switching a flag"
https://bugs.webkit.org/show_bug.cgi?id=142379
http://trac.webkit.org/changeset/181139</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreconfigh">trunk/Source/WebCore/config.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentMarkerControllercpp">trunk/Source/WebCore/dom/DocumentMarkerController.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentMarkerControllerh">trunk/Source/WebCore/dom/DocumentMarkerController.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCoredomPositioncpp">trunk/Source/WebCore/dom/Position.cpp</a></li>
<li><a href="#trunkSourceWebCoredomPositionh">trunk/Source/WebCore/dom/Position.h</a></li>
<li><a href="#trunkSourceWebCoredomRangecpp">trunk/Source/WebCore/dom/Range.cpp</a></li>
<li><a href="#trunkSourceWebCoredomRangeh">trunk/Source/WebCore/dom/Range.h</a></li>
<li><a href="#trunkSourceWebCoredomTextcpp">trunk/Source/WebCore/dom/Text.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTexth">trunk/Source/WebCore/dom/Text.h</a></li>
<li><a href="#trunkSourceWebCorerenderingCounterNodecpp">trunk/Source/WebCore/rendering/CounterNode.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingCounterNodeh">trunk/Source/WebCore/rendering/CounterNode.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineBoxcpp">trunk/Source/WebCore/rendering/InlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineBoxh">trunk/Source/WebCore/rendering/InlineBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxcpp">trunk/Source/WebCore/rendering/InlineFlowBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineFlowBoxh">trunk/Source/WebCore/rendering/InlineFlowBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxh">trunk/Source/WebCore/rendering/InlineTextBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCountercpp">trunk/Source/WebCore/rendering/RenderCounter.cpp</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="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxcpp">trunk/Source/WebCore/rendering/RootInlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxh">trunk/Source/WebCore/rendering/RootInlineBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionsh">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcescpp">trunk/Source/WebCore/rendering/svg/SVGResources.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcesh">trunk/Source/WebCore/rendering/svg/SVGResources.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/ChangeLog 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-03-06 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r181139.
+ https://bugs.webkit.org/show_bug.cgi?id=142394
+
+ "Caused many crashes in API tests and layout tests in Debug
+ builds on bots." (Requested by ddkilzer on #webkit).
+
+ Reverted changeset:
+
+ "Allow tree dumping functions to be used in release builds by
+ switching a flag"
+ https://bugs.webkit.org/show_bug.cgi?id=142379
+ http://trac.webkit.org/changeset/181139
+
</ins><span class="cx"> 2015-03-05 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] new load method for MediaStreamPrivate objects
</span></span></pre></div>
<a id="trunkSourceWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/config.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/config.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/config.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -135,8 +135,3 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#ifdef NDEBUG
-#define ENABLE_TREE_DEBUGGING 0
-#else
-#define ENABLE_TREE_DEBUGGING 1
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoredomDocumentMarkerControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -724,7 +724,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void DocumentMarkerController::showMarkers() const
</span><span class="cx"> {
</span><span class="cx"> fprintf(stderr, "%d nodes have markers:\n", m_markers.size());
</span><span class="lines">@@ -745,7 +745,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void showDocumentMarkers(const WebCore::DocumentMarkerController* controller)
</span><span class="cx"> {
</span><span class="cx"> if (controller)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentMarkerControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentMarkerController.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentMarkerController.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> WEBCORE_EXPORT Vector<IntRect> renderedRectsForMarkers(DocumentMarker::MarkerType);
</span><span class="cx"> void clearDescriptionOnMarkersIntersectingRange(Range*, DocumentMarker::MarkerTypes);
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void showMarkers() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void showDocumentMarkers(const WebCore::DocumentMarkerController*);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -1685,7 +1685,7 @@
</span><span class="cx"> styleResolver->popParentElement(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void Element::formatForDebugger(char* buffer, unsigned length) const
</span><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/Element.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -625,7 +625,7 @@
</span><span class="cx"> void addAttributeInternal(const QualifiedName&, const AtomicString& value, SynchronizationOfLazyAttribute);
</span><span class="cx"> void removeAttributeInternal(unsigned index, SynchronizationOfLazyAttribute);
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> virtual void formatForDebugger(char* buffer, unsigned length) const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/Node.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -1486,7 +1486,7 @@
</span><span class="cx"> return p;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> static void appendAttributeDesc(const Node* node, StringBuilder& stringBuilder, const QualifiedName& name, const char* attrDesc)
</span><span class="cx"> {
</span><span class="lines">@@ -1654,7 +1654,7 @@
</span><span class="cx"> showSubTreeAcrossFrame(rootNode, this, "");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(TREE_DEBUGGING)
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // --------
</span><span class="cx">
</span><span class="lines">@@ -2222,7 +2222,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> void showTree(const WebCore::Node* node)
</span><span class="cx"> {
</span><span class="lines">@@ -2236,4 +2236,4 @@
</span><span class="cx"> node->showNodePathForThis();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(TREE_DEBUGGING)
</del><ins>+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/Node.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> //
</span><span class="cx"> virtual void removedFrom(ContainerNode& insertionPoint);
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> virtual void formatForDebugger(char* buffer, unsigned length) const;
</span><span class="cx">
</span><span class="cx"> void showNode(const char* prefix = "") const;
</span><span class="lines">@@ -496,7 +496,7 @@
</span><span class="cx"> void showNodePathForThis() const;
</span><span class="cx"> void showTreeAndMark(const Node* markedNode1, const char* markedLabel1, const Node* markedNode2 = nullptr, const char* markedLabel2 = nullptr) const;
</span><span class="cx"> void showTreeForThisAcrossFrame() const;
</span><del>-#endif // ENABLE(TREE_DEBUGGING)
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void invalidateNodeListAndCollectionCachesInAncestors(const QualifiedName* attrName = nullptr, Element* attributeOwnerElement = nullptr);
</span><span class="cx"> NodeListsNodeData* nodeLists();
</span><span class="lines">@@ -733,7 +733,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> // Outside the WebCore namespace for ease of invocation from gdb.
</span><span class="cx"> void showTree(const WebCore::Node*);
</span><span class="cx"> void showNodePath(const WebCore::Node*);
</span></span></pre></div>
<a id="trunkSourceWebCoredomPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Position.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Position.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/Position.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -1346,7 +1346,6 @@
</span><span class="cx"> return LTR;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><span class="cx">
</span><span class="cx"> void Position::debugPosition(const char* msg) const
</span><span class="cx"> {
</span><span class="lines">@@ -1356,6 +1355,8 @@
</span><span class="cx"> fprintf(stderr, "Position [%s]: %s [%p] at %d\n", msg, deprecatedNode()->nodeName().utf8().data(), deprecatedNode(), m_offset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#ifndef NDEBUG
+
</ins><span class="cx"> void Position::formatForDebugger(char* buffer, unsigned length) const
</span><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span><span class="lines">@@ -1408,9 +1409,11 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> void showTree(const WebCore::Position& pos)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomPositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Position.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Position.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/Position.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> void debugPosition(const char* msg = "") const;
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void formatForDebugger(char* buffer, unsigned length) const;
</span><span class="cx"> void showAnchorTypeAndOffset() const;
</span><span class="cx"> void showTreeForThis() const;
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> // Outside the WebCore namespace for ease of invocation from gdb.
</span><span class="cx"> void showTree(const WebCore::Position&);
</span><span class="cx"> void showTree(const WebCore::Position*);
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/Range.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -1919,7 +1919,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void Range::formatForDebugger(char* buffer, unsigned length) const
</span><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span><span class="lines">@@ -2251,7 +2251,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> void showTree(const WebCore::Range* range)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/Range.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> Ref<ClientRectList> getClientRects() const;
</span><span class="cx"> Ref<ClientRect> getBoundingClientRect() const;
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void formatForDebugger(char* buffer, unsigned length) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> // Outside the WebCore namespace for ease of invocation from gdb.
</span><span class="cx"> void showTree(const WebCore::Range*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoredomTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/Text.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void Text::formatForDebugger(char* buffer, unsigned length) const
</span><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span></span></pre></div>
<a id="trunkSourceWebCoredomTexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Text.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Text.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/dom/Text.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> virtual Ref<Text> virtualCreate(const String&);
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> virtual void formatForDebugger(char* buffer, unsigned length) const override;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingCounterNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/CounterNode.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/CounterNode.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/CounterNode.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> next->recount();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> static void showTreeAndMark(const CounterNode* node)
</span><span class="cx"> {
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> void showCounterTree(const WebCore::CounterNode* counter)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingCounterNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/CounterNode.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/CounterNode.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/CounterNode.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> // Outside the WebCore namespace for ease of invocation from gdb.
</span><span class="cx"> void showCounterTree(const WebCore::CounterNode*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineBox.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineBox.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/InlineBox.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "RenderLineBreak.h"
</span><span class="cx"> #include "RootInlineBox.h"
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> #include <stdio.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> parent()->removeChild(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> const char* InlineBox::boxName() const
</span><span class="cx"> {
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> fprintf(stderr, "%s (%.2f, %.2f) (%.2f, %.2f) (%p)\n", boxName(), x(), y(), width(), height(), this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(TREE_DEBUGGING)
</del><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> float InlineBox::logicalHeight() const
</span><span class="cx"> {
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> void showNodeTree(const WebCore::InlineBox* inlineBox)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineBox.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineBox.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/InlineBox.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) = 0;
</span><span class="cx"> virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) = 0;
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void showNodeTreeForThis() const;
</span><span class="cx"> void showLineTreeForThis() const;
</span><span class="cx">
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx"> static bool isType(const WebCore::InlineBox& box) { return box.predicate; } \
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> // Outside the WebCore namespace for ease of invocation from gdb.
</span><span class="cx"> void showNodeTree(const WebCore::InlineBox*);
</span><span class="cx"> void showLineTree(const WebCore::InlineBox*);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -1687,7 +1687,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> const char* InlineFlowBox::boxName() const
</span><span class="cx"> {
</span><span class="lines">@@ -1701,10 +1701,6 @@
</span><span class="cx"> box->showLineTreeAndMark(markedBox, depth + 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif
-
-#ifndef NDEBUG
-
</del><span class="cx"> void InlineFlowBox::checkConsistency() const
</span><span class="cx"> {
</span><span class="cx"> assertNotDeleted();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineFlowBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> virtual ~InlineFlowBox();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> virtual void showLineTreeAndMark(const InlineBox* markedBox, int depth) const override;
</span><span class="cx"> virtual const char* boxName() const override;
</span><span class="cx"> #endif
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_INLINE_BOX(InlineFlowBox, isInlineFlowBox())
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> // Outside the WebCore namespace for ease of invocation from gdb.
</span><span class="cx"> void showTree(const WebCore::InlineFlowBox*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -1393,7 +1393,7 @@
</span><span class="cx"> return run;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> const char* InlineTextBox::boxName() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void dirtyOwnLineBoxes() { dirtyLineBoxes(); }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> virtual void showLineBox(bool mark, int depth) const override final;
</span><span class="cx"> virtual const char* boxName() const override final;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -3556,7 +3556,7 @@
</span><span class="cx"> clearNeedsLayout();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void RenderBlockFlow::showLineTreeAndMark(const InlineBox* markedBox, int depth) const
</span><span class="cx"> {
</span><span class="cx"> for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -363,7 +363,7 @@
</span><span class="cx"> void deleteLineBoxesBeforeSimpleLineLayout();
</span><span class="cx"> void ensureLineBoxes();
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void showLineTreeAndMark(const InlineBox* markedBox, int depth) const;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCountercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCounter.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCounter.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RenderCounter.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> #include <stdio.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -600,7 +600,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> void showCounterRendererTree(const WebCore::RenderObject* renderer, const char* counterName)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCounterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCounter.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCounter.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RenderCounter.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderCounter, isCounter())
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> // Outside the WebCore namespace for ease of invocation from gdb.
</span><span class="cx"> void showCounterRendererTree(const WebCore::RenderObject*, const char* counterName = 0);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -7047,7 +7047,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> void showLayerTree(const WebCore::RenderLayer* layer)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -1172,7 +1172,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> // Outside the WebCore namespace for ease of invocation from gdb.
</span><span class="cx"> void showLayerTree(const WebCore::RenderLayer*);
</span><span class="cx"> void showLayerTree(const WebCore::RenderObject*);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -169,7 +169,7 @@
</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><ins>+#ifndef NDEBUG
</ins><span class="cx"> graphicsLayer->setName(name);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(name);
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> void RenderLayerBacking::createPrimaryGraphicsLayer()
</span><span class="cx"> {
</span><span class="cx"> String layerName;
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> layerName = m_owningLayer.name();
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1366,7 +1366,7 @@
</span><span class="cx"> if (needsForegroundLayer) {
</span><span class="cx"> if (!m_foregroundLayer) {
</span><span class="cx"> String layerName;
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> layerName = m_owningLayer.name() + " (foreground)";
</span><span class="cx"> #endif
</span><span class="cx"> m_foregroundLayer = createGraphicsLayer(layerName);
</span><span class="lines">@@ -1395,7 +1395,7 @@
</span><span class="cx"> if (needsBackgroundLayer) {
</span><span class="cx"> if (!m_backgroundLayer) {
</span><span class="cx"> String layerName;
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> layerName = m_owningLayer.name() + " (background)";
</span><span class="cx"> #endif
</span><span class="cx"> m_backgroundLayer = createGraphicsLayer(layerName);
</span><span class="lines">@@ -1407,7 +1407,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_contentsContainmentLayer) {
</span><span class="cx"> String layerName;
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> layerName = m_owningLayer.name() + " (contents containment)";
</span><span class="cx"> #endif
</span><span class="cx"> m_contentsContainmentLayer = createGraphicsLayer(layerName);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> #include "RenderScrollbar.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> #include "RenderTreeAsText.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> , m_hasNotIsolatedCompositedBlendingDescendants(false)
</span><span class="cx"> #endif
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> , m_depth(0)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> , m_hasNotIsolatedCompositedBlendingDescendants(other.m_hasNotIsolatedCompositedBlendingDescendants)
</span><span class="cx"> #endif
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> , m_depth(other.m_depth + 1)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> bool m_hasNotIsolatedCompositedBlendingDescendants;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> int m_depth;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="lines">@@ -3015,7 +3015,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)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_layerForTopOverhangArea->setName("top overhang area");
</span><span class="cx"> #endif
</span><span class="cx"> m_scrollLayer->addChildBelow(m_layerForTopOverhangArea.get(), m_rootContentLayer.get());
</span><span class="lines">@@ -3039,7 +3039,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)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_layerForBottomOverhangArea->setName("bottom overhang area");
</span><span class="cx"> #endif
</span><span class="cx"> m_scrollLayer->addChildBelow(m_layerForBottomOverhangArea.get(), m_rootContentLayer.get());
</span><span class="lines">@@ -3070,7 +3070,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><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_layerForHeader->setName("header");
</span><span class="cx"> #endif
</span><span class="cx"> m_scrollLayer->addChildAbove(m_layerForHeader.get(), m_rootContentLayer.get());
</span><span class="lines">@@ -3111,7 +3111,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><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_layerForFooter->setName("footer");
</span><span class="cx"> #endif
</span><span class="cx"> m_scrollLayer->addChildAbove(m_layerForFooter.get(), m_rootContentLayer.get());
</span><span class="lines">@@ -3179,7 +3179,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><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_layerForOverhangAreas->setName("overhang areas");
</span><span class="cx"> #endif
</span><span class="cx"> m_layerForOverhangAreas->setDrawsContent(false);
</span><span class="lines">@@ -3208,7 +3208,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><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_contentShadowLayer->setName("content shadow");
</span><span class="cx"> #endif
</span><span class="cx"> m_contentShadowLayer->setSize(m_rootContentLayer->size());
</span><span class="lines">@@ -3228,7 +3228,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><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_layerForHorizontalScrollbar->setName("horizontal scrollbar container");
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -3252,7 +3252,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><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_layerForVerticalScrollbar->setName("vertical scrollbar container");
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA) && USE(CA)
</span><span class="lines">@@ -3299,7 +3299,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><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_rootContentLayer->setName("content root");
</span><span class="cx"> #endif
</span><span class="cx"> IntRect overflowRect = snappedIntRect(m_renderView.layoutOverflowRect());
</span><span class="lines">@@ -3324,19 +3324,19 @@
</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><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_overflowControlsHostLayer->setName("overflow controls host");
</span><span class="cx"> #endif
</span><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><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_clipLayer->setName("frame clipping");
</span><span class="cx"> #endif
</span><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><ins>+#ifndef NDEBUG
</ins><span class="cx"> m_scrollLayer->setName("frame scrolling");
</span><span class="cx"> #endif
</span><span class="cx"> // Hook them up
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -1351,7 +1351,7 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> static void showRenderTreeLegend()
</span><span class="cx"> {
</span><span class="lines">@@ -2497,7 +2497,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx">
</span><span class="cx"> void showNodeTree(const WebCore::RenderObject* object)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -136,6 +136,10 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifndef NDEBUG
+const int showTreeCharacterOffset = 39;
+#endif
+
</ins><span class="cx"> // Base class for all rendering tree objects.
</span><span class="cx"> class RenderObject : public CachedImageClient {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -267,7 +271,7 @@
</span><span class="cx"> void setLayerNeedsFullRepaintForPositionedMovementLayout();
</span><span class="cx">
</span><span class="cx"> public:
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void showNodeTreeForThis() const;
</span><span class="cx"> void showRenderTreeForThis() const;
</span><span class="cx"> void showLineTreeForThis() const;
</span><span class="lines">@@ -1107,7 +1111,7 @@
</span><span class="cx"> static bool isType(const WebCore::RenderObject& renderer) { return renderer.predicate; } \
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_END()
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> // Outside the WebCore namespace for ease of invocation from gdb.
</span><span class="cx"> void showNodeTree(const WebCore::RenderObject*);
</span><span class="cx"> void showLineTree(const WebCore::RenderObject*);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -1152,7 +1152,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> const char* RootInlineBox::boxName() const
</span><span class="cx"> {
</span><span class="cx"> return "RootInlineBox";
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/RootInlineBox.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> Node* getLogicalStartBoxWithNode(InlineBox*&) const;
</span><span class="cx"> Node* getLogicalEndBoxWithNode(InlineBox*&) const;
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> virtual const char* boxName() const override final;
</span><span class="cx"> #endif
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> return quads;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> static void printPrefix(int& printedCharacters, int depth)
</span><span class="cx"> {
</span><span class="cx"> fprintf(stderr, "------- --");
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> LayoutUnit lineHeightFromFlow(const RenderBlockFlow&);
</span><span class="cx"> LayoutUnit baselineFromFlow(const RenderBlockFlow&);
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void showLineLayoutForFlow(const RenderBlockFlow&, const Layout&, int depth);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResources.cpp (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResources.cpp 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/svg/SVGResources.cpp 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "SVGRenderStyle.h"
</span><span class="cx"> #include "SVGURIReference.h"
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> #include <stdio.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -612,7 +612,7 @@
</span><span class="cx"> m_linkedResource = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void SVGResources::dump(const RenderObject* object)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(object);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResources.h (181153 => 181154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResources.h 2015-03-06 14:10:11 UTC (rev 181153)
+++ trunk/Source/WebCore/rendering/svg/SVGResources.h 2015-03-06 14:34:51 UTC (rev 181154)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> void removeClientFromCache(RenderElement&, bool markForInvalidation = true) const;
</span><span class="cx"> void resourceDestroyed(RenderSVGResourceContainer&);
</span><span class="cx">
</span><del>-#if ENABLE(TREE_DEBUGGING)
</del><ins>+#ifndef NDEBUG
</ins><span class="cx"> void dump(const RenderObject*);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>