Diff
Modified: trunk/Source/WTF/ChangeLog (181165 => 181166)
--- trunk/Source/WTF/ChangeLog 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WTF/ChangeLog 2015-03-06 18:20:40 UTC (rev 181166)
@@ -1,3 +1,17 @@
+2015-03-06 Simon Fraser <simon.fra...@apple.com>
+
+ Allow tree dumping functions to be used in release builds by switching a flag
+ https://bugs.webkit.org/show_bug.cgi?id=142379
+
+ Reviewed by Zalan Bujtas.
+
+ There are various tree dumping functions that are useful for debugging, and sometimes
+ you want to be able to use them in release builds. Currently they are surrounded by
+ #ifndef NDEBUG. Change this to #if ENABLE(TREE_DEBUGGING), which is defined to 0 or 1
+ in wtf/Platform.h
+
+ * wtf/Platform.h:
+
2015-03-05 Chris Dumez <cdu...@apple.com>
Regression(r173761): ASSERTION FAILED: !is8Bit() in StringImpl::characters16()
Modified: trunk/Source/WTF/wtf/Platform.h (181165 => 181166)
--- trunk/Source/WTF/wtf/Platform.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WTF/wtf/Platform.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -983,6 +983,14 @@
#define WTF_USE_AVFOUNDATION 1
#endif
+#if !defined(ENABLE_TREE_DEBUGGING)
+#if !defined(NDEBUG)
+#define ENABLE_TREE_DEBUGGING 1
+#else
+#define ENABLE_TREE_DEBUGGING 0
+#endif
+#endif
+
#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)
#define WTF_USE_COREMEDIA 1
#define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1
Modified: trunk/Source/WebCore/ChangeLog (181165 => 181166)
--- trunk/Source/WebCore/ChangeLog 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/ChangeLog 2015-03-06 18:20:40 UTC (rev 181166)
@@ -1,3 +1,71 @@
+2015-03-06 Simon Fraser <simon.fra...@apple.com>
+
+ Allow tree dumping functions to be used in release builds by switching a flag
+ https://bugs.webkit.org/show_bug.cgi?id=142379
+
+ Reviewed by Zalan Bujtas.
+
+ There are various tree dumping functions that are useful for debugging, and sometimes
+ you want to be able to use them in release builds. Currently they are surrounded by
+ #ifndef NDEBUG. Change this to #if ENABLE(TREE_DEBUGGING), which is defined to 0 or 1
+ in wtf/Platform.h
+
+ * dom/DocumentMarkerController.cpp:
+ * dom/DocumentMarkerController.h:
+ * dom/Element.cpp:
+ * dom/Element.h:
+ * dom/Node.cpp:
+ * dom/Node.h:
+ * dom/Position.cpp:
+ * dom/Position.h:
+ * dom/Range.cpp:
+ * dom/Range.h:
+ * dom/Text.cpp:
+ * dom/Text.h:
+ * editing/FrameSelection.cpp:
+ * editing/FrameSelection.h:
+ * editing/VisiblePosition.cpp:
+ * editing/VisiblePosition.h:
+ * editing/VisibleSelection.cpp:
+ * editing/VisibleSelection.h:
+ * html/parser/HTMLElementStack.cpp:
+ * html/parser/HTMLFormattingElementList.cpp:
+ * rendering/CounterNode.cpp:
+ * rendering/CounterNode.h:
+ * rendering/InlineBox.cpp:
+ * rendering/InlineBox.h:
+ * rendering/InlineFlowBox.cpp:
+ * rendering/InlineFlowBox.h:
+ * rendering/InlineTextBox.cpp:
+ * rendering/InlineTextBox.h:
+ * rendering/RenderBlockFlow.cpp:
+ * rendering/RenderBlockFlow.h:
+ * rendering/RenderCounter.cpp:
+ * rendering/RenderCounter.h:
+ * rendering/RenderLayer.cpp:
+ * rendering/RenderLayer.h:
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::createGraphicsLayer):
+ (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer):
+ (WebCore::RenderLayerBacking::updateForegroundLayer):
+ (WebCore::RenderLayerBacking::updateBackgroundLayer):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::CompositingState::CompositingState):
+ (WebCore::RenderLayerCompositor::updateLayerForTopOverhangArea):
+ (WebCore::RenderLayerCompositor::updateLayerForBottomOverhangArea):
+ (WebCore::RenderLayerCompositor::updateLayerForHeader):
+ (WebCore::RenderLayerCompositor::updateLayerForFooter):
+ (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
+ (WebCore::RenderLayerCompositor::ensureRootLayer):
+ * rendering/RenderObject.cpp:
+ * rendering/RenderObject.h:
+ * rendering/RootInlineBox.cpp:
+ * rendering/RootInlineBox.h:
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ * rendering/SimpleLineLayoutFunctions.h:
+ * rendering/svg/SVGResources.cpp:
+ * rendering/svg/SVGResources.h:
+
2015-03-06 Said Abou-Hallawa <sabouhall...@apple.com>
An SVG element without intrinsic size inherits the container size as its viewport instead of inheriting the container viewport.
Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (181165 => 181166)
--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -724,7 +724,7 @@
}
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void DocumentMarkerController::showMarkers() const
{
fprintf(stderr, "%d nodes have markers:\n", m_markers.size());
@@ -745,7 +745,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showDocumentMarkers(const WebCore::DocumentMarkerController* controller)
{
if (controller)
Modified: trunk/Source/WebCore/dom/DocumentMarkerController.h (181165 => 181166)
--- trunk/Source/WebCore/dom/DocumentMarkerController.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -89,7 +89,7 @@
WEBCORE_EXPORT Vector<IntRect> renderedRectsForMarkers(DocumentMarker::MarkerType);
void clearDescriptionOnMarkersIntersectingRange(Range*, DocumentMarker::MarkerTypes);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showMarkers() const;
#endif
@@ -108,7 +108,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showDocumentMarkers(const WebCore::DocumentMarkerController*);
#endif
Modified: trunk/Source/WebCore/dom/Element.cpp (181165 => 181166)
--- trunk/Source/WebCore/dom/Element.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -1685,7 +1685,7 @@
styleResolver->popParentElement(this);
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void Element::formatForDebugger(char* buffer, unsigned length) const
{
StringBuilder result;
Modified: trunk/Source/WebCore/dom/Element.h (181165 => 181166)
--- trunk/Source/WebCore/dom/Element.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/Element.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -625,7 +625,7 @@
void addAttributeInternal(const QualifiedName&, const AtomicString& value, SynchronizationOfLazyAttribute);
void removeAttributeInternal(unsigned index, SynchronizationOfLazyAttribute);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
virtual void formatForDebugger(char* buffer, unsigned length) const override;
#endif
Modified: trunk/Source/WebCore/dom/Node.cpp (181165 => 181166)
--- trunk/Source/WebCore/dom/Node.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/Node.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -1486,7 +1486,7 @@
return p;
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
static void appendAttributeDesc(const Node* node, StringBuilder& stringBuilder, const QualifiedName& name, const char* attrDesc)
{
@@ -1654,7 +1654,7 @@
showSubTreeAcrossFrame(rootNode, this, "");
}
-#endif
+#endif // ENABLE(TREE_DEBUGGING)
// --------
@@ -2222,7 +2222,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showTree(const WebCore::Node* node)
{
@@ -2236,4 +2236,4 @@
node->showNodePathForThis();
}
-#endif
+#endif // ENABLE(TREE_DEBUGGING)
Modified: trunk/Source/WebCore/dom/Node.h (181165 => 181166)
--- trunk/Source/WebCore/dom/Node.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/Node.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -488,7 +488,7 @@
//
virtual void removedFrom(ContainerNode& insertionPoint);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
virtual void formatForDebugger(char* buffer, unsigned length) const;
void showNode(const char* prefix = "") const;
@@ -496,7 +496,7 @@
void showNodePathForThis() const;
void showTreeAndMark(const Node* markedNode1, const char* markedLabel1, const Node* markedNode2 = nullptr, const char* markedLabel2 = nullptr) const;
void showTreeForThisAcrossFrame() const;
-#endif
+#endif // ENABLE(TREE_DEBUGGING)
void invalidateNodeListAndCollectionCachesInAncestors(const QualifiedName* attrName = nullptr, Element* attributeOwnerElement = nullptr);
NodeListsNodeData* nodeLists();
@@ -733,7 +733,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
// Outside the WebCore namespace for ease of invocation from gdb.
void showTree(const WebCore::Node*);
void showNodePath(const WebCore::Node*);
Modified: trunk/Source/WebCore/dom/Position.cpp (181165 => 181166)
--- trunk/Source/WebCore/dom/Position.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/Position.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -1346,6 +1346,7 @@
return LTR;
}
+#if ENABLE(TREE_DEBUGGING)
void Position::debugPosition(const char* msg) const
{
@@ -1355,8 +1356,6 @@
fprintf(stderr, "Position [%s]: %s [%p] at %d\n", msg, deprecatedNode()->nodeName().utf8().data(), deprecatedNode(), m_offset);
}
-#ifndef NDEBUG
-
void Position::formatForDebugger(char* buffer, unsigned length) const
{
StringBuilder result;
@@ -1409,11 +1408,9 @@
#endif
-
-
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showTree(const WebCore::Position& pos)
{
Modified: trunk/Source/WebCore/dom/Position.h (181165 => 181166)
--- trunk/Source/WebCore/dom/Position.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/Position.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -202,7 +202,7 @@
void debugPosition(const char* msg = "") const;
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void formatForDebugger(char* buffer, unsigned length) const;
void showAnchorTypeAndOffset() const;
void showTreeForThis() const;
@@ -342,7 +342,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
// Outside the WebCore namespace for ease of invocation from gdb.
void showTree(const WebCore::Position&);
void showTree(const WebCore::Position*);
Modified: trunk/Source/WebCore/dom/Range.cpp (181165 => 181166)
--- trunk/Source/WebCore/dom/Range.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/Range.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -1919,7 +1919,7 @@
}
#endif
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void Range::formatForDebugger(char* buffer, unsigned length) const
{
StringBuilder result;
@@ -2251,7 +2251,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showTree(const WebCore::Range* range)
{
Modified: trunk/Source/WebCore/dom/Range.h (181165 => 181166)
--- trunk/Source/WebCore/dom/Range.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/Range.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -151,7 +151,7 @@
Ref<ClientRectList> getClientRects() const;
Ref<ClientRect> getBoundingClientRect() const;
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void formatForDebugger(char* buffer, unsigned length) const;
#endif
@@ -187,7 +187,7 @@
} // namespace
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
// Outside the WebCore namespace for ease of invocation from gdb.
void showTree(const WebCore::Range*);
#endif
Modified: trunk/Source/WebCore/dom/Text.cpp (181165 => 181166)
--- trunk/Source/WebCore/dom/Text.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/Text.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -216,7 +216,7 @@
return result;
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void Text::formatForDebugger(char* buffer, unsigned length) const
{
StringBuilder result;
Modified: trunk/Source/WebCore/dom/Text.h (181165 => 181166)
--- trunk/Source/WebCore/dom/Text.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/dom/Text.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -67,7 +67,7 @@
virtual Ref<Text> virtualCreate(const String&);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
virtual void formatForDebugger(char* buffer, unsigned length) const override;
#endif
};
Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (181165 => 181166)
--- trunk/Source/WebCore/editing/FrameSelection.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -2146,7 +2146,7 @@
updateDataDetectorsForSelection();
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void FrameSelection::formatForDebugger(char* buffer, unsigned length) const
{
@@ -2585,7 +2585,7 @@
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showTree(const WebCore::FrameSelection& sel)
{
Modified: trunk/Source/WebCore/editing/FrameSelection.h (181165 => 181166)
--- trunk/Source/WebCore/editing/FrameSelection.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -207,7 +207,7 @@
// Painting.
WEBCORE_EXPORT void updateAppearance();
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void formatForDebugger(char* buffer, unsigned length) const;
void showTreeForThis() const;
#endif
@@ -375,7 +375,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
// Outside the WebCore namespace for ease of invocation from gdb.
void showTree(const WebCore::FrameSelection&);
void showTree(const WebCore::FrameSelection*);
Modified: trunk/Source/WebCore/editing/VisiblePosition.cpp (181165 => 181166)
--- trunk/Source/WebCore/editing/VisiblePosition.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/editing/VisiblePosition.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -643,7 +643,7 @@
return containingBlock->isHorizontalWritingMode() ? caretPoint.x() : caretPoint.y();
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void VisiblePosition::debugPosition(const char* msg) const
{
@@ -745,7 +745,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showTree(const WebCore::VisiblePosition* vpos)
{
Modified: trunk/Source/WebCore/editing/VisiblePosition.h (181165 => 181166)
--- trunk/Source/WebCore/editing/VisiblePosition.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/editing/VisiblePosition.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -99,8 +99,8 @@
// Abs x/y position of the caret ignoring transforms.
// FIXME: navigation with transforms should be smarter.
WEBCORE_EXPORT int lineDirectionPointForBlockDirectionNavigation() const;
-
-#ifndef NDEBUG
+
+#if ENABLE(TREE_DEBUGGING)
void debugPosition(const char* msg = "") const;
void formatForDebugger(char* buffer, unsigned length) const;
void showTreeForThis() const;
@@ -161,7 +161,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
// Outside the WebCore namespace for ease of invocation from gdb.
void showTree(const WebCore::VisiblePosition*);
void showTree(const WebCore::VisiblePosition&);
Modified: trunk/Source/WebCore/editing/VisibleSelection.cpp (181165 => 181166)
--- trunk/Source/WebCore/editing/VisibleSelection.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/editing/VisibleSelection.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -669,7 +669,7 @@
return is<HTMLInputElement>(textControl) && downcast<HTMLInputElement>(*textControl).isPasswordField();
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void VisibleSelection::debugPosition() const
{
@@ -726,7 +726,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showTree(const WebCore::VisibleSelection& sel)
{
Modified: trunk/Source/WebCore/editing/VisibleSelection.h (181165 => 181166)
--- trunk/Source/WebCore/editing/VisibleSelection.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/editing/VisibleSelection.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -107,7 +107,7 @@
WEBCORE_EXPORT bool isInPasswordField() const;
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void debugPosition() const;
void formatForDebugger(char* buffer, unsigned length) const;
void showTreeForThis() const;
Modified: trunk/Source/WebCore/html/parser/HTMLElementStack.cpp (181165 => 181166)
--- trunk/Source/WebCore/html/parser/HTMLElementStack.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/html/parser/HTMLElementStack.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -606,7 +606,7 @@
return nullptr;
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void HTMLElementStack::show()
{
Modified: trunk/Source/WebCore/html/parser/HTMLFormattingElementList.cpp (181165 => 181166)
--- trunk/Source/WebCore/html/parser/HTMLFormattingElementList.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/html/parser/HTMLFormattingElementList.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -200,7 +200,7 @@
remove(&candidates[i]->element());
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void HTMLFormattingElementList::show()
{
Modified: trunk/Source/WebCore/rendering/CounterNode.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/CounterNode.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/CounterNode.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -350,7 +350,7 @@
next->recount();
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
static void showTreeAndMark(const CounterNode* node)
{
@@ -374,7 +374,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showCounterTree(const WebCore::CounterNode* counter)
{
Modified: trunk/Source/WebCore/rendering/CounterNode.h (181165 => 181166)
--- trunk/Source/WebCore/rendering/CounterNode.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/CounterNode.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -93,7 +93,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
// Outside the WebCore namespace for ease of invocation from gdb.
void showCounterTree(const WebCore::CounterNode*);
#endif
Modified: trunk/Source/WebCore/rendering/InlineBox.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/InlineBox.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/InlineBox.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -30,7 +30,7 @@
#include "RenderLineBreak.h"
#include "RootInlineBox.h"
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
#include <stdio.h>
#endif
@@ -84,7 +84,7 @@
parent()->removeChild(this);
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
const char* InlineBox::boxName() const
{
@@ -119,7 +119,7 @@
fprintf(stderr, "%s (%.2f, %.2f) (%.2f, %.2f) (%p)\n", boxName(), x(), y(), width(), height(), this);
}
-#endif
+#endif // ENABLE(TREE_DEBUGGING)
float InlineBox::logicalHeight() const
{
@@ -328,7 +328,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showNodeTree(const WebCore::InlineBox* inlineBox)
{
Modified: trunk/Source/WebCore/rendering/InlineBox.h (181165 => 181166)
--- trunk/Source/WebCore/rendering/InlineBox.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/InlineBox.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -73,7 +73,7 @@
virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) = 0;
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) = 0;
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showNodeTreeForThis() const;
void showLineTreeForThis() const;
@@ -446,7 +446,7 @@
static bool isType(const WebCore::InlineBox& box) { return box.predicate; } \
SPECIALIZE_TYPE_TRAITS_END()
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
// Outside the WebCore namespace for ease of invocation from gdb.
void showNodeTree(const WebCore::InlineBox*);
void showLineTree(const WebCore::InlineBox*);
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -1687,7 +1687,7 @@
}
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
const char* InlineFlowBox::boxName() const
{
@@ -1701,6 +1701,10 @@
box->showLineTreeAndMark(markedBox, depth + 1);
}
+#endif
+
+#ifndef NDEBUG
+
void InlineFlowBox::checkConsistency() const
{
assertNotDeleted();
Modified: trunk/Source/WebCore/rendering/InlineFlowBox.h (181165 => 181166)
--- trunk/Source/WebCore/rendering/InlineFlowBox.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/InlineFlowBox.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -70,7 +70,7 @@
virtual ~InlineFlowBox();
#endif
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
virtual void showLineTreeAndMark(const InlineBox* markedBox, int depth) const override;
virtual const char* boxName() const override;
#endif
@@ -367,7 +367,7 @@
SPECIALIZE_TYPE_TRAITS_INLINE_BOX(InlineFlowBox, isInlineFlowBox())
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
// Outside the WebCore namespace for ease of invocation from gdb.
void showTree(const WebCore::InlineFlowBox*);
#endif
Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -1393,7 +1393,7 @@
return run;
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
const char* InlineTextBox::boxName() const
{
Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (181165 => 181166)
--- trunk/Source/WebCore/rendering/InlineTextBox.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -94,7 +94,7 @@
virtual void dirtyOwnLineBoxes() { dirtyLineBoxes(); }
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
virtual void showLineBox(bool mark, int depth) const override final;
virtual const char* boxName() const override final;
#endif
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -3556,7 +3556,7 @@
clearNeedsLayout();
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void RenderBlockFlow::showLineTreeAndMark(const InlineBox* markedBox, int depth) const
{
for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (181165 => 181166)
--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -363,7 +363,7 @@
void deleteLineBoxesBeforeSimpleLineLayout();
void ensureLineBoxes();
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showLineTreeAndMark(const InlineBox* markedBox, int depth) const;
#endif
Modified: trunk/Source/WebCore/rendering/RenderCounter.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/RenderCounter.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RenderCounter.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -35,7 +35,7 @@
#include "RenderView.h"
#include <wtf/StdLibExtras.h>
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
#include <stdio.h>
#endif
@@ -600,7 +600,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showCounterRendererTree(const WebCore::RenderObject* renderer, const char* counterName)
{
Modified: trunk/Source/WebCore/rendering/RenderCounter.h (181165 => 181166)
--- trunk/Source/WebCore/rendering/RenderCounter.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RenderCounter.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -63,7 +63,7 @@
SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderCounter, isCounter())
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
// Outside the WebCore namespace for ease of invocation from gdb.
void showCounterRendererTree(const WebCore::RenderObject*, const char* counterName = 0);
#endif
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -7047,7 +7047,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showLayerTree(const WebCore::RenderLayer* layer)
{
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (181165 => 181166)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -1172,7 +1172,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
// Outside the WebCore namespace for ease of invocation from gdb.
void showLayerTree(const WebCore::RenderLayer*);
void showLayerTree(const WebCore::RenderObject*);
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -169,7 +169,7 @@
std::unique_ptr<GraphicsLayer> graphicsLayer = GraphicsLayer::create(graphicsLayerFactory, *this, layerType);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
graphicsLayer->setName(name);
#else
UNUSED_PARAM(name);
@@ -275,7 +275,7 @@
void RenderLayerBacking::createPrimaryGraphicsLayer()
{
String layerName;
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
layerName = m_owningLayer.name();
#endif
@@ -1366,7 +1366,7 @@
if (needsForegroundLayer) {
if (!m_foregroundLayer) {
String layerName;
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
layerName = m_owningLayer.name() + " (foreground)";
#endif
m_foregroundLayer = createGraphicsLayer(layerName);
@@ -1395,7 +1395,7 @@
if (needsBackgroundLayer) {
if (!m_backgroundLayer) {
String layerName;
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
layerName = m_owningLayer.name() + " (background)";
#endif
m_backgroundLayer = createGraphicsLayer(layerName);
@@ -1407,7 +1407,7 @@
if (!m_contentsContainmentLayer) {
String layerName;
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
layerName = m_owningLayer.name() + " (contents containment)";
#endif
m_contentsContainmentLayer = createGraphicsLayer(layerName);
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -71,7 +71,7 @@
#include "RenderScrollbar.h"
#endif
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
#include "RenderTreeAsText.h"
#endif
@@ -225,7 +225,7 @@
#if ENABLE(CSS_COMPOSITING)
, m_hasNotIsolatedCompositedBlendingDescendants(false)
#endif
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
, m_depth(0)
#endif
{
@@ -238,7 +238,7 @@
#if ENABLE(CSS_COMPOSITING)
, m_hasNotIsolatedCompositedBlendingDescendants(other.m_hasNotIsolatedCompositedBlendingDescendants)
#endif
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
, m_depth(other.m_depth + 1)
#endif
{
@@ -250,7 +250,7 @@
#if ENABLE(CSS_COMPOSITING)
bool m_hasNotIsolatedCompositedBlendingDescendants;
#endif
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
int m_depth;
#endif
};
@@ -3027,7 +3027,7 @@
if (!m_layerForTopOverhangArea) {
m_layerForTopOverhangArea = GraphicsLayer::create(graphicsLayerFactory(), *this);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_layerForTopOverhangArea->setName("top overhang area");
#endif
m_scrollLayer->addChildBelow(m_layerForTopOverhangArea.get(), m_rootContentLayer.get());
@@ -3051,7 +3051,7 @@
if (!m_layerForBottomOverhangArea) {
m_layerForBottomOverhangArea = GraphicsLayer::create(graphicsLayerFactory(), *this);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_layerForBottomOverhangArea->setName("bottom overhang area");
#endif
m_scrollLayer->addChildBelow(m_layerForBottomOverhangArea.get(), m_rootContentLayer.get());
@@ -3082,7 +3082,7 @@
if (!m_layerForHeader) {
m_layerForHeader = GraphicsLayer::create(graphicsLayerFactory(), *this);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_layerForHeader->setName("header");
#endif
m_scrollLayer->addChildAbove(m_layerForHeader.get(), m_rootContentLayer.get());
@@ -3123,7 +3123,7 @@
if (!m_layerForFooter) {
m_layerForFooter = GraphicsLayer::create(graphicsLayerFactory(), *this);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_layerForFooter->setName("footer");
#endif
m_scrollLayer->addChildAbove(m_layerForFooter.get(), m_rootContentLayer.get());
@@ -3191,7 +3191,7 @@
if (requiresOverhangAreasLayer()) {
if (!m_layerForOverhangAreas) {
m_layerForOverhangAreas = GraphicsLayer::create(graphicsLayerFactory(), *this);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_layerForOverhangAreas->setName("overhang areas");
#endif
m_layerForOverhangAreas->setDrawsContent(false);
@@ -3220,7 +3220,7 @@
if (requiresContentShadowLayer()) {
if (!m_contentShadowLayer) {
m_contentShadowLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_contentShadowLayer->setName("content shadow");
#endif
m_contentShadowLayer->setSize(m_rootContentLayer->size());
@@ -3240,7 +3240,7 @@
if (!m_layerForHorizontalScrollbar) {
m_layerForHorizontalScrollbar = GraphicsLayer::create(graphicsLayerFactory(), *this);
m_layerForHorizontalScrollbar->setShowDebugBorder(m_showDebugBorders);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_layerForHorizontalScrollbar->setName("horizontal scrollbar container");
#endif
@@ -3264,7 +3264,7 @@
if (!m_layerForVerticalScrollbar) {
m_layerForVerticalScrollbar = GraphicsLayer::create(graphicsLayerFactory(), *this);
m_layerForVerticalScrollbar->setShowDebugBorder(m_showDebugBorders);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_layerForVerticalScrollbar->setName("vertical scrollbar container");
#endif
#if PLATFORM(COCOA) && USE(CA)
@@ -3311,7 +3311,7 @@
if (!m_rootContentLayer) {
m_rootContentLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_rootContentLayer->setName("content root");
#endif
IntRect overflowRect = snappedIntRect(m_renderView.layoutOverflowRect());
@@ -3336,19 +3336,19 @@
// Create a layer to host the clipping layer and the overflow controls layers.
m_overflowControlsHostLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_overflowControlsHostLayer->setName("overflow controls host");
#endif
// Create a clipping layer if this is an iframe
m_clipLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_clipLayer->setName("frame clipping");
#endif
m_clipLayer->setMasksToBounds(true);
m_scrollLayer = GraphicsLayer::create(graphicsLayerFactory(), *this);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
m_scrollLayer->setName("frame scrolling");
#endif
// Hook them up
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -1351,7 +1351,7 @@
ASSERT_NOT_REACHED();
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
static void showRenderTreeLegend()
{
@@ -2497,7 +2497,7 @@
} // namespace WebCore
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showNodeTree(const WebCore::RenderObject* object)
{
Modified: trunk/Source/WebCore/rendering/RenderObject.h (181165 => 181166)
--- trunk/Source/WebCore/rendering/RenderObject.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -136,10 +136,6 @@
};
#endif
-#ifndef NDEBUG
-const int showTreeCharacterOffset = 39;
-#endif
-
// Base class for all rendering tree objects.
class RenderObject : public CachedImageClient {
WTF_MAKE_FAST_ALLOCATED;
@@ -271,7 +267,7 @@
void setLayerNeedsFullRepaintForPositionedMovementLayout();
public:
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showNodeTreeForThis() const;
void showRenderTreeForThis() const;
void showLineTreeForThis() const;
@@ -1111,7 +1107,7 @@
static bool isType(const WebCore::RenderObject& renderer) { return renderer.predicate; } \
SPECIALIZE_TYPE_TRAITS_END()
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
// Outside the WebCore namespace for ease of invocation from gdb.
void showNodeTree(const WebCore::RenderObject*);
void showLineTree(const WebCore::RenderObject*);
Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -1152,7 +1152,7 @@
return 0;
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
const char* RootInlineBox::boxName() const
{
return "RootInlineBox";
Modified: trunk/Source/WebCore/rendering/RootInlineBox.h (181165 => 181166)
--- trunk/Source/WebCore/rendering/RootInlineBox.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/RootInlineBox.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -190,7 +190,7 @@
Node* getLogicalStartBoxWithNode(InlineBox*&) const;
Node* getLogicalEndBoxWithNode(InlineBox*&) const;
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
virtual const char* boxName() const override final;
#endif
private:
Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -179,7 +179,7 @@
return quads;
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
static void printPrefix(int& printedCharacters, int depth)
{
fprintf(stderr, "------- --");
Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h (181165 => 181166)
--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -63,7 +63,7 @@
LayoutUnit lineHeightFromFlow(const RenderBlockFlow&);
LayoutUnit baselineFromFlow(const RenderBlockFlow&);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void showLineLayoutForFlow(const RenderBlockFlow&, const Layout&, int depth);
#endif
Modified: trunk/Source/WebCore/rendering/svg/SVGResources.cpp (181165 => 181166)
--- trunk/Source/WebCore/rendering/svg/SVGResources.cpp 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/svg/SVGResources.cpp 2015-03-06 18:20:40 UTC (rev 181166)
@@ -31,7 +31,7 @@
#include "SVGRenderStyle.h"
#include "SVGURIReference.h"
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
#include <stdio.h>
#endif
@@ -612,7 +612,7 @@
m_linkedResource = 0;
}
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void SVGResources::dump(const RenderObject* object)
{
ASSERT(object);
Modified: trunk/Source/WebCore/rendering/svg/SVGResources.h (181165 => 181166)
--- trunk/Source/WebCore/rendering/svg/SVGResources.h 2015-03-06 18:15:48 UTC (rev 181165)
+++ trunk/Source/WebCore/rendering/svg/SVGResources.h 2015-03-06 18:20:40 UTC (rev 181166)
@@ -71,7 +71,7 @@
void removeClientFromCache(RenderElement&, bool markForInvalidation = true) const;
void resourceDestroyed(RenderSVGResourceContainer&);
-#ifndef NDEBUG
+#if ENABLE(TREE_DEBUGGING)
void dump(const RenderObject*);
#endif
