| Index: ui/ozone/platform/drm/gpu/hardware_display_controller.h
|
| diff --git a/ui/ozone/platform/drm/gpu/hardware_display_controller.h b/ui/ozone/platform/drm/gpu/hardware_display_controller.h
|
| index 196b2ddabb397e7c4ab8ef77ad9b28911ae0f2ba..0e7b240b233bc71fe8b7a736c3a56cb20c0d7455 100644
|
| --- a/ui/ozone/platform/drm/gpu/hardware_display_controller.h
|
| +++ b/ui/ozone/platform/drm/gpu/hardware_display_controller.h
|
| @@ -158,8 +158,6 @@ class OZONE_EXPORT HardwareDisplayController
|
|
|
| void ProcessPageFlipRequest();
|
|
|
| - void ClearPendingRequests();
|
| -
|
| // PageFlipObserver:
|
| void OnPageFlipEvent() override;
|
|
|
| @@ -174,14 +172,7 @@ class OZONE_EXPORT HardwareDisplayController
|
| base::Closure callback;
|
| };
|
|
|
| - // Buffers need to be declared first so that they are destroyed last. Needed
|
| - // since the controllers may reference the buffers.
|
| - OverlayPlaneList current_planes_;
|
| - // Planes currently being queued without having SchedulePageFlip() called.
|
| - OverlayPlaneList pending_planes_;
|
| - // Plane lists for which SchedulePageFlip() was called. They are waiting for
|
| - // previous page flip events to be completed before they can be serviced.
|
| - std::deque<PageFlipRequest> requests_;
|
| + scoped_ptr<PageFlipRequest> page_flip_request_;
|
| scoped_refptr<ScanoutBuffer> cursor_buffer_;
|
|
|
| base::ScopedPtrHashMap<DrmDevice*, HardwareDisplayPlaneList>
|
| @@ -198,6 +189,7 @@ class OZONE_EXPORT HardwareDisplayController
|
| drmModeModeInfo mode_;
|
|
|
| bool is_disabled_;
|
| + bool ignore_page_flip_event_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HardwareDisplayController);
|
| };
|
|
|