diff options
| author | vmpstr <vmpstr@chromium.org> | 2015-10-26 17:17:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 00:18:36 +0000 |
| commit | cc8936ba36ee29b5859f65c936e16f87eeac82b4 (patch) | |
| tree | 10a5e5f7e314b09d90ff307927dfa648209175b8 /content/common | |
| parent | 02c0dfad5b9bd4e6040cbe9faf2cc295c0da43a8 (diff) | |
| download | chromium_src-cc8936ba36ee29b5859f65c936e16f87eeac82b4.zip chromium_src-cc8936ba36ee29b5859f65c936e16f87eeac82b4.tar.gz chromium_src-cc8936ba36ee29b5859f65c936e16f87eeac82b4.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/1421483005
Cr-Commit-Position: refs/heads/master@{#356193}
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/discardable_shared_memory_heap.cc | 6 | ||||
| -rw-r--r-- | content/common/gpu/client/gl_helper_scaling.cc | 3 | ||||
| -rw-r--r-- | content/common/gpu/media/vp9_decoder.cc | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/content/common/discardable_shared_memory_heap.cc b/content/common/discardable_shared_memory_heap.cc index bf124f7..61f05d3 100644 --- a/content/common/discardable_shared_memory_heap.cc +++ b/content/common/discardable_shared_memory_heap.cc @@ -176,8 +176,8 @@ DiscardableSharedMemoryHeap::Split(Span* span, size_t blocks) { scoped_ptr<Span> leftover(new Span( span->shared_memory_, span->start_ + blocks, span->length_ - blocks)); - DCHECK_IMPLIES(leftover->length_ > 1, - spans_.find(leftover->start_) == spans_.end()); + DCHECK(leftover->length_ == 1 || + spans_.find(leftover->start_) == spans_.end()); RegisterSpan(leftover.get()); spans_[span->start_ + blocks - 1] = span; span->length_ = blocks; @@ -281,7 +281,7 @@ DiscardableSharedMemoryHeap::Carve(Span* span, size_t blocks) { scoped_ptr<Span> leftover( new Span(serving->shared_memory_, serving->start_ + blocks, extra)); leftover->set_is_locked(false); - DCHECK_IMPLIES(extra > 1, spans_.find(leftover->start_) == spans_.end()); + DCHECK(extra == 1 || spans_.find(leftover->start_) == spans_.end()); RegisterSpan(leftover.get()); // No need to coalesce as the previous span of |leftover| was just split diff --git a/content/common/gpu/client/gl_helper_scaling.cc b/content/common/gpu/client/gl_helper_scaling.cc index 7b7338d..49cab49 100644 --- a/content/common/gpu/client/gl_helper_scaling.cc +++ b/content/common/gpu/client/gl_helper_scaling.cc @@ -870,8 +870,7 @@ void ShaderProgram::Setup(const GLchar* vertex_shader_text, // The only reason fetching these attribute locations should fail is // if the context was spontaneously lost (i.e., because the GPU // process crashed, perhaps deliberately for testing). - DCHECK_IMPLIES(!Initialized(), - gl_->GetGraphicsResetStatusKHR() != GL_NO_ERROR); + DCHECK(Initialized() || gl_->GetGraphicsResetStatusKHR() != GL_NO_ERROR); } void ShaderProgram::UseProgram(const gfx::Size& src_size, diff --git a/content/common/gpu/media/vp9_decoder.cc b/content/common/gpu/media/vp9_decoder.cc index 7c25832..c1adc84 100644 --- a/content/common/gpu/media/vp9_decoder.cc +++ b/content/common/gpu/media/vp9_decoder.cc @@ -138,8 +138,7 @@ VP9Decoder::DecodeResult VP9Decoder::Decode() { void VP9Decoder::RefreshReferenceFrames(const scoped_refptr<VP9Picture>& pic) { for (size_t i = 0; i < media::kVp9NumRefFrames; ++i) { - DCHECK_IMPLIES(pic->frame_hdr->IsKeyframe(), - pic->frame_hdr->RefreshFlag(i)); + DCHECK(!pic->frame_hdr->IsKeyframe() || pic->frame_hdr->RefreshFlag(i)); if (pic->frame_hdr->RefreshFlag(i)) ref_frames_[i] = pic; } |