Chromium Code Reviews| 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/dri_vsync_provider.h" | 5 #include "ui/ozone/platform/dri/dri_vsync_provider.h" |
| 6 | 6 |
| 7 #include "base/time/time.h" | 7 #include "base/time/time.h" |
| 8 #include "ui/ozone/platform/dri/dri_window_delegate.h" | 8 #include "ui/ozone/platform/dri/dri_window_delegate.h" |
| 9 #include "ui/ozone/platform/dri/hardware_display_controller.h" | 9 #include "ui/ozone/platform/dri/hardware_display_controller.h" |
| 10 | 10 |
| 11 namespace ui { | 11 namespace ui { |
| 12 | 12 |
| 13 DriVSyncProvider::DriVSyncProvider(DriWindowDelegate* window_delegate) | 13 DriVSyncProvider::DriVSyncProvider(DriWindowDelegate* window_delegate) |
| 14 : window_delegate_(window_delegate) { | 14 : window_delegate_(window_delegate) { |
| 15 } | 15 } |
| 16 | 16 |
| 17 DriVSyncProvider::~DriVSyncProvider() {} | 17 DriVSyncProvider::~DriVSyncProvider() {} |
| 18 | 18 |
| 19 void DriVSyncProvider::GetVSyncParameters(const UpdateVSyncCallback& callback) { | 19 void DriVSyncProvider::GetVSyncParameters(const UpdateVSyncCallback& callback) { |
| 20 HardwareDisplayController* controller = window_delegate_->GetController(); | 20 HardwareDisplayController* controller = window_delegate_->GetController(); |
| 21 if (!controller) | 21 if (!controller) |
| 22 return; | 22 return; |
| 23 | 23 |
| 24 // The value is invalid, so we can't update the parameters. | 24 // The value is invalid, so we can't update the parameters. |
| 25 if (controller->GetTimeOfLastFlip() == 0 || | 25 if (controller->GetTimeOfLastFlip() == 0 || |
| 26 controller->get_mode().vrefresh == 0) | 26 controller->get_mode().vrefresh == 0) { |
| 27 callback.Run(base::TimeTicks(), | |
|
dnicoara
2015/02/23 22:48:26
Why do you need this?
achaulk
2015/02/23 22:50:17
Dropping the callback causes a deadlock
dnicoara
2015/02/24 16:46:53
We should look into what's causing the deadlock. T
| |
| 28 base::TimeDelta::FromSecondsD(1.0f / 60.0f)); | |
| 27 return; | 29 return; |
| 30 } | |
| 28 | 31 |
| 29 // Stores the time of the last refresh. | 32 // Stores the time of the last refresh. |
| 30 base::TimeTicks timebase = | 33 base::TimeTicks timebase = |
| 31 base::TimeTicks::FromInternalValue(controller->GetTimeOfLastFlip()); | 34 base::TimeTicks::FromInternalValue(controller->GetTimeOfLastFlip()); |
| 32 // Stores the refresh rate. | 35 // Stores the refresh rate. |
| 33 base::TimeDelta interval = | 36 base::TimeDelta interval = |
| 34 base::TimeDelta::FromSeconds(1) / controller->get_mode().vrefresh; | 37 base::TimeDelta::FromSeconds(1) / controller->get_mode().vrefresh; |
| 35 | 38 |
| 36 callback.Run(timebase, interval); | 39 callback.Run(timebase, interval); |
| 37 } | 40 } |
| 38 | 41 |
| 39 } // namespace ui | 42 } // namespace ui |
| OLD | NEW |