| OLD | NEW |
| 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 #ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
| 6 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
| 7 | 7 |
| 8 #include "base/threading/non_thread_safe.h" | 8 #include "base/threading/non_thread_safe.h" |
| 9 #include "cc/output/output_surface.h" | 9 #include "cc/output/output_surface.h" |
| 10 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 overlay_candidate_validator); | 61 overlay_candidate_validator); |
| 62 | 62 |
| 63 // Constructor used by the software implementation. | 63 // Constructor used by the software implementation. |
| 64 BrowserCompositorOutputSurface( | 64 BrowserCompositorOutputSurface( |
| 65 scoped_ptr<cc::SoftwareOutputDevice> software_device, | 65 scoped_ptr<cc::SoftwareOutputDevice> software_device, |
| 66 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager); | 66 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager); |
| 67 | 67 |
| 68 scoped_refptr<ui::CompositorVSyncManager> vsync_manager_; | 68 scoped_refptr<ui::CompositorVSyncManager> vsync_manager_; |
| 69 ReflectorImpl* reflector_; | 69 ReflectorImpl* reflector_; |
| 70 | 70 |
| 71 // True when BeginFrame scheduling is enabled. |
| 72 bool use_begin_frame_scheduling_; |
| 73 |
| 71 private: | 74 private: |
| 72 void Initialize(); | 75 void Initialize(); |
| 73 | 76 |
| 74 scoped_ptr<BrowserCompositorOverlayCandidateValidator> | 77 scoped_ptr<BrowserCompositorOverlayCandidateValidator> |
| 75 overlay_candidate_validator_; | 78 overlay_candidate_validator_; |
| 76 | 79 |
| 77 DISALLOW_COPY_AND_ASSIGN(BrowserCompositorOutputSurface); | 80 DISALLOW_COPY_AND_ASSIGN(BrowserCompositorOutputSurface); |
| 78 }; | 81 }; |
| 79 | 82 |
| 80 } // namespace content | 83 } // namespace content |
| 81 | 84 |
| 82 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 85 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
| OLD | NEW |