content/browser/aura/software_browser_compositor_output_surface.cc - Issue 24257011: Revert "Revert 224496 "Move ui/base/latency_info* to ui/events""

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/browser/aura/software_browser_compositor_output_surface.cc

Issue 24257011: Revert "Revert 224496 "Move ui/base/latency_info* to ui/events"" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix gyp bustage Created 7 years, 3 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

« no previous file with comments | « content/browser/android/in_process/synchronous_input_event_filter.cc ('k') | content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "content/browser/aura/software_browser_compositor_output_surface.h"	5 #include "content/browser/aura/software_browser_compositor_output_surface.h"

6	6

7 #include "base/time/time.h"	7 #include "base/time/time.h"

8 #include "cc/output/compositor_frame.h"	8 #include "cc/output/compositor_frame.h"

9 #include "cc/output/software_output_device.h"	9 #include "cc/output/software_output_device.h"

10 #include "content/browser/renderer_host/render_widget_host_impl.h"	10 #include "content/browser/renderer_host/render_widget_host_impl.h"

11 #include "ui/base/latency_info.h"	11 #include "ui/events/latency_info.h"

12	12

13 namespace content {	13 namespace content {

14	14

15 SoftwareBrowserCompositorOutputSurface::SoftwareBrowserCompositorOutputSurface(	15 SoftwareBrowserCompositorOutputSurface::SoftwareBrowserCompositorOutputSurface(

16 scoped_ptr<cc::SoftwareOutputDevice> software_device)	16 scoped_ptr<cc::SoftwareOutputDevice> software_device)

17 : cc::OutputSurface(software_device.Pass()) {}	17 : cc::OutputSurface(software_device.Pass()) {}

18	18

19 void SoftwareBrowserCompositorOutputSurface::SwapBuffers(	19 void SoftwareBrowserCompositorOutputSurface::SwapBuffers(

20 cc::CompositorFrame* frame) {	20 cc::CompositorFrame* frame) {

21 ui::LatencyInfo latency_info = frame->metadata.latency_info;	21 ui::LatencyInfo latency_info = frame->metadata.latency_info;

22 latency_info.swap_timestamp = base::TimeTicks::HighResNow();	22 latency_info.swap_timestamp = base::TimeTicks::HighResNow();

23 RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);	23 RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);

24 }	24 }

25	25

26 } // namespace content	26 } // namespace content

OLD	NEW