diff options
| author | glider <glider@chromium.org> | 2015-08-18 06:39:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-18 13:39:51 +0000 |
| commit | 5befb8d4949af90be7ab047b44c7419ef45fd50a (patch) | |
| tree | f08fe30f3f0f53d69157969d09c609f23e70822f /cc/surfaces/display.cc | |
| parent | 17bb371c733b1b0cfcb8ab39ebf4c8e6050c7032 (diff) | |
| download | chromium_src-5befb8d4949af90be7ab047b44c7419ef45fd50a.zip chromium_src-5befb8d4949af90be7ab047b44c7419ef45fd50a.tar.gz chromium_src-5befb8d4949af90be7ab047b44c7419ef45fd50a.tar.bz2 | |
Revert of Change LatencyInfo to use Flow API v2. (patchset #2 id:20001 of https://codereview.chromium.org/1291243002/ )
Reason for revert:
I believe this had caused use-after-free errors in content_unittests (http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28valgrind%29%284%29/builds/44367)
See also crbug.com/522049.
BUG=522049
Original issue's description:
> Change LatencyInfo to use Flow API v2.
>
> BUG=https://github.com/catapult-project/catapult/issues/1079
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/b0bdf54635605d8e639eb0d213ae463e8805cfb0
> Cr-Commit-Position: refs/heads/master@{#343738}
TBR=dsinclair@chromium.org,nduca@chromium.org,vmpstr@chromium.org,yufetus@chromium.org,jdduke@chromium.org,sievers@chromium.org,miletus@chromium.org,yuhaoz@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=https://github.com/catapult-project/catapult/issues/1079
Review URL: https://codereview.chromium.org/1295533005
Cr-Commit-Position: refs/heads/master@{#343902}
Diffstat (limited to 'cc/surfaces/display.cc')
| -rw-r--r-- | cc/surfaces/display.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc index 6bb12dc..5b69964 100644 --- a/cc/surfaces/display.cc +++ b/cc/surfaces/display.cc @@ -235,10 +235,9 @@ bool Display::DrawAndSwap() { if (should_swap) { swapped_since_resize_ = true; for (auto& latency : frame->metadata.latency_info) { - TRACE_EVENT_WITH_FLOW1("input,benchmark", "LatencyInfo.Flow", - TRACE_ID_DONT_MANGLE(latency.trace_id()), - TRACE_EVENT_FLAG_FLOW_IN | TRACE_EVENT_FLAG_FLOW_OUT, - "step", "Display::DrawAndSwap"); + TRACE_EVENT_FLOW_STEP0("input,benchmark", "LatencyInfo.Flow", + TRACE_ID_DONT_MANGLE(latency.trace_id()), + "Display::DrawAndSwap"); } benchmark_instrumentation::IssueDisplayRenderingStatsEvent(); renderer_->SwapBuffers(frame->metadata); |