From 6036726eb981b6c4b42047513b9d3f4ac865daac Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 24 Oct 2018 11:30:15 +0200 Subject: BASELINE: Update Chromium to 70.0.3538.78 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7 Reviewed-by: Michael Brüning --- chromium/gpu/command_buffer/client/fenced_allocator.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'chromium/gpu/command_buffer/client/fenced_allocator.h') diff --git a/chromium/gpu/command_buffer/client/fenced_allocator.h b/chromium/gpu/command_buffer/client/fenced_allocator.h index 9c42d34ec13..f820ca23f91 100644 --- a/chromium/gpu/command_buffer/client/fenced_allocator.h +++ b/chromium/gpu/command_buffer/client/fenced_allocator.h @@ -216,14 +216,15 @@ class FencedAllocatorWrapper { } // Gets a pointer to a memory block given the base memory and the offset. - // It translates FencedAllocator::kInvalidOffset to NULL. + // It translates FencedAllocator::kInvalidOffset to nullptr. void *GetPointer(FencedAllocator::Offset offset) { - return (offset == FencedAllocator::kInvalidOffset) ? - NULL : static_cast(base_) + offset; + return (offset == FencedAllocator::kInvalidOffset) + ? nullptr + : static_cast(base_) + offset; } // Gets the offset to a memory block given the base memory and the address. - // It translates NULL to FencedAllocator::kInvalidOffset. + // It translates nullptr to FencedAllocator::kInvalidOffset. FencedAllocator::Offset GetOffset(void *pointer) { return pointer ? static_cast( -- cgit v1.2.1