diff options
| author | jbroman <jbroman@chromium.org> | 2016-03-14 15:24:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-14 22:26:37 +0000 |
| commit | 04445e7446501142f247f307e93985731763ddbd (patch) | |
| tree | 02cbbb49f0320be8f3274b028b6e9f66cc375904 /cc | |
| parent | 0348fa65c3d808f854f745fb9f8f185a5b74b922 (diff) | |
| download | chromium_src-04445e7446501142f247f307e93985731763ddbd.zip chromium_src-04445e7446501142f247f307e93985731763ddbd.tar.gz chromium_src-04445e7446501142f247f307e93985731763ddbd.tar.bz2 | |
cc: Fix CompositingDisplayItem::AsValueInto to only append one item.
Previously two strings were added into the array, which appear in tracing as
two separate display items, each containing part of the information.
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1804703003
Cr-Commit-Position: refs/heads/master@{#381089}
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/playback/compositing_display_item.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/cc/playback/compositing_display_item.cc b/cc/playback/compositing_display_item.cc index 964406a0..548f54a 100644 --- a/cc/playback/compositing_display_item.cc +++ b/cc/playback/compositing_display_item.cc @@ -117,14 +117,16 @@ void CompositingDisplayItem::Raster( void CompositingDisplayItem::AsValueInto( const gfx::Rect& visual_rect, base::trace_event::TracedValue* array) const { - array->AppendString(base::StringPrintf( + std::string info = base::StringPrintf( "CompositingDisplayItem alpha: %d, xfermode: %d, visualRect: [%s]", - alpha_, xfermode_, visual_rect.ToString().c_str())); - if (has_bounds_) - array->AppendString(base::StringPrintf( - ", bounds: [%f, %f, %f, %f]", static_cast<float>(bounds_.x()), + alpha_, xfermode_, visual_rect.ToString().c_str()); + if (has_bounds_) { + base::StringAppendF( + &info, ", bounds: [%f, %f, %f, %f]", static_cast<float>(bounds_.x()), static_cast<float>(bounds_.y()), static_cast<float>(bounds_.width()), - static_cast<float>(bounds_.height()))); + static_cast<float>(bounds_.height())); + } + array->AppendString(info); } size_t CompositingDisplayItem::ExternalMemoryUsage() const { |