Index: cc/resources/picture.cc |
diff --git a/cc/resources/picture.cc b/cc/resources/picture.cc |
index 7147a156b0e28afa0b2b5151c85e9a57d916a3fd..9f257f9ce63092eba608ad84cd2a046c9c73a1e9 100644 |
--- a/cc/resources/picture.cc |
+++ b/cc/resources/picture.cc |
@@ -10,11 +10,11 @@ |
#include "base/base64.h" |
#include "base/debug/trace_event.h" |
+#include "base/debug/traced_value.h" |
#include "base/values.h" |
#include "cc/base/math_util.h" |
#include "cc/base/util.h" |
#include "cc/debug/traced_picture.h" |
-#include "cc/debug/traced_value.h" |
#include "cc/layers/content_layer_client.h" |
#include "skia/ext/pixel_ref_utils.h" |
#include "third_party/skia/include/core/SkCanvas.h" |
@@ -589,17 +589,19 @@ Picture::PixelRefIterator& Picture::PixelRefIterator::operator++() { |
scoped_refptr<base::debug::ConvertableToTraceFormat> |
Picture::AsTraceableRasterData(float scale) const { |
scoped_ptr<base::DictionaryValue> raster_data(new base::DictionaryValue()); |
- raster_data->Set("picture_id", TracedValue::CreateIDRef(this).release()); |
+ raster_data->Set("picture_id", |
+ base::debug::TracedValue::CreateIDRef(this).release()); |
raster_data->SetDouble("scale", scale); |
- return TracedValue::FromValue(raster_data.release()); |
+ return base::debug::TracedValue::FromValue(raster_data.release()); |
} |
scoped_refptr<base::debug::ConvertableToTraceFormat> |
Picture::AsTraceableRecordData() const { |
scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue()); |
- record_data->Set("picture_id", TracedValue::CreateIDRef(this).release()); |
+ record_data->Set("picture_id", |
+ base::debug::TracedValue::CreateIDRef(this).release()); |
record_data->Set("layer_rect", MathUtil::AsValue(layer_rect_).release()); |
- return TracedValue::FromValue(record_data.release()); |
+ return base::debug::TracedValue::FromValue(record_data.release()); |
} |
} // namespace cc |