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

Unified Diff: ui/ozone/platform/drm/gpu/drm_window.cc

Issue 1418503012: [Ozone-DRM] Remove bool return value for SchedulePageFlip call (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months 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 side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/drm/gpu/drm_window.cc
diff --git a/ui/ozone/platform/drm/gpu/drm_window.cc b/ui/ozone/platform/drm/gpu/drm_window.cc
index 0a933a1abd7c117ccecf808eec851612ed42ab0c..29c9a8a58b54dd5748846260f219925aa33484f8 100644
--- a/ui/ozone/platform/drm/gpu/drm_window.cc
+++ b/ui/ozone/platform/drm/gpu/drm_window.cc
@@ -32,9 +32,6 @@ namespace {
#define DRM_CAP_CURSOR_HEIGHT 0x9
#endif
-void EmptyFlipCallback(gfx::SwapResult) {
-}
-
void UpdateCursorImage(DrmBuffer* cursor, const SkBitmap& image) {
SkRect damage;
image.getBounds(&damage);
@@ -140,9 +137,7 @@ void DrmWindow::SchedulePageFlip(const std::vector<OverlayPlane>& planes,
return;
}
- // Controller should call the callback in all cases.
- controller_->SchedulePageFlip(last_submitted_planes_, false /* test_only */,
- callback);
+ controller_->SchedulePageFlip(last_submitted_planes_, callback);
}
std::vector<OverlayCheck_Params> DrmWindow::TestPageFlip(
@@ -195,11 +190,7 @@ std::vector<OverlayCheck_Params> DrmWindow::TestPageFlip(
compatible_test_list.push_back(plane);
- bool page_flip_succeeded = controller_->SchedulePageFlip(
- compatible_test_list, true /* test_only */,
- base::Bind(&EmptyFlipCallback));
-
- if (page_flip_succeeded) {
+ if (controller_->TestPageFlip(compatible_test_list)) {
overlay_params.plane_ids =
controller_->GetCompatibleHardwarePlaneIds(plane);
params.push_back(overlay_params);

Powered by Google App Engine
This is Rietveld 408576698