| Index: cc/quads/shared_quad_state.cc
|
| diff --git a/cc/quads/shared_quad_state.cc b/cc/quads/shared_quad_state.cc
|
| index 3832886487d70d3f1a7eb6b737013427a107babc..19cf2d99242b92ba2dff08fbc1552ea3cb973b99 100644
|
| --- a/cc/quads/shared_quad_state.cc
|
| +++ b/cc/quads/shared_quad_state.cc
|
| @@ -4,9 +4,9 @@
|
|
|
| #include "cc/quads/shared_quad_state.h"
|
|
|
| +#include "base/debug/traced_value.h"
|
| #include "base/values.h"
|
| #include "cc/base/math_util.h"
|
| -#include "cc/debug/traced_value.h"
|
|
|
| namespace cc {
|
|
|
| @@ -59,9 +59,11 @@ scoped_ptr<base::Value> SharedQuadState::AsValue() const {
|
| value->Set("clip_rect", MathUtil::AsValue(clip_rect).release());
|
| value->SetDouble("opacity", opacity);
|
| value->SetString("blend_mode", SkXfermode::ModeName(blend_mode));
|
| - TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
|
| + base::debug::TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
|
| TRACE_DISABLED_BY_DEFAULT("cc.debug.quads"),
|
| - value.get(), "cc::SharedQuadState", this);
|
| + value.get(),
|
| + "cc::SharedQuadState",
|
| + this);
|
| return value.PassAs<base::Value>();
|
| }
|
|
|
|
|