Title: [100215] branches/subpixellayout/Source/WebCore/rendering
- Revision
- 100215
- Author
- [email protected]
- Date
- 2011-11-14 16:39:21 -0800 (Mon, 14 Nov 2011)
Log Message
Remove FixedRect stream operator and move FloatRect version back to svg/
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.cpp (100214 => 100215)
--- branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.cpp 2011-11-15 00:34:35 UTC (rev 100214)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.cpp 2011-11-15 00:39:21 UTC (rev 100215)
@@ -91,37 +91,6 @@
return ts << "at (" << r.x() << "," << r.y() << ") size " << r.width() << "x" << r.height();
}
-TextStream& operator<<(TextStream& ts, const FixedRect& r)
-{
- // FIXME: These should be printed as floats. Keeping them ints for consistency with pervious test expectations.
- return ts << "at (" << r.x().toInt() << "," << r.y().toInt() << ") size " << r.width().toInt() << "x" << r.height().toInt();
-}
-
-TextStream& operator<<(TextStream& ts, const FloatRect &r)
-{
- ts << "at (";
- if (hasFractions(r.x()))
- ts << r.x();
- else
- ts << int(r.x());
- ts << ",";
- if (hasFractions(r.y()))
- ts << r.y();
- else
- ts << int(r.y());
- ts << ") size ";
- if (hasFractions(r.width()))
- ts << r.width();
- else
- ts << int(r.width());
- ts << "x";
- if (hasFractions(r.height()))
- ts << r.height();
- else
- ts << int(r.height());
- return ts;
-}
-
TextStream& operator<<(TextStream& ts, const IntPoint& p)
{
return ts << "(" << p.x() << "," << p.y() << ")";
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.h (100214 => 100215)
--- branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.h 2011-11-15 00:34:35 UTC (rev 100214)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTreeAsText.h 2011-11-15 00:39:21 UTC (rev 100215)
@@ -74,8 +74,6 @@
TextStream& operator<<(TextStream&, const IntPoint&);
TextStream& operator<<(TextStream&, const IntRect&);
TextStream& operator<<(TextStream&, const FixedPoint&);
-TextStream& operator<<(TextStream&, const FixedRect&);
-TextStream& operator<<(TextStream&, const FloatRect&);
TextStream& operator<<(TextStream&, const FloatPoint&);
TextStream& operator<<(TextStream&, const FloatSize&);
Modified: branches/subpixellayout/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp (100214 => 100215)
--- branches/subpixellayout/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2011-11-15 00:34:35 UTC (rev 100214)
+++ branches/subpixellayout/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp 2011-11-15 00:39:21 UTC (rev 100215)
@@ -131,6 +131,31 @@
writeNameValuePair(ts, name, value);
}
+TextStream& operator<<(TextStream& ts, const FloatRect &r)
+{
+ ts << "at (";
+ if (hasFractions(r.x()))
+ ts << r.x();
+ else
+ ts << int(r.x());
+ ts << ",";
+ if (hasFractions(r.y()))
+ ts << r.y();
+ else
+ ts << int(r.y());
+ ts << ") size ";
+ if (hasFractions(r.width()))
+ ts << r.width();
+ else
+ ts << int(r.width());
+ ts << "x";
+ if (hasFractions(r.height()))
+ ts << r.height();
+ else
+ ts << int(r.height());
+ return ts;
+}
+
TextStream& operator<<(TextStream& ts, const AffineTransform& transform)
{
if (transform.isIdentity())
Modified: branches/subpixellayout/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h (100214 => 100215)
--- branches/subpixellayout/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h 2011-11-15 00:34:35 UTC (rev 100214)
+++ branches/subpixellayout/Source/WebCore/rendering/svg/SVGRenderTreeAsText.h 2011-11-15 00:39:21 UTC (rev 100215)
@@ -61,6 +61,7 @@
// helper operators defined used in various classes to dump the render tree.
TextStream& operator<<(TextStream&, const AffineTransform&);
TextStream& operator<<(TextStream&, const Color&);
+TextStream& operator<<(TextStream&, const FloatRect&);
// helper operators specific to dumping the render tree. these are used in various classes to dump the render tree
// these could be defined in separate namespace to avoid matching these generic signatures unintentionally.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
