summaryrefslogtreecommitdiffstats
path: root/cc/surfaces/surface.cc
diff options
context:
space:
mode:
authorscottmg <scottmg@chromium.org>2014-09-02 14:55:06 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-02 21:59:20 +0000
commitbefeae62039572a93bd3e4ed981f45ad6f645321 (patch)
treef7fe66015591433071dcebcbeac325c28b5fd40c /cc/surfaces/surface.cc
parent212a1299355dc97c4e45b6997b4901a1cd10f286 (diff)
downloadchromium_src-befeae62039572a93bd3e4ed981f45ad6f645321.zip
chromium_src-befeae62039572a93bd3e4ed981f45ad6f645321.tar.gz
chromium_src-befeae62039572a93bd3e4ed981f45ad6f645321.tar.bz2
Revert of Add LatencyInfo support for Surfaces. (patchset #3 id:40001 of https://codereview.chromium.org/511423004/)
Reason for revert: Failed compile here: http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%20LSan%20Builder/builds/12959/steps/compile/logs/stdio Original issue's description: > Add LatencyInfo support for Surfaces. > > BUG= > > Committed: https://chromium.googlesource.com/chromium/src/+/30ea8cb30b9e0d6fcd037bc434b29bac41196e5e TBR=jamesr@chromium.org,jbauman@chromium.org NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/533913003 Cr-Commit-Position: refs/heads/master@{#293003}
Diffstat (limited to 'cc/surfaces/surface.cc')
-rw-r--r--cc/surfaces/surface.cc14
1 files changed, 0 insertions, 14 deletions
diff --git a/cc/surfaces/surface.cc b/cc/surfaces/surface.cc
index 8f08d63..0e08ec4 100644
--- a/cc/surfaces/surface.cc
+++ b/cc/surfaces/surface.cc
@@ -33,7 +33,6 @@ Surface::~Surface() {
void Surface::QueueFrame(scoped_ptr<CompositorFrame> frame,
const base::Closure& callback) {
- TakeLatencyInfo(&frame->metadata.latency_info);
scoped_ptr<CompositorFrame> previous_frame = current_frame_.Pass();
current_frame_ = frame.Pass();
factory_->ReceiveFromChild(
@@ -61,19 +60,6 @@ const CompositorFrame* Surface::GetEligibleFrame() {
return current_frame_.get();
}
-void Surface::TakeLatencyInfo(std::vector<ui::LatencyInfo>* latency_info) {
- if (!current_frame_)
- return;
- if (latency_info->empty()) {
- current_frame_->metadata.latency_info.swap(*latency_info);
- return;
- }
- std::copy(current_frame_->metadata.latency_info.begin(),
- current_frame_->metadata.latency_info.end(),
- std::back_inserter(*latency_info));
- current_frame_->metadata.latency_info.clear();
-}
-
void Surface::RunDrawCallbacks() {
if (!draw_callback_.is_null()) {
base::Closure callback = draw_callback_;