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

Unified Diff: trunk/src/ui/ozone/platform/dri/hardware_display_controller.cc

Issue 447073004: Revert 288137 "With the overlay path moving back to passing Acce..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 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: trunk/src/ui/ozone/platform/dri/hardware_display_controller.cc
===================================================================
--- trunk/src/ui/ozone/platform/dri/hardware_display_controller.cc (revision 288142)
+++ trunk/src/ui/ozone/platform/dri/hardware_display_controller.cc (working copy)
@@ -111,7 +111,6 @@
bool HardwareDisplayController::Enable() {
TRACE_EVENT0("dri", "HDC::Enable");
- DCHECK(!current_planes_.empty());
OverlayPlane primary = GetPrimaryPlane(current_planes_);
DCHECK(primary.buffer);
pending_page_flips_ = 0;
@@ -131,20 +130,18 @@
}
}
-void HardwareDisplayController::QueueOverlayPlane(const OverlayPlane& plane) {
- pending_planes_.push_back(plane);
-}
-
-bool HardwareDisplayController::SchedulePageFlip() {
- DCHECK(!pending_planes_.empty());
+bool HardwareDisplayController::SchedulePageFlip(
+ const OverlayPlaneList& overlays) {
+ DCHECK_LE(1u, overlays.size());
DCHECK_EQ(0u, pending_page_flips_);
+ pending_planes_ = overlays;
bool status = true;
for (size_t i = 0; i < crtc_states_.size(); ++i) {
if (crtc_states_[i]->is_disabled())
continue;
- status &= SchedulePageFlipOnCrtc(pending_planes_, crtc_states_[i]);
+ status &= SchedulePageFlipOnCrtc(overlays, crtc_states_[i]);
}
return status;

Powered by Google App Engine
This is Rietveld 408576698