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

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

Issue 1124523003: Revert of Enable BeginFrame scheduling on aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/compositor/software_browser_compositor_output_surface. h" 5 #include "content/browser/compositor/software_browser_compositor_output_surface. h"
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "cc/output/compositor_frame.h" 10 #include "cc/output/compositor_frame.h"
11 #include "cc/output/output_surface_client.h" 11 #include "cc/output/output_surface_client.h"
12 #include "cc/output/software_output_device.h" 12 #include "cc/output/software_output_device.h"
13 #include "content/browser/renderer_host/render_widget_host_impl.h" 13 #include "content/browser/renderer_host/render_widget_host_impl.h"
14 #include "ui/events/latency_info.h" 14 #include "ui/events/latency_info.h"
15 #include "ui/gfx/vsync_provider.h" 15 #include "ui/gfx/vsync_provider.h"
16 16
17 namespace content { 17 namespace content {
18 18
19 SoftwareBrowserCompositorOutputSurface::SoftwareBrowserCompositorOutputSurface( 19 SoftwareBrowserCompositorOutputSurface::SoftwareBrowserCompositorOutputSurface(
20 scoped_ptr<cc::SoftwareOutputDevice> software_device) 20 scoped_ptr<cc::SoftwareOutputDevice> software_device,
21 : BrowserCompositorOutputSurface(software_device.Pass()), 21 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager)
22 : BrowserCompositorOutputSurface(software_device.Pass(),
23 vsync_manager),
22 weak_factory_(this) { 24 weak_factory_(this) {
23 } 25 }
24 26
25 SoftwareBrowserCompositorOutputSurface:: 27 SoftwareBrowserCompositorOutputSurface::
26 ~SoftwareBrowserCompositorOutputSurface() { 28 ~SoftwareBrowserCompositorOutputSurface() {
27 } 29 }
28 30
29 void SoftwareBrowserCompositorOutputSurface::SwapBuffers( 31 void SoftwareBrowserCompositorOutputSurface::SwapBuffers(
30 cc::CompositorFrame* frame) { 32 cc::CompositorFrame* frame) {
31 base::TimeTicks swap_time = base::TimeTicks::Now(); 33 base::TimeTicks swap_time = base::TimeTicks::Now();
(...skipping 30 matching lines...) Expand all
62 bool suspended) { 64 bool suspended) {
63 } 65 }
64 66
65 bool SoftwareBrowserCompositorOutputSurface:: 67 bool SoftwareBrowserCompositorOutputSurface::
66 SurfaceShouldNotShowFramesAfterSuspendForRecycle() const { 68 SurfaceShouldNotShowFramesAfterSuspendForRecycle() const {
67 return false; 69 return false;
68 } 70 }
69 #endif 71 #endif
70 72
71 } // namespace content 73 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698