Revert of Add builders for tracing event's structural arguments

cc/base/math_util.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_BASE_MATH_UTIL_H_
 #define CC_BASE_MATH_UTIL_H_
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "ui/gfx/box_f.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/point_f.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
 
-namespace base {
-class Value;
-namespace debug {
-class TracedValue;
-}
-}
+namespace base { class Value; }
 
 namespace gfx {
 class QuadF;
 class Rect;
 class RectF;
 class Transform;
 class Vector2dF;
 class Vector2d;
 }
 
@@ skipping 136 matching lines @@
   static float SmallestAngleBetweenVectors(const gfx::Vector2dF& v1,
                                            const gfx::Vector2dF& v2);
 
   // Projects the |source| vector onto |destination|. Neither vector is assumed
   // to be normalized.
   static gfx::Vector2dF ProjectVector(const gfx::Vector2dF& source,
                                       const gfx::Vector2dF& destination);
 
   // Conversion to value.
   static scoped_ptr<base::Value> AsValue(const gfx::Size& s);
+  static scoped_ptr<base::Value> AsValue(const gfx::SizeF& s);
   static scoped_ptr<base::Value> AsValue(const gfx::Rect& r);
   static bool FromValue(const base::Value*, gfx::Rect* out_rect);
   static scoped_ptr<base::Value> AsValue(const gfx::PointF& q);
-
-  static void AddToTracedValue(const gfx::Size& s,
-                               base::debug::TracedValue* res);
-  static void AddToTracedValue(const gfx::SizeF& s,
-                               base::debug::TracedValue* res);
-  static void AddToTracedValue(const gfx::Rect& r,
-                               base::debug::TracedValue* res);
-  static void AddToTracedValue(const gfx::PointF& q,
-                               base::debug::TracedValue* res);
-  static void AddToTracedValue(const gfx::Point3F&,
-                               base::debug::TracedValue* res);
-  static void AddToTracedValue(const gfx::Vector2d& v,
-                               base::debug::TracedValue* res);
-  static void AddToTracedValue(const gfx::QuadF& q,
-                               base::debug::TracedValue* res);
-  static void AddToTracedValue(const gfx::RectF& rect,
-                               base::debug::TracedValue* res);
-  static void AddToTracedValue(const gfx::Transform& transform,
-                               base::debug::TracedValue* res);
-  static void AddToTracedValue(const gfx::BoxF& box,
-                               base::debug::TracedValue* res);
+  static scoped_ptr<base::Value> AsValue(const gfx::Point3F&);
+  static scoped_ptr<base::Value> AsValue(const gfx::Vector2d& v);
+  static scoped_ptr<base::Value> AsValue(const gfx::QuadF& q);
+  static scoped_ptr<base::Value> AsValue(const gfx::RectF& rect);
+  static scoped_ptr<base::Value> AsValue(const gfx::Transform& transform);
+  static scoped_ptr<base::Value> AsValue(const gfx::BoxF& box);
 
   // Returns a base::Value representation of the floating point value.
   // If the value is inf, returns max double/float representation.
-  static double AsDoubleSafely(double value);
-  static float AsFloatSafely(float value);
+  static scoped_ptr<base::Value> AsValueSafely(double value);
+  static scoped_ptr<base::Value> AsValueSafely(float value);
 };
 
 }  // namespace cc
 
 #endif  // CC_BASE_MATH_UTIL_H_