diff options
| author | william.xie <william.xie@intel.com> | 2015-06-19 09:02:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-19 16:02:54 +0000 |
| commit | 90d62c47af7446f19444f53d1a59dc9bdd48e0cb (patch) | |
| tree | 21fba2fc36041cc0017e390307f6222da67d6cf8 /ui | |
| parent | 646eb54234cd23372a3773edabf2668dbe20a528 (diff) | |
| download | chromium_src-90d62c47af7446f19444f53d1a59dc9bdd48e0cb.zip chromium_src-90d62c47af7446f19444f53d1a59dc9bdd48e0cb.tar.gz chromium_src-90d62c47af7446f19444f53d1a59dc9bdd48e0cb.tar.bz2 | |
ozone: DCHECK page_flip_request only for SchedulePageFlip
TestPageFlip could be called later than SchedulePageFlip,
for exmaple, before video playback switches to overlay,
DrmOverlayCandidatesHost will issue TestPageFlip request.
However, SchedulePageFlip has been called many times thus
page_flip_request_ is not null, DCHECK will lead to
system crash on dev build.
BUG=None
Review URL: https://codereview.chromium.org/1197753002
Cr-Commit-Position: refs/heads/master@{#335264}
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ozone/platform/drm/gpu/crtc_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/ozone/platform/drm/gpu/crtc_controller.cc b/ui/ozone/platform/drm/gpu/crtc_controller.cc index c9f8265..34390a2 100644 --- a/ui/ozone/platform/drm/gpu/crtc_controller.cc +++ b/ui/ozone/platform/drm/gpu/crtc_controller.cc @@ -67,7 +67,7 @@ bool CrtcController::SchedulePageFlip( const OverlayPlaneList& overlays, bool test_only, scoped_refptr<PageFlipRequest> page_flip_request) { - DCHECK(page_flip_request.get()); + DCHECK(!page_flip_request_.get() || test_only); DCHECK(!is_disabled_); const OverlayPlane* primary = OverlayPlane::GetPrimaryPlane(overlays); if (!primary) { |