| Index: third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
|
| index 8b76f1e4ebd853db684e373d0518a3da833f5942..58e044b2c99b51072077de51aea25ba9de85161b 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp
|
| @@ -285,10 +285,10 @@ void ImageBuffer::flushGpu(FlushReason reason)
|
|
|
| bool ImageBuffer::getImageData(Multiply multiplied, const IntRect& rect, WTF::ArrayBufferContents& contents) const
|
| {
|
| - Checked<int, RecordOverflow> dataSize = 4;
|
| + WTF::CheckedNumeric<int> dataSize = 4;
|
| dataSize *= rect.width();
|
| dataSize *= rect.height();
|
| - if (dataSize.hasOverflowed())
|
| + if (!dataSize.IsValid())
|
| return false;
|
|
|
| if (!isSurfaceValid()) {
|
| @@ -363,12 +363,10 @@ void ImageBuffer::updateGPUMemoryUsage() const
|
| if (this->isAccelerated()) {
|
| // If image buffer is accelerated, we should keep track of GPU memory usage.
|
| int gpuBufferCount = 2;
|
| - Checked<intptr_t, RecordOverflow> checkedGPUUsage = 4 * gpuBufferCount;
|
| + WTF::CheckedNumeric<intptr_t> checkedGPUUsage = 4 * gpuBufferCount;
|
| checkedGPUUsage *= this->size().width();
|
| checkedGPUUsage *= this->size().height();
|
| - intptr_t gpuMemoryUsage;
|
| - if (checkedGPUUsage.safeGet(gpuMemoryUsage) == CheckedState::DidOverflow)
|
| - gpuMemoryUsage = std::numeric_limits<intptr_t>::max();
|
| + intptr_t gpuMemoryUsage = checkedGPUUsage.ValueOrDefault(std::numeric_limits<intptr_t>::max());
|
|
|
| s_globalGPUMemoryUsage += (gpuMemoryUsage - m_gpuMemoryUsage);
|
| m_gpuMemoryUsage = gpuMemoryUsage;
|
|
|