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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/resources/picture.h" 5 #include "cc/resources/picture.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 10
11 #include "base/base64.h" 11 #include "base/base64.h"
12 #include "base/debug/trace_event.h" 12 #include "base/debug/trace_event.h"
13 #include "base/debug/traced_value.h"
13 #include "base/values.h" 14 #include "base/values.h"
14 #include "cc/base/math_util.h" 15 #include "cc/base/math_util.h"
15 #include "cc/base/util.h" 16 #include "cc/base/util.h"
16 #include "cc/debug/traced_picture.h" 17 #include "cc/debug/traced_picture.h"
17 #include "cc/debug/traced_value.h"
18 #include "cc/layers/content_layer_client.h" 18 #include "cc/layers/content_layer_client.h"
19 #include "skia/ext/pixel_ref_utils.h" 19 #include "skia/ext/pixel_ref_utils.h"
20 #include "third_party/skia/include/core/SkCanvas.h" 20 #include "third_party/skia/include/core/SkCanvas.h"
21 #include "third_party/skia/include/core/SkData.h" 21 #include "third_party/skia/include/core/SkData.h"
22 #include "third_party/skia/include/core/SkDrawFilter.h" 22 #include "third_party/skia/include/core/SkDrawFilter.h"
23 #include "third_party/skia/include/core/SkPaint.h" 23 #include "third_party/skia/include/core/SkPaint.h"
24 #include "third_party/skia/include/core/SkPictureRecorder.h" 24 #include "third_party/skia/include/core/SkPictureRecorder.h"
25 #include "third_party/skia/include/core/SkStream.h" 25 #include "third_party/skia/include/core/SkStream.h"
26 #include "third_party/skia/include/utils/SkNullCanvas.h" 26 #include "third_party/skia/include/utils/SkNullCanvas.h"
27 #include "third_party/skia/include/utils/SkPictureUtils.h" 27 #include "third_party/skia/include/utils/SkPictureUtils.h"
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 current_pixel_refs_ = &iter->second; 582 current_pixel_refs_ = &iter->second;
583 current_index_ = 0; 583 current_index_ = 0;
584 break; 584 break;
585 } 585 }
586 return *this; 586 return *this;
587 } 587 }
588 588
589 scoped_refptr<base::debug::ConvertableToTraceFormat> 589 scoped_refptr<base::debug::ConvertableToTraceFormat>
590 Picture::AsTraceableRasterData(float scale) const { 590 Picture::AsTraceableRasterData(float scale) const {
591 scoped_ptr<base::DictionaryValue> raster_data(new base::DictionaryValue()); 591 scoped_ptr<base::DictionaryValue> raster_data(new base::DictionaryValue());
592 raster_data->Set("picture_id", TracedValue::CreateIDRef(this).release()); 592 raster_data->Set("picture_id",
593 base::debug::TracedValue::CreateIDRef(this).release());
593 raster_data->SetDouble("scale", scale); 594 raster_data->SetDouble("scale", scale);
594 return TracedValue::FromValue(raster_data.release()); 595 return base::debug::TracedValue::FromValue(raster_data.release());
595 } 596 }
596 597
597 scoped_refptr<base::debug::ConvertableToTraceFormat> 598 scoped_refptr<base::debug::ConvertableToTraceFormat>
598 Picture::AsTraceableRecordData() const { 599 Picture::AsTraceableRecordData() const {
599 scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue()); 600 scoped_ptr<base::DictionaryValue> record_data(new base::DictionaryValue());
600 record_data->Set("picture_id", TracedValue::CreateIDRef(this).release()); 601 record_data->Set("picture_id",
602 base::debug::TracedValue::CreateIDRef(this).release());
601 record_data->Set("layer_rect", MathUtil::AsValue(layer_rect_).release()); 603 record_data->Set("layer_rect", MathUtil::AsValue(layer_rect_).release());
602 return TracedValue::FromValue(record_data.release()); 604 return base::debug::TracedValue::FromValue(record_data.release());
603 } 605 }
604 606
605 } // namespace cc 607 } // namespace cc
OLDNEW
« 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