Change SVG layout tree output to be more meaningful and consistent

third_party/WebKit/Source/core/layout/svg/SVGLayoutTreeAsText.cpp

 /*
  * Copyright (C) 2004, 2005, 2007, 2009 Apple Inc. All rights reserved.
  *           (C) 2005 Rob Buis <buis@kde.org>
  *           (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 309 matching lines @@
     writeIfNotDefault(ts, "clip rule", svgStyle.clipRule(), RULE_NONZERO);
   }
 
   writeIfNotEmpty(ts, "start marker", svgStyle.markerStartResource());
   writeIfNotEmpty(ts, "middle marker", svgStyle.markerMidResource());
   writeIfNotEmpty(ts, "end marker", svgStyle.markerEndResource());
 }
 
 static TextStream& writePositionAndStyle(TextStream& ts,
                                          const LayoutObject& object) {
-  ts << " " << enclosingIntRect(
-                   const_cast<LayoutObject&>(object).absoluteVisualRect());
+  ts << " " << object.objectBoundingBox();
   writeStyle(ts, object);
   return ts;
 }
 
 static TextStream& operator<<(TextStream& ts, const LayoutSVGShape& shape) {
   writePositionAndStyle(ts, shape);
 
   SVGElement* svgElement = shape.element();
   ASSERT(svgElement);
   SVGLengthContext lengthContext(svgElement);
@@ skipping 45 matching lines @@
     writeNameAndQuotedValue(
         ts, "data",
         toSVGPathElement(*svgElement).path()->currentValue()->valueAsString());
   } else {
     ASSERT_NOT_REACHED();
   }
   return ts;
 }
 
 static TextStream& operator<<(TextStream& ts, const LayoutSVGRoot& root) {
-  return writePositionAndStyle(ts, root);
+  ts << " " << root.frameRect();
+  writeStyle(ts, root);
+  return ts;
 }
 
 static void writeLayoutSVGTextBox(TextStream& ts, const LayoutSVGText& text) {
   SVGRootInlineBox* box = toSVGRootInlineBox(text.firstRootBox());
   if (!box)
     return;
 
-  ts << " " << enclosingIntRect(LayoutRect(
-                   LayoutPoint(text.location()),
-                   LayoutSize(box->logicalWidth(), box->logicalHeight())));
-
   // FIXME: Remove this hack, once the new text layout engine is completly
   // landed. We want to preserve the old layout test results for now.
   ts << " contains 1 chunk(s)";
 
   if (text.parent() && (text.parent()->resolveColor(CSSPropertyColor) !=
-                        text.resolveColor(CSSPropertyColor)))
+                        text.resolveColor(CSSPropertyColor))) {
     writeNameValuePair(
         ts, "color",
         text.resolveColor(CSSPropertyColor).nameForLayoutTreeAsText());
+  }
 }
 
 static inline void writeSVGInlineTextBox(TextStream& ts,
                                          SVGInlineTextBox* textBox,
                                          int indent) {
   Vector<SVGTextFragment>& fragments = textBox->textFragments();
   if (fragments.isEmpty())
     return;
 
   LineLayoutSVGInlineText textLineLayout =
@@ skipping 220 matching lines @@
 }
 
 void write(TextStream& ts, const LayoutSVGRoot& root, int indent) {
   writeStandardPrefix(ts, root, indent);
   ts << root << "\n";
   writeChildren(ts, root, indent);
 }
 
 void writeSVGText(TextStream& ts, const LayoutSVGText& text, int indent) {
   writeStandardPrefix(ts, text, indent);
+  writePositionAndStyle(ts, text);
   writeLayoutSVGTextBox(ts, text);
   ts << "\n";
   writeResources(ts, text, indent);
   writeChildren(ts, text, indent);
 }
 
 void writeSVGInlineText(TextStream& ts,
                         const LayoutSVGInlineText& text,
                         int indent) {
   writeStandardPrefix(ts, text, indent);
-  ts << " " << enclosingIntRect(FloatRect(text.firstRunOrigin(),
-                                          text.floatLinesBoundingBox().size()))
-     << "\n";
+  writePositionAndStyle(ts, text);
+  ts << "\n";
   writeResources(ts, text, indent);
   writeSVGInlineTextBoxes(ts, text, indent);
 }
 
 void writeSVGImage(TextStream& ts, const LayoutSVGImage& image, int indent) {
   writeStandardPrefix(ts, image, indent);
   writePositionAndStyle(ts, image);
   ts << "\n";
   writeResources(ts, image, indent);
 }
@@ skipping 74 matching lines @@
           ts << " ";
           writeStandardPrefix(ts, *filter, 0);
           ts << " " << filter->resourceBoundingBox(&object) << "\n";
         }
       }
     }
   }
 }
 
 }  // namespace blink