third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp - Issue 1814563002: wtf/CheckedArithmetic.h delegates to base/numerics/safe_math.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

Issue 1814563002: wtf/CheckedArithmetic.h delegates to base/numerics/safe_math.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/fetch/ImageResource.cpp ('k') | third_party/WebKit/Source/core/html/ImageData.cpp » ('j') | third_party/WebKit/Source/wtf/CheckedNumeric.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

index 9594d8f3eee3dc97ba5ee87e59d27d826b3434df..4ab0e279224f8c19c092a17ce18d34d4f601b47d 100644

--- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

@@ -827,15 +827,13 @@ void HTMLCanvasElement::updateExternallyAllocatedMemory() const

bufferCount++;

// Four bytes per pixel per buffer.

- Checked<intptr_t, RecordOverflow> checkedExternallyAllocatedMemory = 4 * bufferCount;

+ WTF::CheckedNumeric<intptr_t> checkedExternallyAllocatedMemory = 4 * bufferCount;

if (is3D())

checkedExternallyAllocatedMemory += m_context->externallyAllocatedBytesPerPixel();

checkedExternallyAllocatedMemory *= width();

checkedExternallyAllocatedMemory *= height();

- intptr_t externallyAllocatedMemory;

- if (checkedExternallyAllocatedMemory.safeGet(externallyAllocatedMemory) == CheckedState::DidOverflow)

- externallyAllocatedMemory = std::numeric_limits<intptr_t>::max();

+ intptr_t externallyAllocatedMemory = checkedExternallyAllocatedMemory.ValueOrDefault(std::numeric_limits<intptr_t>::max());

// Subtracting two intptr_t that are known to be positive will never underflow.

v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(externallyAllocatedMemory - m_externallyAllocatedMemory);