webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 21 insertions, 24 deletions

diff --git a/Source/WebCore/rendering/RenderTreeAsText.h b/Source/WebCore/rendering/RenderTreeAsText.h
index 5d3f02527..f61821bf4 100644
--- a/Source/WebCore/rendering/RenderTreeAsText.h
+++ b/Source/WebCore/rendering/RenderTreeAsText.h
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -23,9 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RenderTreeAsText_h
-#define RenderTreeAsText_h
-#include "TextStream.h"
+#pragma once
 
 #include <wtf/Forward.h>
 
@@ -37,39 +35,38 @@ class RenderObject;
 class TextStream;
 
 enum RenderAsTextBehaviorFlags {
-    RenderAsTextBehaviorNormal = 0,
-    RenderAsTextShowAllLayers = 1 << 0, // Dump all layers, not just those that would paint.
-    RenderAsTextShowLayerNesting = 1 << 1, // Annotate the layer lists.
-    RenderAsTextShowCompositedLayers = 1 << 2, // Show which layers are composited.
-    RenderAsTextShowAddresses = 1 << 3, // Show layer and renderer addresses.
-    RenderAsTextShowIDAndClass = 1 << 4, // Show id and class attributes
-    RenderAsTextPrintingMode = 1 << 5, // Dump the tree in printing mode.
-    RenderAsTextDontUpdateLayout = 1 << 6, // Don't update layout, to make it safe to call showLayerTree() from the debugger inside layout or painting code.
-    RenderAsTextShowLayoutState = 1 << 7, // Print the various 'needs layout' bits on renderers.
-    RenderAsTextShowOverflow = 1 << 8 // Print layout and visual overflow.
+    RenderAsTextBehaviorNormal          = 0,
+    RenderAsTextShowAllLayers           = 1 << 0, // Dump all layers, not just those that would paint.
+    RenderAsTextShowLayerNesting        = 1 << 1, // Annotate the layer lists.
+    RenderAsTextShowCompositedLayers    = 1 << 2, // Show which layers are composited.
+    RenderAsTextShowAddresses           = 1 << 3, // Show layer and renderer addresses.
+    RenderAsTextShowIDAndClass          = 1 << 4, // Show id and class attributes
+    RenderAsTextPrintingMode            = 1 << 5, // Dump the tree in printing mode.
+    RenderAsTextDontUpdateLayout        = 1 << 6, // Don't update layout, to make it safe to call showLayerTree() from the debugger inside layout or painting code.
+    RenderAsTextShowLayoutState         = 1 << 7, // Print the various 'needs layout' bits on renderers.
+    RenderAsTextShowOverflow            = 1 << 8, // Print layout and visual overflow.
+    RenderAsTextShowSVGGeometry         = 1 << 9, // Print additional geometry for SVG objects.
 };
 typedef unsigned RenderAsTextBehavior;
 
 // You don't need pageWidthInPixels if you don't specify RenderAsTextInPrintingMode.
-String externalRepresentation(Frame*, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
-String externalRepresentation(Element*, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
+WEBCORE_EXPORT String externalRepresentation(Frame*, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
+WEBCORE_EXPORT String externalRepresentation(Element*, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
 void write(TextStream&, const RenderObject&, int indent = 0, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
+void writeDebugInfo(TextStream&, const RenderObject&, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
 
 class RenderTreeAsText {
 // FIXME: This is a cheesy hack to allow easy access to RenderStyle colors.  It won't be needed if we convert
 // it to use visitedDependentColor instead. (This just involves rebaselining many results though, so for now it's
 // not being done).
 public:
-static void writeRenderObject(TextStream& ts, const RenderObject& o, RenderAsTextBehavior behavior);
+    static void writeRenderObject(TextStream&, const RenderObject&, RenderAsTextBehavior);
 };
 
 // Helper function shared with SVGRenderTreeAsText
-String quoteAndEscapeNonPrintables(const String&);
+String quoteAndEscapeNonPrintables(StringView);
 
-String counterValueForElement(Element*);
-
-String markerTextForListItem(Element*);
+WEBCORE_EXPORT String counterValueForElement(Element*);
+WEBCORE_EXPORT String markerTextForListItem(Element*);
 
 } // namespace WebCore
-
-#endif // RenderTreeAsText_h