diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-10-26 17:54:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 00:55:49 +0000 |
| commit | 625f6c8cd6bda5cd7a5b1691376956bb8f300785 (patch) | |
| tree | e55af27b12e2500027ceb63d4e95a0b36ea1f36f /cc/trees/layer_tree_host_common.cc | |
| parent | 1f53541bbd81aa282eaa1bbdb2094edd43d425a0 (diff) | |
| download | chromium_src-625f6c8cd6bda5cd7a5b1691376956bb8f300785.zip chromium_src-625f6c8cd6bda5cd7a5b1691376956bb8f300785.tar.gz chromium_src-625f6c8cd6bda5cd7a5b1691376956bb8f300785.tar.bz2 | |
Revert of Remove DCHECK_IMPLIES/CHECK_IMPLIES. (patchset #3 id:40001 of https://codereview.chromium.org/1421483005/ )
Reason for revert:
breaks compilation on multiple builders, including but not limited to:
http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Mac%20Builder%20%28dbg%29/builds/132580
http://build.chromium.org/p/chromium.linux/builders/Android%20Builder%20%28dbg%29/builds/91670
Original issue's description:
> Remove DCHECK_IMPLIES/CHECK_IMPLIES.
>
> This patch removes both DCHECK_IMPLIES and CHECK_IMPLIES macros.
>
> R=thakis, sky, jam
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/cc8936ba36ee29b5859f65c936e16f87eeac82b4
> Cr-Commit-Position: refs/heads/master@{#356193}
TBR=thakis@chromium.org,sky@chromium.org,jam@chromium.org,vmpstr@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1417903005
Cr-Commit-Position: refs/heads/master@{#356202}
Diffstat (limited to 'cc/trees/layer_tree_host_common.cc')
| -rw-r--r-- | cc/trees/layer_tree_host_common.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc index e02cf8b..5af5fc1 100644 --- a/cc/trees/layer_tree_host_common.cc +++ b/cc/trees/layer_tree_host_common.cc @@ -415,8 +415,8 @@ void UpdateAccumulatedSurfaceState( current_target->render_surface()->draw_transform(); // If we have unclipped descendants, the draw transform is a translation. - DCHECK(!current_target->num_unclipped_descendants() || - current_draw_transform.IsIdentityOrTranslation()); + DCHECK_IMPLIES(current_target->num_unclipped_descendants(), + current_draw_transform.IsIdentityOrTranslation()); target_rect = MathUtil::MapEnclosingClippedRect(current_draw_transform, target_rect); |