Diff
Modified: trunk/Source/WebCore/ChangeLog (158182 => 158183)
--- trunk/Source/WebCore/ChangeLog 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/ChangeLog 2013-10-29 07:50:14 UTC (rev 158183)
@@ -1,3 +1,52 @@
+2013-10-29 Zan Dobersek <[email protected]>
+
+ Move writeIndent, overloaded << operators from RenderTreeAsText to TextStream
+ https://bugs.webkit.org/show_bug.cgi?id=116012
+
+ Reviewed by Simon Fraser.
+
+ The writeIndent method and overloaded << operators for writing out vectors and points and rectangles
+ of various types are not specific to the render tree nor do they depend on any rendering-specific interface.
+
+ * page/scrolling/ScrollingStateNode.cpp:
+ * page/scrolling/ScrollingStateNode.h:
+ (ScrollingStateNode): Remove the writeIndent declaration, it's functionally the same as the TextStream method.
+ * platform/graphics/GraphicsLayer.cpp:
+ * platform/graphics/GraphicsLayer.h:
+ (GraphicsLayer): Ditto.
+ * platform/graphics/filters/DistantLightSource.cpp: Remove the RenderTreeAsText.h inclusion or replace it with
+ the inclusion of the TextStream.h header where required. The writeIndent method is now declared there.
+ * platform/graphics/filters/FEBlend.cpp: Ditto.
+ * platform/graphics/filters/FEColorMatrix.cpp: Ditto.
+ * platform/graphics/filters/FEComponentTransfer.cpp: Ditto.
+ * platform/graphics/filters/FEComposite.cpp: Ditto.
+ * platform/graphics/filters/FEConvolveMatrix.cpp: Ditto.
+ * platform/graphics/filters/FECustomFilter.cpp: Ditto.
+ * platform/graphics/filters/FEDiffuseLighting.cpp: Ditto.
+ * platform/graphics/filters/FEDisplacementMap.cpp: Ditto.
+ * platform/graphics/filters/FEDropShadow.cpp: Ditto.
+ * platform/graphics/filters/FEFlood.cpp: Ditto.
+ * platform/graphics/filters/FEGaussianBlur.cpp: Ditto.
+ * platform/graphics/filters/FEMerge.cpp: Ditto.
+ * platform/graphics/filters/FEMorphology.cpp: Ditto.
+ * platform/graphics/filters/FEOffset.cpp: Ditto.
+ * platform/graphics/filters/FESpecularLighting.cpp: Ditto.
+ * platform/graphics/filters/FETurbulence.cpp: Ditto.
+ * platform/graphics/filters/SourceAlpha.cpp: Ditto.
+ * platform/graphics/filters/SourceGraphic.cpp: Ditto.
+ * platform/text/TextStream.cpp: Move the writeIndent and operators' definitions here.
+ (WebCore::operator<<):
+ (WebCore):
+ (WebCore::writeIndent):
+ * platform/text/TextStream.h: Move the writeIndent and operators' declarations here.
+ (WebCore):
+ (TextStream):
+ (WebCore::TextStream::operator<<):
+ * rendering/RenderTreeAsText.cpp: Move the writeIndent and operators' definitions into TextStream.
+ (WebCore):
+ * rendering/RenderTreeAsText.h: Move the writeIndent and operators' declarations into TextStream.
+ (WebCore):
+
2013-10-28 Zan Dobersek <[email protected]>
Clean up ScopedEventQueue
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp (158182 => 158183)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -126,12 +126,6 @@
m_children->at(i)->willBeRemovedFromStateTree();
}
-void ScrollingStateNode::writeIndent(TextStream& ts, int indent)
-{
- for (int i = 0; i != indent; ++i)
- ts << " ";
-}
-
void ScrollingStateNode::dump(TextStream& ts, int indent) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (158182 => 158183)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2013-10-29 07:50:14 UTC (rev 158183)
@@ -92,7 +92,6 @@
protected:
ScrollingStateNode(const ScrollingStateNode&);
- static void writeIndent(TextStream&, int indent);
ScrollingStateTree* m_scrollingStateTree;
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -571,12 +571,6 @@
}
}
-void GraphicsLayer::writeIndent(TextStream& ts, int indent)
-{
- for (int i = 0; i != indent; ++i)
- ts << " ";
-}
-
void GraphicsLayer::dumpLayer(TextStream& ts, int indent, LayerTreeAsTextBehavior behavior) const
{
writeIndent(ts, indent);
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2013-10-29 07:50:14 UTC (rev 158183)
@@ -517,8 +517,6 @@
GraphicsLayer(GraphicsLayerClient*);
- static void writeIndent(TextStream&, int indent);
-
void dumpProperties(TextStream&, int indent, LayerTreeAsTextBehavior) const;
virtual void dumpAdditionalProperties(TextStream&, int /*indent*/, LayerTreeAsTextBehavior) const { }
Modified: trunk/Source/WebCore/platform/graphics/filters/DistantLightSource.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/DistantLightSource.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/DistantLightSource.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -33,7 +33,7 @@
#if ENABLE(FILTERS)
#include "DistantLightSource.h"
-#include "RenderTreeAsText.h"
+#include "TextStream.h"
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEBlend.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -30,7 +30,6 @@
#include "Filter.h"
#include "FloatPoint.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <runtime/Uint8ClampedArray.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEColorMatrix.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -27,7 +27,6 @@
#include "Filter.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <runtime/Uint8ClampedArray.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEComponentTransfer.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -28,7 +28,6 @@
#include "Filter.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <runtime/Uint8ClampedArray.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEComposite.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -29,7 +29,6 @@
#include "FECompositeArithmeticNEON.h"
#include "Filter.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <runtime/Uint8ClampedArray.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEConvolveMatrix.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -27,7 +27,6 @@
#include "FEConvolveMatrix.h"
#include "Filter.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <runtime/Uint8ClampedArray.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FECustomFilter.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -38,7 +38,6 @@
#include "CustomFilterValidatedProgram.h"
#include "Extensions3D.h"
#include "GraphicsContext3D.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <runtime/Uint8ClampedArray.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEDiffuseLighting.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -25,7 +25,6 @@
#include "FEDiffuseLighting.h"
#include "LightSource.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEDisplacementMap.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -28,7 +28,6 @@
#include "Filter.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <runtime/Uint8ClampedArray.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEDropShadow.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -26,7 +26,6 @@
#include "FEGaussianBlur.h"
#include "Filter.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "ShadowBlur.h"
#include "TextStream.h"
#include <runtime/Uint8ClampedArray.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/FEFlood.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEFlood.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEFlood.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -27,7 +27,6 @@
#include "Filter.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEGaussianBlur.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -30,7 +30,6 @@
#include "FEGaussianBlurNEON.h"
#include "Filter.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <runtime/Operations.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/FEMerge.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEMerge.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEMerge.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -26,7 +26,6 @@
#include "Filter.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEMorphology.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -27,7 +27,6 @@
#include "FEMorphology.h"
#include "Filter.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <runtime/Uint8ClampedArray.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/FEOffset.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FEOffset.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FEOffset.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -28,7 +28,6 @@
#include "Filter.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FESpecularLighting.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -25,7 +25,6 @@
#include "FESpecularLighting.h"
#include "LightSource.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/FETurbulence.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -28,7 +28,6 @@
#include "FETurbulence.h"
#include "Filter.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <runtime/Uint8ClampedArray.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/SourceAlpha.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -25,7 +25,6 @@
#include "Color.h"
#include "Filter.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/graphics/filters/SourceGraphic.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -24,7 +24,6 @@
#include "Filter.h"
#include "GraphicsContext.h"
-#include "RenderTreeAsText.h"
#include "TextStream.h"
#include <wtf/StdLibExtras.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebCore/platform/text/TextStream.cpp (158182 => 158183)
--- trunk/Source/WebCore/platform/text/TextStream.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/text/TextStream.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -26,6 +26,11 @@
#include "config.h"
#include "TextStream.h"
+#include "FloatPoint.h"
+#include "FloatRect.h"
+#include "IntPoint.h"
+#include "IntRect.h"
+#include "LayoutRect.h"
#include <wtf/MathExtras.h>
#include <wtf/StringExtras.h>
#include <wtf/text/WTFString.h>
@@ -125,6 +130,40 @@
return *this;
}
+TextStream& TextStream::operator<<(const IntPoint& p)
+{
+ return *this << "(" << p.x() << "," << p.y() << ")";
+}
+
+TextStream& TextStream::operator<<(const IntRect& r)
+{
+ return *this << "at (" << r.x() << "," << r.y() << ") size " << r.width() << "x" << r.height();
+}
+
+TextStream& TextStream::operator<<(const FloatPoint& p)
+{
+ return *this << "(" << TextStream::FormatNumberRespectingIntegers(p.x())
+ << "," << TextStream::FormatNumberRespectingIntegers(p.y()) << ")";
+}
+
+TextStream& TextStream::operator<<(const FloatSize& s)
+{
+ return *this << "width=" << TextStream::FormatNumberRespectingIntegers(s.width())
+ << " height=" << TextStream::FormatNumberRespectingIntegers(s.height());
+}
+
+TextStream& TextStream::operator<<(const LayoutPoint& p)
+{
+ // FIXME: These should be printed as floats. Keeping them ints for consistency with pervious test expectations.
+ return *this << "(" << p.x().toInt() << "," << p.y().toInt() << ")";
+}
+
+TextStream& TextStream::operator<<(const LayoutRect& r)
+{
+ // FIXME: These should be printed as floats. Keeping them ints for consistency with previous test expectations.
+ return *this << pixelSnappedIntRect(r);
+}
+
String TextStream::release()
{
String result = m_text.toString();
@@ -132,4 +171,10 @@
return result;
}
+void writeIndent(TextStream& ts, int indent)
+{
+ for (int i = 0; i != indent; ++i)
+ ts << " ";
}
+
+}
Modified: trunk/Source/WebCore/platform/text/TextStream.h (158182 => 158183)
--- trunk/Source/WebCore/platform/text/TextStream.h 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/platform/text/TextStream.h 2013-10-29 07:50:14 UTC (rev 158183)
@@ -32,6 +32,13 @@
namespace WebCore {
+class IntPoint;
+class IntRect;
+class FloatPoint;
+class FloatSize;
+class LayoutPoint;
+class LayoutRect;
+
class TextStream {
public:
struct FormatNumberRespectingIntegers {
@@ -53,12 +60,36 @@
TextStream& operator<<(const String&);
TextStream& operator<<(const FormatNumberRespectingIntegers&);
+ TextStream& operator<<(const IntPoint&);
+ TextStream& operator<<(const IntRect&);
+ TextStream& operator<<(const FloatPoint&);
+ TextStream& operator<<(const FloatSize&);
+ TextStream& operator<<(const LayoutPoint&);
+ TextStream& operator<<(const LayoutRect&);
+
+ template<typename Item>
+ TextStream& operator<<(const Vector<Item>& vector)
+ {
+ *this << "[";
+
+ unsigned size = vector.size();
+ for (unsigned i = 0; i < size; ++i) {
+ *this << vector[i];
+ if (i < size - 1)
+ *this << ", ";
+ }
+
+ return *this << "]";
+ }
+
String release();
private:
StringBuilder m_text;
};
+void writeIndent(TextStream&, int indent);
+
}
#endif
Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (158182 => 158183)
--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2013-10-29 07:50:14 UTC (rev 158183)
@@ -77,49 +77,6 @@
static void writeLayers(TextStream&, const RenderLayer* rootLayer, RenderLayer*, const LayoutRect& paintDirtyRect, int indent = 0, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
-TextStream& operator<<(TextStream& ts, const IntRect& r)
-{
- return ts << "at (" << r.x() << "," << r.y() << ") size " << r.width() << "x" << r.height();
-}
-
-TextStream& operator<<(TextStream& ts, const IntPoint& p)
-{
- return ts << "(" << p.x() << "," << p.y() << ")";
-}
-
-TextStream& operator<<(TextStream& ts, const LayoutRect& r)
-{
- // FIXME: These should be printed as floats. Keeping them ints for consistency with previous test expectations.
- return ts << pixelSnappedIntRect(r);
-}
-
-TextStream& operator<<(TextStream& ts, const LayoutPoint& p)
-{
- // FIXME: These should be printed as floats. Keeping them ints for consistency with previous test expectations.
- return ts << "(" << p.x().toInt() << "," << p.y().toInt() << ")";
-}
-
-TextStream& operator<<(TextStream& ts, const FloatPoint& p)
-{
- ts << "(" << TextStream::FormatNumberRespectingIntegers(p.x());
- ts << "," << TextStream::FormatNumberRespectingIntegers(p.y());
- ts << ")";
- return ts;
-}
-
-TextStream& operator<<(TextStream& ts, const FloatSize& s)
-{
- ts << "width=" << TextStream::FormatNumberRespectingIntegers(s.width());
- ts << " height=" << TextStream::FormatNumberRespectingIntegers(s.height());
- return ts;
-}
-
-void writeIndent(TextStream& ts, int indent)
-{
- for (int i = 0; i != indent; ++i)
- ts << " ";
-}
-
static void printBorderStyle(TextStream& ts, const EBorderStyle borderStyle)
{
switch (borderStyle) {
Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.h (158182 => 158183)
--- trunk/Source/WebCore/rendering/RenderTreeAsText.h 2013-10-29 07:42:40 UTC (rev 158182)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.h 2013-10-29 07:50:14 UTC (rev 158183)
@@ -32,13 +32,7 @@
namespace WebCore {
class Element;
-class FloatPoint;
-class FloatSize;
class Frame;
-class IntPoint;
-class IntRect;
-class LayoutPoint;
-class LayoutRect;
class RenderObject;
class TextStream;
@@ -60,7 +54,6 @@
String externalRepresentation(Frame*, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
String externalRepresentation(Element*, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
void write(TextStream&, const RenderObject&, int indent = 0, RenderAsTextBehavior = RenderAsTextBehaviorNormal);
-void writeIndent(TextStream&, int indent);
class RenderTreeAsText {
// FIXME: This is a cheesy hack to allow easy access to RenderStyle colors. It won't be needed if we convert
@@ -70,29 +63,6 @@
static void writeRenderObject(TextStream& ts, const RenderObject& o, RenderAsTextBehavior behavior);
};
-TextStream& operator<<(TextStream&, const IntPoint&);
-TextStream& operator<<(TextStream&, const IntRect&);
-TextStream& operator<<(TextStream&, const LayoutPoint&);
-TextStream& operator<<(TextStream&, const LayoutRect&);
-TextStream& operator<<(TextStream&, const FloatPoint&);
-TextStream& operator<<(TextStream&, const FloatSize&);
-
-template<typename Item>
-TextStream& operator<<(TextStream& ts, const Vector<Item>& vector)
-{
- ts << "[";
-
- unsigned size = vector.size();
- for (unsigned i = 0; i < size; ++i) {
- ts << vector[i];
- if (i < size - 1)
- ts << ", ";
- }
-
- ts << "]";
- return ts;
-}
-
// Helper function shared with SVGRenderTreeAsText
String quoteAndEscapeNonPrintables(const String&);
