From 97bd5781a5fc580609a45d9dd947b550ed4cdb41 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Fri, 26 Feb 2016 13:29:19 -0500
Subject: [PATCH] Bug 1251718 - use UniquePtr instead of ScopedDeletePtr in
 WebGLElementArrayCache; r=baku

UniquePtr is more standard than ScopedDeletePtr; using standard
constructs whenever possible is preferable.
---
 dom/canvas/WebGLElementArrayCache.cpp | 10 +++++-----
 dom/canvas/WebGLElementArrayCache.h   |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dom/canvas/WebGLElementArrayCache.cpp b/dom/canvas/WebGLElementArrayCache.cpp
index 1c939a546c96..3c9365da2c6f 100644
--- a/dom/canvas/WebGLElementArrayCache.cpp
+++ b/dom/canvas/WebGLElementArrayCache.cpp
@@ -324,7 +324,7 @@ struct TreeForType {};
 template<>
 struct TreeForType<uint8_t>
 {
-    static ScopedDeletePtr<WebGLElementArrayCacheTree<uint8_t>>&
+    static UniquePtr<WebGLElementArrayCacheTree<uint8_t>>&
     Value(WebGLElementArrayCache* b) {
         return b->mUint8Tree;
     }
@@ -333,7 +333,7 @@ struct TreeForType<uint8_t>
 template<>
 struct TreeForType<uint16_t>
 {
-    static ScopedDeletePtr<WebGLElementArrayCacheTree<uint16_t>>&
+    static UniquePtr<WebGLElementArrayCacheTree<uint16_t>>&
     Value(WebGLElementArrayCache* b) {
         return b->mUint16Tree;
     }
@@ -342,7 +342,7 @@ struct TreeForType<uint16_t>
 template<>
 struct TreeForType<uint32_t>
 {
-    static ScopedDeletePtr<WebGLElementArrayCacheTree<uint32_t>>&
+    static UniquePtr<WebGLElementArrayCacheTree<uint32_t>>&
     Value(WebGLElementArrayCache* b) {
         return b->mUint32Tree;
     }
@@ -536,9 +536,9 @@ WebGLElementArrayCache::Validate(uint32_t maxAllowed, size_t firstElement,
     if (!mBytes.Length() || !countElements)
       return true;
 
-    ScopedDeletePtr<WebGLElementArrayCacheTree<T>>& tree = TreeForType<T>::Value(this);
+    UniquePtr<WebGLElementArrayCacheTree<T>>& tree = TreeForType<T>::Value(this);
     if (!tree) {
-        tree = new WebGLElementArrayCacheTree<T>(*this);
+        tree = MakeUnique<WebGLElementArrayCacheTree<T>>(*this);
         if (mBytes.Length()) {
             bool valid = tree->Update(0, mBytes.Length() - 1);
             if (!valid) {
diff --git a/dom/canvas/WebGLElementArrayCache.h b/dom/canvas/WebGLElementArrayCache.h
index 3ff2eac005fe..5e79faba86b5 100644
--- a/dom/canvas/WebGLElementArrayCache.h
+++ b/dom/canvas/WebGLElementArrayCache.h
@@ -8,7 +8,7 @@
 
 #include "GLDefs.h"
 #include "mozilla/MemoryReporting.h"
-#include "mozilla/Scoped.h"
+#include "mozilla/UniquePtr.h"
 #include "nscore.h"
 #include "nsTArray.h"
 #include <stdint.h>
@@ -93,9 +93,9 @@ private:
     friend struct TreeForType;
 
     FallibleTArray<uint8_t> mBytes;
-    ScopedDeletePtr<WebGLElementArrayCacheTree<uint8_t>> mUint8Tree;
-    ScopedDeletePtr<WebGLElementArrayCacheTree<uint16_t>> mUint16Tree;
-    ScopedDeletePtr<WebGLElementArrayCacheTree<uint32_t>> mUint32Tree;
+    UniquePtr<WebGLElementArrayCacheTree<uint8_t>> mUint8Tree;
+    UniquePtr<WebGLElementArrayCacheTree<uint16_t>> mUint16Tree;
+    UniquePtr<WebGLElementArrayCacheTree<uint32_t>> mUint32Tree;
 };
 
 } // end namespace mozilla