| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index c4a6373f51e46b0081c1a53b4f794d6ff974de5e..5187d50efa5165fb0d5e85235bd0afb1f203b208 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -242,8 +242,7 @@ LayerTreeHostImpl::LayerTreeHostImpl(
|
| is_likely_to_require_a_draw_(false),
|
| frame_timing_tracker_(FrameTimingTracker::Create(this)) {
|
| DCHECK(proxy_->IsImplThread());
|
| - DCHECK_IMPLIES(settings.use_one_copy, !settings.use_zero_copy);
|
| - DCHECK_IMPLIES(settings.use_zero_copy, !settings.use_one_copy);
|
| + DCHECK(!settings.use_one_copy || !settings.use_zero_copy);
|
| DidVisibilityChange(this, visible_);
|
| animation_registrar_->set_supports_scroll_animations(
|
| proxy_->SupportsImplScrolling());
|
| @@ -980,7 +979,7 @@ DrawResult LayerTreeHostImpl::CalculateRenderPasses(
|
| // destroyed.
|
| // TODO(weiliangc): Test copy request w/ output surface recreation. Would
|
| // trigger this DCHECK.
|
| - DCHECK_IMPLIES(have_copy_request, draw_result == DRAW_SUCCESS);
|
| + DCHECK(!have_copy_request || (draw_result == DRAW_SUCCESS));
|
|
|
| return draw_result;
|
| }
|
| @@ -2116,11 +2115,10 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
|
|
| DCHECK(GetRendererCapabilities().using_image);
|
| unsigned image_target = settings_.use_image_texture_target;
|
| - DCHECK_IMPLIES(image_target == GL_TEXTURE_RECTANGLE_ARB,
|
| - context_provider->ContextCapabilities().gpu.texture_rectangle);
|
| - DCHECK_IMPLIES(
|
| - image_target == GL_TEXTURE_EXTERNAL_OES,
|
| - context_provider->ContextCapabilities().gpu.egl_image_external);
|
| + DCHECK((image_target != GL_TEXTURE_RECTANGLE_ARB) ||
|
| + context_provider->ContextCapabilities().gpu.texture_rectangle);
|
| + DCHECK((image_target != GL_TEXTURE_EXTERNAL_OES) ||
|
| + context_provider->ContextCapabilities().gpu.egl_image_external);
|
|
|
| if (settings_.use_zero_copy) {
|
| *resource_pool =
|
|
|