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

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

Issue 2511273002: Decouple BrowserCompositorOutputSurface from BeginFrameSource. (Closed)
Patch Set: Another attempt to fix the crash Created 4 years, 1 month 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 <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/threading/thread_task_runner_handle.h" 12 #include "base/threading/thread_task_runner_handle.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "cc/output/output_surface_client.h" 15 #include "cc/output/output_surface_client.h"
16 #include "cc/output/output_surface_frame.h" 16 #include "cc/output/output_surface_frame.h"
17 #include "cc/output/software_output_device.h" 17 #include "cc/output/software_output_device.h"
18 #include "content/browser/renderer_host/render_widget_host_impl.h" 18 #include "content/browser/renderer_host/render_widget_host_impl.h"
19 #include "ui/events/latency_info.h" 19 #include "ui/events/latency_info.h"
20 #include "ui/gfx/vsync_provider.h" 20 #include "ui/gfx/vsync_provider.h"
21 21
22 namespace content { 22 namespace content {
23 23
24 SoftwareBrowserCompositorOutputSurface::SoftwareBrowserCompositorOutputSurface( 24 SoftwareBrowserCompositorOutputSurface::SoftwareBrowserCompositorOutputSurface(
25 std::unique_ptr<cc::SoftwareOutputDevice> software_device, 25 std::unique_ptr<cc::SoftwareOutputDevice> software_device,
26 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, 26 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
27 cc::SyntheticBeginFrameSource* begin_frame_source,
28 scoped_refptr<base::SingleThreadTaskRunner> task_runner) 27 scoped_refptr<base::SingleThreadTaskRunner> task_runner)
29 : BrowserCompositorOutputSurface(std::move(software_device), 28 : BrowserCompositorOutputSurface(std::move(software_device), vsync_manager),
30 vsync_manager,
31 begin_frame_source),
32 task_runner_(std::move(task_runner)), 29 task_runner_(std::move(task_runner)),
33 weak_factory_(this) {} 30 weak_factory_(this) {}
34 31
35 SoftwareBrowserCompositorOutputSurface:: 32 SoftwareBrowserCompositorOutputSurface::
36 ~SoftwareBrowserCompositorOutputSurface() { 33 ~SoftwareBrowserCompositorOutputSurface() {
37 } 34 }
38 35
39 void SoftwareBrowserCompositorOutputSurface::BindToClient( 36 void SoftwareBrowserCompositorOutputSurface::BindToClient(
40 cc::OutputSurfaceClient* client) { 37 cc::OutputSurfaceClient* client) {
41 DCHECK(client); 38 DCHECK(client);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 return 0; 113 return 0;
117 } 114 }
118 115
119 #if defined(OS_MACOSX) 116 #if defined(OS_MACOSX)
120 void SoftwareBrowserCompositorOutputSurface::SetSurfaceSuspendedForRecycle( 117 void SoftwareBrowserCompositorOutputSurface::SetSurfaceSuspendedForRecycle(
121 bool suspended) { 118 bool suspended) {
122 } 119 }
123 #endif 120 #endif
124 121
125 } // namespace content 122 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698