diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 19:50:16 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 19:50:16 +0000 |
| commit | c010f3bfdf0f6412cf09c9793face15f08a7ad77 (patch) | |
| tree | 7ef1c01e2c87cb826f47ec62e063205913e7f39c /cc | |
| parent | 3b2eb8890490df87ed957ba5076bcb5a39832c3c (diff) | |
| download | chromium_src-c010f3bfdf0f6412cf09c9793face15f08a7ad77.zip chromium_src-c010f3bfdf0f6412cf09c9793face15f08a7ad77.tar.gz chromium_src-c010f3bfdf0f6412cf09c9793face15f08a7ad77.tar.bz2 | |
cc: DCHECK correctly for empty damage rects.
Currently we're comparing the damage rect's left/top/right/bottom
against the output surface's left/top/right/bottom. But if the
rects do not intersect each other, the damage rect can be empty
and end up at 0,0 while the output rect does not contain 0,0.
Fix the DCHECKs to look for an empty damage rect.
R=enne@chromium.org, enne
BUG=366561
Review URL: https://codereview.chromium.org/255543005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265975 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/quads/render_pass.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cc/quads/render_pass.cc b/cc/quads/render_pass.cc index a55faa7..3c8b481 100644 --- a/cc/quads/render_pass.cc +++ b/cc/quads/render_pass.cc @@ -114,10 +114,9 @@ void RenderPass::SetNew(Id id, const gfx::Transform& transform_to_root_target) { DCHECK_GT(id.layer_id, 0); DCHECK_GE(id.index, 0); - DCHECK_GE(damage_rect.x(), output_rect.x()); - DCHECK_GE(damage_rect.y(), output_rect.y()); - DCHECK_LE(damage_rect.bottom(), output_rect.bottom()); - DCHECK_LE(damage_rect.right(), output_rect.right()); + DCHECK(damage_rect.IsEmpty() || output_rect.Contains(damage_rect)) + << "damage_rect: " << damage_rect.ToString() + << " output_rect: " << output_rect.ToString(); this->id = id; this->output_rect = output_rect; |