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 #include "ui/ozone/platform/dri/gbm_surfaceless.h" | 5 #include "ui/ozone/platform/dri/gbm_surfaceless.h" |
6 | 6 |
| 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" |
7 #include "ui/ozone/platform/dri/dri_vsync_provider.h" | 9 #include "ui/ozone/platform/dri/dri_vsync_provider.h" |
8 #include "ui/ozone/platform/dri/dri_window_delegate.h" | 10 #include "ui/ozone/platform/dri/dri_window_delegate.h" |
9 #include "ui/ozone/platform/dri/dri_wrapper.h" | 11 #include "ui/ozone/platform/dri/dri_wrapper.h" |
10 #include "ui/ozone/platform/dri/drm_device_manager.h" | 12 #include "ui/ozone/platform/dri/drm_device_manager.h" |
11 #include "ui/ozone/platform/dri/gbm_buffer.h" | 13 #include "ui/ozone/platform/dri/gbm_buffer.h" |
12 #include "ui/ozone/platform/dri/hardware_display_controller.h" | 14 #include "ui/ozone/platform/dri/hardware_display_controller.h" |
13 | 15 |
14 namespace ui { | 16 namespace ui { |
15 | 17 |
16 GbmSurfaceless::GbmSurfaceless(DriWindowDelegate* window_delegate, | 18 GbmSurfaceless::GbmSurfaceless(DriWindowDelegate* window_delegate, |
17 DrmDeviceManager* drm_device_manager) | 19 DrmDeviceManager* drm_device_manager) |
18 : window_delegate_(window_delegate), | 20 : window_delegate_(window_delegate), |
19 drm_device_manager_(drm_device_manager) { | 21 drm_device_manager_(drm_device_manager) { |
20 } | 22 } |
21 | 23 |
22 GbmSurfaceless::~GbmSurfaceless() {} | 24 GbmSurfaceless::~GbmSurfaceless() {} |
23 | 25 |
24 intptr_t GbmSurfaceless::GetNativeWindow() { | 26 intptr_t GbmSurfaceless::GetNativeWindow() { |
25 NOTREACHED(); | 27 NOTREACHED(); |
26 return 0; | 28 return 0; |
27 } | 29 } |
28 | 30 |
29 bool GbmSurfaceless::ResizeNativeWindow(const gfx::Size& viewport_size) { | 31 bool GbmSurfaceless::ResizeNativeWindow(const gfx::Size& viewport_size) { |
30 return true; | 32 return true; |
31 } | 33 } |
32 | 34 |
33 bool GbmSurfaceless::OnSwapBuffers() { | 35 bool GbmSurfaceless::OnSwapBuffers() { |
34 NOTREACHED(); | 36 HardwareDisplayController* controller = window_delegate_->GetController(); |
35 return false; | 37 if (!controller) |
| 38 return true; |
| 39 |
| 40 return controller->SchedulePageFlip(true /* is_sync */, |
| 41 base::Bind(&base::DoNothing)); |
36 } | 42 } |
37 | 43 |
38 bool GbmSurfaceless::OnSwapBuffersAsync( | 44 bool GbmSurfaceless::OnSwapBuffersAsync( |
39 const SwapCompletionCallback& callback) { | 45 const SwapCompletionCallback& callback) { |
40 HardwareDisplayController* controller = window_delegate_->GetController(); | 46 HardwareDisplayController* controller = window_delegate_->GetController(); |
41 if (!controller) { | 47 if (!controller) { |
42 callback.Run(); | 48 callback.Run(); |
43 return true; | 49 return true; |
44 } | 50 } |
45 | 51 |
46 return controller->SchedulePageFlip(callback); | 52 return controller->SchedulePageFlip(false /* is_sync */, callback); |
47 } | 53 } |
48 | 54 |
49 scoped_ptr<gfx::VSyncProvider> GbmSurfaceless::CreateVSyncProvider() { | 55 scoped_ptr<gfx::VSyncProvider> GbmSurfaceless::CreateVSyncProvider() { |
50 return make_scoped_ptr(new DriVSyncProvider(window_delegate_)); | 56 return make_scoped_ptr(new DriVSyncProvider(window_delegate_)); |
51 } | 57 } |
52 | 58 |
53 bool GbmSurfaceless::IsUniversalDisplayLinkDevice() { | 59 bool GbmSurfaceless::IsUniversalDisplayLinkDevice() { |
54 if (!drm_device_manager_) | 60 if (!drm_device_manager_) |
55 return false; | 61 return false; |
56 scoped_refptr<DriWrapper> drm_primary = | 62 scoped_refptr<DriWrapper> drm_primary = |
57 drm_device_manager_->GetDrmDevice(gfx::kNullAcceleratedWidget); | 63 drm_device_manager_->GetDrmDevice(gfx::kNullAcceleratedWidget); |
58 DCHECK(drm_primary); | 64 DCHECK(drm_primary); |
59 | 65 |
60 HardwareDisplayController* controller = window_delegate_->GetController(); | 66 HardwareDisplayController* controller = window_delegate_->GetController(); |
61 if (!controller) | 67 if (!controller) |
62 return false; | 68 return false; |
63 scoped_refptr<DriWrapper> drm = controller->GetAllocationDriWrapper(); | 69 scoped_refptr<DriWrapper> drm = controller->GetAllocationDriWrapper(); |
64 DCHECK(drm); | 70 DCHECK(drm); |
65 | 71 |
66 return drm_primary != drm; | 72 return drm_primary != drm; |
67 } | 73 } |
68 | 74 |
69 } // namespace ui | 75 } // namespace ui |
OLD | NEW |