BASELINE: Update Chromium to 61.0.3163.99

Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 22 insertions, 30 deletions

diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
index 3238c962ac3..a79fb71f710 100644
--- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
+++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/IndexBuffer11.cpp
@@ -14,28 +14,23 @@
 namespace rx
 {
 
-IndexBuffer11::IndexBuffer11(Renderer11 *const renderer) : mRenderer(renderer)
+IndexBuffer11::IndexBuffer11(Renderer11 *const renderer)
+    : mRenderer(renderer), mBuffer(), mBufferSize(0), mIndexType(GL_NONE), mDynamicUsage(false)
 {
-    mBuffer       = nullptr;
-    mBufferSize = 0;
-    mDynamicUsage = false;
 }
 
 IndexBuffer11::~IndexBuffer11()
 {
-    SafeRelease(mBuffer);
 }
 
 gl::Error IndexBuffer11::initialize(unsigned int bufferSize, GLenum indexType, bool dynamic)
 {
-    SafeRelease(mBuffer);
+    mBuffer.reset();
 
     updateSerial();
 
     if (bufferSize > 0)
     {
-        ID3D11Device* dxDevice = mRenderer->getDevice();
-
         D3D11_BUFFER_DESC bufferDesc;
         bufferDesc.ByteWidth = bufferSize;
         bufferDesc.Usage = D3D11_USAGE_DYNAMIC;
@@ -44,19 +39,15 @@ gl::Error IndexBuffer11::initialize(unsigned int bufferSize, GLenum indexType, b
         bufferDesc.MiscFlags = 0;
         bufferDesc.StructureByteStride = 0;
 
-        HRESULT result = dxDevice->CreateBuffer(&bufferDesc, nullptr, &mBuffer);
-        if (FAILED(result))
-        {
-            return gl::Error(GL_OUT_OF_MEMORY, "Failed to allocate internal index buffer of size, %lu.", bufferSize);
-        }
+        ANGLE_TRY(mRenderer->allocateResource(bufferDesc, &mBuffer));
 
         if (dynamic)
         {
-            d3d11::SetDebugName(mBuffer, "IndexBuffer11 (dynamic)");
+            mBuffer.setDebugName("IndexBuffer11 (dynamic)");
         }
         else
         {
-            d3d11::SetDebugName(mBuffer, "IndexBuffer11 (static)");
+            mBuffer.setDebugName("IndexBuffer11 (static)");
         }
     }
 
@@ -69,24 +60,25 @@ gl::Error IndexBuffer11::initialize(unsigned int bufferSize, GLenum indexType, b
 
 gl::Error IndexBuffer11::mapBuffer(unsigned int offset, unsigned int size, void** outMappedMemory)
 {
-    if (!mBuffer)
+    if (!mBuffer.valid())
     {
-        return gl::Error(GL_OUT_OF_MEMORY, "Internal index buffer is not initialized.");
+        return gl::OutOfMemory() << "Internal index buffer is not initialized.";
     }
 
     // Check for integer overflows and out-out-bounds map requests
     if (offset + size < offset || offset + size > mBufferSize)
     {
-        return gl::Error(GL_OUT_OF_MEMORY, "Index buffer map range is not inside the buffer.");
+        return gl::OutOfMemory() << "Index buffer map range is not inside the buffer.";
     }
 
     ID3D11DeviceContext *dxContext = mRenderer->getDeviceContext();
 
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    HRESULT result = dxContext->Map(mBuffer, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &mappedResource);
+    HRESULT result =
+        dxContext->Map(mBuffer.get(), 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &mappedResource);
     if (FAILED(result))
     {
-        return gl::Error(GL_OUT_OF_MEMORY, "Failed to map internal index buffer, HRESULT: 0x%08x.", result);
+        return gl::OutOfMemory() << "Failed to map internal index buffer, " << gl::FmtHR(result);
     }
 
     *outMappedMemory = reinterpret_cast<char*>(mappedResource.pData) + offset;
@@ -95,13 +87,13 @@ gl::Error IndexBuffer11::mapBuffer(unsigned int offset, unsigned int size, void*
 
 gl::Error IndexBuffer11::unmapBuffer()
 {
-    if (!mBuffer)
+    if (!mBuffer.valid())
     {
-        return gl::Error(GL_OUT_OF_MEMORY, "Internal index buffer is not initialized.");
+        return gl::OutOfMemory() << "Internal index buffer is not initialized.";
     }
 
     ID3D11DeviceContext *dxContext = mRenderer->getDeviceContext();
-    dxContext->Unmap(mBuffer, 0);
+    dxContext->Unmap(mBuffer.get(), 0);
     return gl::NoError();
 }
 
@@ -129,21 +121,21 @@ gl::Error IndexBuffer11::setSize(unsigned int bufferSize, GLenum indexType)
 
 gl::Error IndexBuffer11::discard()
 {
-    if (!mBuffer)
+    if (!mBuffer.valid())
     {
-        return gl::Error(GL_OUT_OF_MEMORY, "Internal index buffer is not initialized.");
+        return gl::OutOfMemory() << "Internal index buffer is not initialized.";
     }
 
     ID3D11DeviceContext *dxContext = mRenderer->getDeviceContext();
 
     D3D11_MAPPED_SUBRESOURCE mappedResource;
-    HRESULT result = dxContext->Map(mBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
+    HRESULT result = dxContext->Map(mBuffer.get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &mappedResource);
     if (FAILED(result))
     {
-        return gl::Error(GL_OUT_OF_MEMORY, "Failed to map internal index buffer, HRESULT: 0x%08x.", result);
+        return gl::OutOfMemory() << "Failed to map internal index buffer, " << gl::FmtHR(result);
     }
 
-    dxContext->Unmap(mBuffer, 0);
+    dxContext->Unmap(mBuffer.get(), 0);
 
     return gl::NoError();
 }
@@ -159,9 +151,9 @@ DXGI_FORMAT IndexBuffer11::getIndexFormat() const
     }
 }
 
-ID3D11Buffer *IndexBuffer11::getBuffer() const
+const d3d11::Buffer &IndexBuffer11::getBuffer() const
 {
     return mBuffer;
 }
 
-}
+}  // namespace rx