ui/gfx: Add ToString() function to Rect class.

So we don't need to override operator<< for Rect class. R=sky@chromium.org Review URL: http://codereview.chromium.org/8066006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103158 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Sep 28, 2011 · e0425ec · e0425ec
1 parent 5d6920c
commit e0425ec
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 28 deletions.
diff --git a/printing/page_setup_unittest.cc b/printing/page_setup_unittest.cc
@@ -68,29 +68,32 @@ TEST(PageSetupTest, Random) {
 
   // Test values.
   EXPECT_EQ(page_size, setup.physical_size()) << seed << " " <<
-      page_size.ToString() << " " << printable_area << " " << kTextHeight;
+      page_size.ToString() << " " << printable_area.ToString() <<
+      " " << kTextHeight;
   EXPECT_EQ(overlay_area, setup.overlay_area()) << seed << " " <<
-      page_size.ToString() << " " << printable_area << " " << kTextHeight;
+      page_size.ToString() << " " << printable_area.ToString() <<
+      " " << kTextHeight;
   EXPECT_EQ(content_area, setup.content_area()) << seed << " " <<
-      page_size.ToString() << " " << printable_area << " " << kTextHeight;
+      page_size.ToString() << " " << printable_area.ToString() <<
+      " " << kTextHeight;
 
   EXPECT_EQ(effective_margins.header, setup.effective_margins().header) <<
-      seed << " " << page_size.ToString() << " " << printable_area <<
+      seed << " " << page_size.ToString() << " " << printable_area.ToString() <<
       " " << kTextHeight;
   EXPECT_EQ(effective_margins.footer, setup.effective_margins().footer) <<
-      seed << " " << page_size.ToString() << " " << printable_area <<
+      seed << " " << page_size.ToString() << " " << printable_area.ToString() <<
       " " << kTextHeight;
   EXPECT_EQ(effective_margins.left, setup.effective_margins().left) << seed <<
-      " " << page_size.ToString() << " " << printable_area <<
+      " " << page_size.ToString() << " " << printable_area.ToString() <<
       " " << kTextHeight;
   EXPECT_EQ(effective_margins.top, setup.effective_margins().top) << seed <<
-      " " << page_size.ToString() << " " << printable_area <<
+      " " << page_size.ToString() << " " << printable_area.ToString() <<
       " " << kTextHeight;
   EXPECT_EQ(effective_margins.right, setup.effective_margins().right) << seed <<
-      " " << page_size.ToString() << " " << printable_area <<
+      " " << page_size.ToString() << " " << printable_area.ToString() <<
       " " << kTextHeight;
   EXPECT_EQ(effective_margins.bottom, setup.effective_margins().bottom) <<
-      seed << " " << page_size.ToString() << " " << printable_area <<
+      seed << " " << page_size.ToString() << " " << printable_area.ToString() <<
        " " << kTextHeight;
 }
 
@@ -131,28 +134,30 @@ TEST(PageSetupTest, HardCoded) {
 
   // Test values.
   EXPECT_EQ(page_size, setup.physical_size()) << " " << page_size.ToString() <<
-      " " << printable_area << " " << kTextHeight;
+      " " << printable_area.ToString() << " " << kTextHeight;
   EXPECT_EQ(overlay_area, setup.overlay_area()) << " " <<
-      page_size.ToString() <<  " " << printable_area << " " << kTextHeight;
+      page_size.ToString() <<  " " << printable_area.ToString() <<
+      " " << kTextHeight;
   EXPECT_EQ(content_area, setup.content_area()) << " " <<
-      page_size.ToString() <<  " " << printable_area << " " << kTextHeight;
+      page_size.ToString() <<  " " << printable_area.ToString() <<
+      " " << kTextHeight;
 
   EXPECT_EQ(effective_margins.header, setup.effective_margins().header) <<
       " " << page_size.ToString() << " " <<
-      printable_area << " " << kTextHeight;
+      printable_area.ToString() << " " << kTextHeight;
   EXPECT_EQ(effective_margins.footer, setup.effective_margins().footer) <<
-      " " << page_size.ToString() << " " << printable_area <<
+      " " << page_size.ToString() << " " << printable_area.ToString() <<
       " " << kTextHeight;
   EXPECT_EQ(effective_margins.left, setup.effective_margins().left) <<
-      " " << page_size.ToString() << " " << printable_area <<
+      " " << page_size.ToString() << " " << printable_area.ToString() <<
       " " << kTextHeight;
   EXPECT_EQ(effective_margins.top, setup.effective_margins().top) <<
-      " " << page_size.ToString() << " " << printable_area <<
+      " " << page_size.ToString() << " " << printable_area.ToString() <<
       " " << kTextHeight;
   EXPECT_EQ(effective_margins.right, setup.effective_margins().right) <<
-      " " << page_size.ToString() << " " << printable_area <<
+      " " << page_size.ToString() << " " << printable_area.ToString() <<
       " " << kTextHeight;
   EXPECT_EQ(effective_margins.bottom, setup.effective_margins().bottom) <<
-      " " << page_size.ToString() << " " << printable_area <<
+      " " << page_size.ToString() << " " << printable_area.ToString() <<
       " " << kTextHeight;
 }
diff --git a/ui/gfx/rect.cc b/ui/gfx/rect.cc
@@ -15,8 +15,7 @@
 #include <cairo.h>
 #endif
 
-#include <ostream>
-
+#include "base/stringprintf.h"
 #include "ui/gfx/insets.h"
 
 namespace {
@@ -54,6 +53,8 @@ Rect::Rect(const gfx::Point& origin, const gfx::Size& size)
     : origin_(origin), size_(size) {
 }
 
+Rect::~Rect() {}
+
 #if defined(OS_WIN)
 Rect::Rect(const RECT& r)
     : origin_(r.left, r.top) {
@@ -109,7 +110,6 @@ Rect& Rect::operator=(const cairo_rectangle_int_t& r) {
 }
 #endif
 
-
 void Rect::SetRect(int x, int y, int width, int height) {
   origin_.SetPoint(x, y);
   set_width(width);
@@ -273,8 +273,10 @@ bool Rect::SharesEdgeWith(const gfx::Rect& rect) const {
              (y() == rect.bottom() || bottom() == rect.y()));
 }
 
-std::ostream& operator<<(std::ostream& out, const gfx::Rect& r) {
-  return out << r.origin().ToString() << " " << r.size().ToString();
+std::string Rect::ToString() const {
+  return base::StringPrintf("%s %s",
+                            origin_.ToString().c_str(),
+                            size_.ToString().c_str());
 }
 
 }  // namespace gfx
diff --git a/ui/gfx/rect.h b/ui/gfx/rect.h
@@ -13,7 +13,7 @@
 #define UI_GFX_RECT_H_
 #pragma once
 
-#include <iosfwd>
+#include <string>
 
 #include "ui/gfx/point.h"
 #include "ui/gfx/size.h"
@@ -50,7 +50,7 @@ class UI_EXPORT Rect {
   explicit Rect(const gfx::Size& size);
   Rect(const gfx::Point& origin, const gfx::Size& size);
 
-  ~Rect() {}
+  ~Rect();
 
 #if defined(OS_WIN)
   Rect& operator=(const RECT& r);
@@ -185,13 +185,13 @@ class UI_EXPORT Rect {
   // same height) with the given rectangle, and the rectangles do not overlap.
   bool SharesEdgeWith(const gfx::Rect& rect) const;
 
+  std::string ToString() const;
+
  private:
   gfx::Point origin_;
   gfx::Size size_;
 };
 
-UI_EXPORT std::ostream& operator<<(std::ostream& out, const gfx::Rect& r);
-
 }  // namespace gfx
 
 #endif  // UI_GFX_RECT_H_
diff --git a/webkit/glue/web_io_operators.cc b/webkit/glue/web_io_operators.cc
@@ -27,7 +27,7 @@ std::ostream& operator<<(std::ostream& out, const WebPoint& p) {
 }
 
 std::ostream& operator<<(std::ostream& out, const WebRect& p) {
-  return out << static_cast<gfx::Rect>(p);
+  return out << static_cast<gfx::Rect>(p).ToString();
 }
 
 }  // namespace WebKit