Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2175)

Unified Diff: cc/resources/picture.cc

Issue 263653002: Move traced_value.* from cc/debug/ to base/debug/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added BASE_EXPORT Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/image_raster_worker_pool.cc ('k') | cc/resources/picture_pile_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « cc/resources/image_raster_worker_pool.cc ('k') | cc/resources/picture_pile_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698