OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/offscreen_browser_compositor_output_surface .h" | 5 #include "content/browser/compositor/offscreen_browser_compositor_output_surface .h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "cc/output/compositor_frame.h" | 8 #include "cc/output/compositor_frame.h" |
9 #include "cc/output/compositor_frame_ack.h" | 9 #include "cc/output/compositor_frame_ack.h" |
10 #include "cc/output/gl_frame_data.h" | 10 #include "cc/output/gl_frame_data.h" |
(...skipping 16 matching lines...) Expand all Loading... | |
27 | 27 |
28 namespace content { | 28 namespace content { |
29 | 29 |
30 OffscreenBrowserCompositorOutputSurface:: | 30 OffscreenBrowserCompositorOutputSurface:: |
31 OffscreenBrowserCompositorOutputSurface( | 31 OffscreenBrowserCompositorOutputSurface( |
32 const scoped_refptr<ContextProviderCommandBuffer>& context, | 32 const scoped_refptr<ContextProviderCommandBuffer>& context, |
33 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, | 33 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, |
34 scoped_ptr<BrowserCompositorOverlayCandidateValidator> | 34 scoped_ptr<BrowserCompositorOverlayCandidateValidator> |
35 overlay_candidate_validator) | 35 overlay_candidate_validator) |
36 : BrowserCompositorOutputSurface(context, | 36 : BrowserCompositorOutputSurface(context, |
37 nullptr, | |
piman
2015/07/23 20:44:52
Any reason we don't pass the worker context here?
reveman
2015/07/24 17:49:15
Added a worker context here in latest patch.
| |
37 vsync_manager, | 38 vsync_manager, |
38 overlay_candidate_validator.Pass()), | 39 overlay_candidate_validator.Pass()), |
39 fbo_(0), | 40 fbo_(0), |
40 is_backbuffer_discarded_(false), | 41 is_backbuffer_discarded_(false), |
41 weak_ptr_factory_(this) { | 42 weak_ptr_factory_(this) { |
42 capabilities_.max_frames_pending = 1; | 43 capabilities_.max_frames_pending = 1; |
43 capabilities_.uses_default_gl_framebuffer = false; | 44 capabilities_.uses_default_gl_framebuffer = false; |
44 } | 45 } |
45 | 46 |
46 OffscreenBrowserCompositorOutputSurface:: | 47 OffscreenBrowserCompositorOutputSurface:: |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
143 #if defined(OS_MACOSX) | 144 #if defined(OS_MACOSX) |
144 | 145 |
145 bool OffscreenBrowserCompositorOutputSurface:: | 146 bool OffscreenBrowserCompositorOutputSurface:: |
146 SurfaceShouldNotShowFramesAfterSuspendForRecycle() const { | 147 SurfaceShouldNotShowFramesAfterSuspendForRecycle() const { |
147 return true; | 148 return true; |
148 } | 149 } |
149 | 150 |
150 #endif | 151 #endif |
151 | 152 |
152 } // namespace content | 153 } // namespace content |
OLD | NEW |